From 8db153db32975dcacdca8c4f83427132a5dd5cd7 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Thu, 18 Mar 2021 11:14:57 +0200
Subject: [PATCH] Remove unnecessary changes

(cherry picked from commit 67039222c5ad7cf465e785ace9b484f1acd44103)
---
 OsmAnd/AndroidManifest-amazon.xml             | 27 -------------------
 OsmAnd/build.gradle                           |  2 +-
 .../osmand/plus/inapp/InAppPurchasesImpl.java | 10 +++----
 3 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 OsmAnd/AndroidManifest-amazon.xml

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 @@
-<?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>
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