Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove unnecessary changes

Browse source 
(cherry picked from commit 67039222c5)
This commit is contained in:
Vitaliy 2021-03-18 11:14:57 +02:00
parent 067422823e
commit 8db153db32
3 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/AndroidManifest-amazon.xml
View file

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<application
android:icon="@mipmap/icon_free"
android:label="@string/app_name"
tools:replace="android:icon, android:label">
<activity
android:name="net.osmand.plus.activities.MapActivity"
android:theme="@style/FirstSplashScreenFree"
tools:replace="android:theme" />
<service
android:name="net.osmand.plus.NavigationService"
android:process="net.osmand"
tools:replace="android:process" />
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="net.osmand.fileprovider"
tools:replace="android:authorities" />
</application>
</manifest>

2
OsmAnd/build.gradle
View file

@ -85,7 +85,7 @@ android {
} }
amazonFree { amazonFree {
java.srcDirs = ["src-nogms", "src-amazon"] java.srcDirs = ["src-nogms", "src-amazon"]
manifest.srcFile "AndroidManifest-amazon.xml" manifest.srcFile "AndroidManifest-gplayFree.xml"
} }
amazonFull { amazonFull {
java.srcDirs = ["src-nogms", "src-amazon"] java.srcDirs = ["src-nogms", "src-amazon"]

10
OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchasesImpl.java
View file

@ -4,12 +4,10 @@ import net.osmand.plus.OsmandApplication;
public class InAppPurchasesImpl extends InAppPurchases { public class InAppPurchasesImpl extends InAppPurchases {
private static final InAppSubscription[] LIVE_UPDATES_FREE = new InAppSubscription[] {};
public InAppPurchasesImpl(OsmandApplication ctx) { public InAppPurchasesImpl(OsmandApplication ctx) {
super(ctx); super(ctx);
inAppPurchases = new InAppPurchase[] {}; inAppPurchases = new InAppPurchase[] {};
liveUpdates = new LiveUpdatesInAppPurchasesFree(); liveUpdates = new EmptyLiveUpdatesList();
} }
@Override @Override
@ -32,10 +30,10 @@ public class InAppPurchasesImpl extends InAppPurchases {
return false; return false;
} }
private static class LiveUpdatesInAppPurchasesFree extends InAppSubscriptionList { private static class EmptyLiveUpdatesList extends InAppSubscriptionList {
public LiveUpdatesInAppPurchasesFree() { public EmptyLiveUpdatesList() {
super(LIVE_UPDATES_FREE); super(new InAppSubscription[] {});
} }
} }
} }