Merge pull request #6995 from osmandapp/TrackerImprovements

Tracker improvements

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

@@ -64,11 +64,13 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 		if (usedBy and usageIntent > 0) {
 			usedBy -= usageIntent
 		}
-		if (usedBy == 0) {
+		when {
+			usedBy == 0 -> {
 				shouldCleanupResources = false
 				val serviceIntent = Intent(ctx, TelegramService::class.java)
 				ctx.stopService(serviceIntent)
-		} else if (isUsedByMyLocation(usedBy)) {
+			}
+			isUsedByMyLocation(usedBy) -> {
 				val app = app()
 				if (app.settings.sendMyLocInterval >= OFF_INTERVAL_THRESHOLD && serviceOffInterval == 0L) {
 					serviceOffInterval = app.settings.sendMyLocInterval
@@ -77,12 +79,15 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 				}
 				app.notificationHelper.refreshNotification(NotificationType.LOCATION)
 			}
+			isUsedByUsersLocations(usedBy) -> removeLocationUpdates()
+		}
 	}
 
 	override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
 		val app = app()
 		handler = Handler()
-		usedBy = intent.getIntExtra(USAGE_INTENT, 0)
+		val usageIntent = intent.getIntExtra(USAGE_INTENT, 0)
+		usedBy = usageIntent or usedBy
 
 		serviceOffInterval = intent.getLongExtra(USAGE_OFF_INTERVAL, 0)
 		sendLocationInterval = intent.getLongExtra(SEND_LOCATION_INTERVAL, 0)
@@ -259,10 +264,8 @@ class TelegramService : Service(), LocationListener, TelegramIncomingMessagesLis
 		Toast.makeText(this, getString(R.string.location_service_no_gps_available), Toast.LENGTH_LONG).show()
 	}
 
-
 	override fun onProviderEnabled(provider: String) {}
 
-
 	override fun onStatusChanged(provider: String, status: Int, extras: Bundle) {}
 
 	override fun onTaskRemoved(rootIntent: Intent) {

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

@@ -45,7 +45,7 @@ private const val TIMELINE_TAB_POS = 2
 
 class MainActivity : AppCompatActivity(), TelegramListener, ActionButtonsListener, TelegramIncomingMessagesListener {
 
-	private val log = PlatformUtil.getLog(TelegramHelper::class.java)
+	private val log = PlatformUtil.getLog(MainActivity::class.java)
 
 	private var telegramAuthorizationRequestHandler: TelegramAuthorizationRequestHandler? = null
 	private var paused: Boolean = false

OsmAnd/src/net/osmand/plus/OsmandApplication.java

@@ -981,6 +981,8 @@ public class OsmandApplication extends MultiDexApplication {
 			PlatformUtil.getLog(ErrorBottomSheetDialog.class).error("", e);
 		}
 		intent.putExtra(Intent.EXTRA_TEXT, text.toString());
-		startActivity(Intent.createChooser(intent, getString(R.string.send_report)));
+		Intent chooserIntent = Intent.createChooser(intent, getString(R.string.send_report));
+		chooserIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+		startActivity(chooserIntent);
 	}
 }

OsmAnd/src/net/osmand/plus/activities/TrackActivity.java

@@ -17,14 +17,14 @@ import android.view.View;
 import android.view.WindowManager;
 
 import net.osmand.AndroidUtils;
-import net.osmand.data.LatLon;
-import net.osmand.data.PointDescription;
-import net.osmand.data.QuadRect;
-import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.TrkSegment;
 import net.osmand.GPXUtilities.WptPt;
+import net.osmand.data.LatLon;
+import net.osmand.data.PointDescription;
+import net.osmand.data.QuadRect;
+import net.osmand.plus.GPXDatabase.GpxDataItem;
 import net.osmand.plus.GpxSelectionHelper;
 import net.osmand.plus.GpxSelectionHelper.GpxDisplayGroup;
 import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
@@ -447,7 +447,7 @@ public class TrackActivity extends TabActivity {
 				result = app.getSavingTrackHelper().getCurrentGpx();
 			} else {
 				SelectedGpxFile selectedGpxFile = app.getSelectedGpxHelper().getSelectedFileByPath(file.getAbsolutePath());
-				if (selectedGpxFile != null && selectedGpxFile.getGpxFile() != null) {
+				if (selectedGpxFile != null && selectedGpxFile.getGpxFile() != null && selectedGpxFile.getGpxFile().modifiedTime == file.lastModified()) {
 					result = selectedGpxFile.getGpxFile();
 				} else {
 					result = GPXUtilities.loadGPXFile(file);
@@ -472,8 +472,16 @@ public class TrackActivity extends TabActivity {
 			TrackActivity activity = getTrackActivity();
 			if (activity != null) {
 				activity.setSupportProgressBarIndeterminateVisibility(false);
-				if (showTemporarily && result != null) {
+				if (result != null) {
-					app.getSelectedGpxHelper().selectGpxFile(result, false, false);
+					final GpxSelectionHelper helper = app.getSelectedGpxHelper();
+					if (showTemporarily) {
+						helper.selectGpxFile(result, false, false);
+					} else {
+						final SelectedGpxFile selectedGpx = helper.getSelectedFileByPath(result.path);
+						if (selectedGpx != null && result.error == null) {
+							selectedGpx.setGpxFile(result);
+						}
+					}
 				}
 				if (!activity.stopped) {
 					activity.onGPXFileReady(result);

OsmAnd/src/net/osmand/plus/views/AidlMapLayer.java

@@ -62,6 +62,7 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
 	private Bitmap bigIconBg;
 	private Bitmap bigIconBgStale;
 	private Bitmap bigIconBgSelected;
+	private Bitmap bigIconBgSelectedStale;
 	private Bitmap placeholder;
 
 	private int smallIconSize;
@@ -112,6 +113,8 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
 				? R.drawable.map_pin_user_stale_location_night : R.drawable.map_pin_user_stale_location_day);
 		bigIconBgSelected = BitmapFactory.decodeResource(res, night
 				? R.drawable.map_pin_user_location_selected_night : R.drawable.map_pin_user_location_selected_day);
+		bigIconBgSelectedStale = BitmapFactory.decodeResource(res, night
+				? R.drawable.map_pin_user_stale_location_selected_night : R.drawable.map_pin_user_stale_location_selected_day);
 		placeholder = BitmapFactory.decodeResource(res, R.drawable.img_user_picture);
 
 		smallIconSize = AndroidUtils.dpToPx(map, SMALL_ICON_SIZE_DP);
@@ -171,7 +174,8 @@ public class AidlMapLayer extends OsmandMapLayer implements IContextMenuProvider
 			image = placeholder;
 		}
 		if (selected) {
-			drawBigIcon(canvas, x, y, image, bigIconBgSelected);
+			Bitmap bg = isStale(point) ? bigIconBgSelectedStale : bigIconBgSelected;
+			drawBigIcon(canvas, x, y, image, bg);
 		} else if (pointsType == PointsType.STANDARD) {
 			int radius = getRadiusPoi(tb);
 			float density = tb.getDensity();