From 20c14b54962b57ddb7f259dfb78fe5aafadd11c1 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Thu, 6 Sep 2018 15:54:47 +0300
Subject: [PATCH 1/2] Init TelegramApplication from OsmAnd

---
 OsmAnd-telegram/AndroidManifest.xml                  |  9 +++++++++
 .../net/osmand/telegram/InitAppBroadcastReceiver.kt  | 12 ++++++++++++
 OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java        | 11 +++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 OsmAnd-telegram/src/net/osmand/telegram/InitAppBroadcastReceiver.kt

diff --git a/OsmAnd-telegram/AndroidManifest.xml b/OsmAnd-telegram/AndroidManifest.xml
index 32ba316d98..9b89517512 100644
--- a/OsmAnd-telegram/AndroidManifest.xml
+++ b/OsmAnd-telegram/AndroidManifest.xml
@@ -53,6 +53,15 @@
 
         <receiver android:name=".OnTelegramServiceAlarmReceiver" />
 
+        <receiver
+            android:name=".InitAppBroadcastReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="net.osmand.telegram.InitApp"/>
+            </intent-filter>
+        </receiver>
+
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="net.osmand.telegram.fileprovider"
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/InitAppBroadcastReceiver.kt b/OsmAnd-telegram/src/net/osmand/telegram/InitAppBroadcastReceiver.kt
new file mode 100644
index 0000000000..362bc028a4
--- /dev/null
+++ b/OsmAnd-telegram/src/net/osmand/telegram/InitAppBroadcastReceiver.kt
@@ -0,0 +1,12 @@
+package net.osmand.telegram
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+class InitAppBroadcastReceiver : BroadcastReceiver() {
+
+	override fun onReceive(context: Context, intent: Intent) {
+		// do nothing, TelegramApplication already initialized
+	}
+}
diff --git a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
index 34c2c4e113..deb7acd6f8 100644
--- a/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
+++ b/OsmAnd/src/net/osmand/aidl/OsmandAidlApi.java
@@ -3,6 +3,7 @@ package net.osmand.aidl;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -176,6 +177,7 @@ public class OsmandAidlApi {
 		registerStopNavigationReceiver(mapActivity);
 		registerMuteNavigationReceiver(mapActivity);
 		registerUnmuteNavigationReceiver(mapActivity);
+		initOsmandTelegram();
 	}
 
 	public void onDestroyMapActivity(MapActivity mapActivity) {
@@ -197,6 +199,15 @@ public class OsmandAidlApi {
 		return mapActivityActive;
 	}
 
+	private void initOsmandTelegram() {
+		String[] packages = new String[]{"net.osmand.telegram", "net.osmand.telegram.debug"};
+		Intent intent = new Intent("net.osmand.telegram.InitApp");
+		for (String pack : packages) {
+			intent.setComponent(new ComponentName(pack, "net.osmand.telegram.InitAppBroadcastReceiver"));
+			app.sendBroadcast(intent);
+		}
+	}
+
 	private void registerRefreshMapReceiver(MapActivity mapActivity) {
 		final WeakReference<MapActivity> mapActivityRef = new WeakReference<>(mapActivity);
 		BroadcastReceiver refreshMapReceiver = new BroadcastReceiver() {

From 7f0ca8831e7af8d646fe591d796b66f10a319a52 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Thu, 6 Sep 2018 15:55:38 +0300
Subject: [PATCH 2/2] Replace hardcoded values

---
 .../src/net/osmand/telegram/TelegramApplication.kt            | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt b/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
index 36cf9da896..25ad8b3306 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt
@@ -45,10 +45,8 @@ class TelegramApplication : Application(), OsmandHelperListener {
 		osmandAidlHelper.listener = object : OsmandAidlHelper.OsmandHelperListener {
 			override fun onOsmandConnectionStateChanged(connected: Boolean) {
 				if (connected) {
-					val basePackage = "net.osmand.telegram"
-					val appPackage = if (BuildConfig.DEBUG) "$basePackage.debug" else basePackage
 					osmandAidlHelper.setNavDrawerItems(
-						appPackage,
+						applicationContext.packageName,
 						listOf(getString(R.string.app_name)),
 						listOf("osmand_telegram://main_activity"),
 						listOf("ic_action_location_sharing_app"),