Merge pull request #7350 from osmandapp/TrackerImprovements

Tracker Improvements

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

@@ -42,9 +42,11 @@ class TelegramApplication : Application(), OsmandHelperListener {
 		telegramHelper.messageActiveTimeSec = settings.locHistoryTime
 		uiUtils = UiUtils(this)
 		osmandAidlHelper = OsmandAidlHelper(this)
-		osmandAidlHelper.listener = object : OsmandAidlHelper.OsmandHelperListener {
+		osmandAidlHelper.listener = object : OsmandHelperListener {
 			override fun onOsmandConnectionStateChanged(connected: Boolean) {
 				if (connected) {
+					osmandAidlHelper.clearNavDrawerItems("net.osmand.telegram")
+					osmandAidlHelper.clearNavDrawerItems("net.osmand.telegram.debug")
 					osmandAidlHelper.setNavDrawerItems(
 						applicationContext.packageName,
 						listOf(getString(R.string.app_name_short)),

OsmAnd-telegram/src/net/osmand/telegram/helpers/OsmandAidlHelper.kt

@@ -1043,6 +1043,16 @@ class OsmandAidlHelper(private val app: TelegramApplication) {
 		return false
 	}
 
+	fun clearNavDrawerItems(appPackage: String): Boolean {
+		if (mIOsmAndAidlInterface != null) {
+			try {
+				return mIOsmAndAidlInterface!!.setNavDrawerItems(SetNavDrawerItemsParams(appPackage, emptyList()))
+			} catch (e: RemoteException) {
+				e.printStackTrace()
+			}
+		}
+		return false
+	}
 
 	/**
 	 * Put navigation on pause.

OsmAnd-telegram/src/net/osmand/telegram/ui/UserGpxInfoFragment.kt

@@ -156,6 +156,7 @@ class UserGpxInfoFragment : BaseDialogFragment() {
 		updateDateAndTimeButton()
 
 		liveBtn = mainView.findViewById<TextView>(R.id.live_btn).apply {
+			if (userId != telegramHelper.getCurrentUserId()) {
 				setOnClickListener {
 					val enabled = !liveTrackEnabled()
 					settings.updateLiveTrack(userId, chatId, deviceName, enabled)
@@ -165,6 +166,7 @@ class UserGpxInfoFragment : BaseDialogFragment() {
 					}
 				}
 			}
+		}
 		updateLiveTrackBtn()
 
 		avgElevationTv = mainView.findViewById<TextView>(R.id.average_altitude_text)