@@ -0,0 +53,4 @@
+  }
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)

@@ -0,0 +53,4 @@
+  }
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)

@@ -0,0 +53,4 @@
+  }
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -0,0 +181,4 @@
+    locationHelper.addListener(this);
+
+    // Restart the location with more frequent refresh interval for Track Recording.
+    locationHelper.restartWithNewMode();

@@ -69,4 +52,3 @@
-
   <string-array name="mobile_data_options">
     <item>@string/mobile_data_option_ask</item>
     <item>@string/mobile_data_option_always</item>

@@ -69,4 +52,3 @@
-
   <string-array name="mobile_data_options">
     <item>@string/mobile_data_option_ask</item>
     <item>@string/mobile_data_option_always</item>

@@ -0,0 +181,4 @@
+    locationHelper.addListener(this);
+
+    // Restart the location with more frequent refresh interval for Track Recording.
+    locationHelper.restartWithNewMode();

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -69,4 +52,3 @@
-
   <string-array name="mobile_data_options">
     <item>@string/mobile_data_option_ask</item>
     <item>@string/mobile_data_option_always</item>

@@ -69,4 +52,3 @@
-
   <string-array name="mobile_data_options">
     <item>@string/mobile_data_option_ask</item>
     <item>@string/mobile_data_option_always</item>

@@ -293,6 +294,9 @@ public class LocationHelper implements BaseLocationProvider.Listener
     if (RoutingController.get().isNavigating())
       return INTERVAL_NAVIGATION_MS;
 

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -0,0 +181,4 @@
+    locationHelper.addListener(this);
+
+    // Restart the location with more frequent refresh interval for Track Recording.
+    locationHelper.restartWithNewMode();

@@ -0,0 +53,4 @@
+  }
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -0,0 +53,4 @@
+  }
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)

@@ -0,0 +4,4 @@
+
+public class TrackRecorder
+{
+  public static native void nativeSetEnabled(boolean enable);

@@ -0,0 +53,4 @@
+  }
+
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)

@@ -1918,10 +1930,16 @@ public class MwmActivity extends BaseMwmFragmentActivity
         Logger.w(LOCATION_TAG, "Permission " + permission + " has been refused");
     }

@@ -0,0 +161,4 @@
+        startForeground(TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build());
+      } catch (ForegroundServiceStartNotAllowedException e)
+      {
+        Logger.e(TAG, "Oops! ForegroundService is not allowed", e);

@@ -0,0 +161,4 @@
+        startForeground(TrackRecordingService.TRACK_REC_NOTIFICATION_ID, getNotificationBuilder(this).build());
+      } catch (ForegroundServiceStartNotAllowedException e)
+      {
+        Logger.e(TAG, "Oops! ForegroundService is not allowed", e);

@@ -207,3 +209,4 @@
+  private boolean mLocationPermissionRequestedForRecording = false;
 
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull

@@ -0,0 +55,4 @@
+  @RequiresPermission(value = ACCESS_FINE_LOCATION)
+  public static void startForegroundService(@NonNull Context context)
+  {
+    if (TrackRecorder.nativeGetDuration() != 24)

@@ -196,2 +223,4 @@
+  }
+
   @OptIn(markerClass = com.google.android.material.badge.ExperimentalBadgeUtils.class)
   public void updateMenuBadge()

@@ -206,2 +235,3 @@
-    final int verticalOffset = dpToPx(8, context) + dpToPx(Integer.toString(count).length() * 5, context);
+    final int verticalOffset = dpToPx(8, context) + dpToPx(Integer.toString(0)
+                                                                  .length() * 5, context);
     BadgeUtils.detachBadgeDrawable(mBadgeDrawable, menuButton);

@@ -196,2 +223,4 @@
+  }
+
   @OptIn(markerClass = com.google.android.material.badge.ExperimentalBadgeUtils.class)
   public void updateMenuBadge()

@@ -196,2 +223,4 @@
+  }
+
   @OptIn(markerClass = com.google.android.material.badge.ExperimentalBadgeUtils.class)
   public void updateMenuBadge()

@@ -206,2 +235,3 @@
-    final int verticalOffset = dpToPx(8, context) + dpToPx(Integer.toString(count).length() * 5, context);
+    final int verticalOffset = dpToPx(8, context) + dpToPx(Integer.toString(0)
+                                                                  .length() * 5, context);
     BadgeUtils.detachBadgeDrawable(mBadgeDrawable, menuButton);