From c061a16dbc0d72cb9bd71fcceeacbfbbe67040ce Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Thu, 12 Dec 2019 17:42:18 +0300
Subject: [PATCH] Added free Huawei build

---
 OsmAnd/AndroidManifest-freehuawei.xml         | 25 +++++++++++++++++++
 OsmAnd/build.gradle                           |  4 +++
 .../osmand/plus/helpers/DiscountHelper.java   |  2 +-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 OsmAnd/AndroidManifest-freehuawei.xml

diff --git a/OsmAnd/AndroidManifest-freehuawei.xml b/OsmAnd/AndroidManifest-freehuawei.xml
new file mode 100644
index 0000000000..9fe9a01ccf
--- /dev/null
+++ b/OsmAnd/AndroidManifest-freehuawei.xml
@@ -0,0 +1,25 @@
+<?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>
+		<activity android:name="com.huawei.android.sdk.drm.DrmDialogActivity"
+			android:configChanges="screenSize|orientation|keyboardHidden"
+			android:exported="false"
+			android:theme="@android:style/Theme.Translucent">
+			<meta-data
+				android:name="hwc-theme"
+				android:value="androidhwext:style/Theme.Emui.Translucent" />
+		</activity>
+
+		<provider
+			android:name="android.support.v4.content.FileProvider"
+			android:authorities="net.osmand.huawei.fileprovider"
+			tools:replace="android:authorities" />
+		<service
+			android:name="net.osmand.plus.NavigationService"
+			android:process="net.osmand.huawei"
+			tools:replace="android:process" />
+	</application>
+
+</manifest>
\ No newline at end of file
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index 95424a01d6..2841dfcff3 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -189,6 +189,10 @@ android {
 			dimension "version"
 			applicationId "net.osmand.plus.huawei"
 		}
+		freehuawei {
+			dimension "version"
+			applicationId "net.osmand.huawei"
+		}
 
 		// CoreVersion
 		legacy {
diff --git a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
index 0baafab662..cc1867fded 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/DiscountHelper.java
@@ -80,7 +80,7 @@ public class DiscountHelper {
 	public static void checkAndDisplay(final MapActivity mapActivity) {
 		OsmandApplication app = mapActivity.getMyApplication();
 		OsmandSettings settings = app.getSettings();
-		if (settings.DO_NOT_SHOW_STARTUP_MESSAGES.get() || !settings.INAPPS_READ.get()) {
+		if (settings.DO_NOT_SHOW_STARTUP_MESSAGES.get() || !settings.INAPPS_READ.get() || Version.isHuawei(app)) {
 			return;
 		}
 		if (mBannerVisible) {