diff --git a/OsmAnd/AndroidManifest-amazon.xml b/OsmAnd/AndroidManifest-amazon.xml deleted file mode 100644 index 93e028dd17..0000000000 --- a/OsmAnd/AndroidManifest-amazon.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index f757952560..f6139bab8a 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -85,7 +85,7 @@ android { } amazonFree { java.srcDirs = ["src-nogms", "src-amazon"] - manifest.srcFile "AndroidManifest-amazon.xml" + manifest.srcFile "AndroidManifest-gplayFree.xml" } amazonFull { java.srcDirs = ["src-nogms", "src-amazon"] diff --git a/OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchasesImpl.java b/OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchasesImpl.java index c67c90308f..00bbea9693 100644 --- a/OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchasesImpl.java +++ b/OsmAnd/src-amazon/net/osmand/plus/inapp/InAppPurchasesImpl.java @@ -4,12 +4,10 @@ import net.osmand.plus.OsmandApplication; public class InAppPurchasesImpl extends InAppPurchases { - private static final InAppSubscription[] LIVE_UPDATES_FREE = new InAppSubscription[] {}; - public InAppPurchasesImpl(OsmandApplication ctx) { super(ctx); inAppPurchases = new InAppPurchase[] {}; - liveUpdates = new LiveUpdatesInAppPurchasesFree(); + liveUpdates = new EmptyLiveUpdatesList(); } @Override @@ -32,10 +30,10 @@ public class InAppPurchasesImpl extends InAppPurchases { return false; } - private static class LiveUpdatesInAppPurchasesFree extends InAppSubscriptionList { + private static class EmptyLiveUpdatesList extends InAppSubscriptionList { - public LiveUpdatesInAppPurchasesFree() { - super(LIVE_UPDATES_FREE); + public EmptyLiveUpdatesList() { + super(new InAppSubscription[] {}); } } } \ No newline at end of file