Merge remote-tracking branch 'origin/master' into plugins_preferences

# Conflicts:
#	OsmAnd/res/values/strings.xml

OsmAnd-telegram/src/net/osmand/telegram/TelegramApplication.kt

@@ -14,7 +14,7 @@ import net.osmand.telegram.notifications.NotificationHelper
 import net.osmand.telegram.utils.AndroidUtils
 import net.osmand.telegram.utils.UiUtils
 
-class TelegramApplication : Application(), OsmandHelperListener {
+class TelegramApplication : Application() {
 
 	val telegramHelper = TelegramHelper.instance
 	lateinit var settings: TelegramSettings private set
@@ -54,6 +54,7 @@ class TelegramApplication : Application(), OsmandHelperListener {
 						listOf("ic_action_location_sharing_app"),
 						listOf(-1)
 					)
+					showLocationHelper.setupMapLayer()
 					showLocationHelper.addDirectionContextMenuButton()
 					showLocationHelper.startShowingLocation()
 					showLocationHelper.addOrUpdateStatusWidget(-1, false)
@@ -141,13 +142,6 @@ class TelegramApplication : Application(), OsmandHelperListener {
 		return internetConnectionAvailable
 	}
 
-	override fun onOsmandConnectionStateChanged(connected: Boolean) {
-		if (connected) {
-			showLocationHelper.setupMapLayer()
-			showLocationHelper.addDirectionContextMenuButton()
-		}
-	}
-
 	private fun startTelegramService(intent: Int, serviceOffInterval: Long = 0) {
 		var i = intent
 		var interval = serviceOffInterval