From 915712a7ae39827522e444840eb5f6bd84e78218 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Fri, 25 Dec 2015 15:21:51 +0300
Subject: [PATCH] [android] fix: Do not restart alarm if tracker is not
 enabled.

---
 .../mapswithme/maps/location/TrackRecorder.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/android/src/com/mapswithme/maps/location/TrackRecorder.java b/android/src/com/mapswithme/maps/location/TrackRecorder.java
index 93f2b3dc2f..39f4e495f0 100644
--- a/android/src/com/mapswithme/maps/location/TrackRecorder.java
+++ b/android/src/com/mapswithme/maps/location/TrackRecorder.java
@@ -29,7 +29,7 @@ public final class TrackRecorder
     @Override
     public void run()
     {
-      restartAlarm();
+      restartAlarmIfEnabled();
     }
   };
 
@@ -77,7 +77,7 @@ public final class TrackRecorder
         if (foreground)
           TrackRecorderWakeService.stop();
         else
-          restartAlarm();
+          restartAlarmIfEnabled();
       }
     });
 
@@ -92,10 +92,11 @@ public final class TrackRecorder
     return PendingIntent.getBroadcast(MwmApplication.get(), 0, sAlarmIntent, 0);
   }
 
-  private static void restartAlarm()
+  private static void restartAlarmIfEnabled()
   {
-    TrackRecorder.log("restartAlarm()");
-    sAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + WAKEUP_INTERVAL_MS, getAlarmIntent());
+    TrackRecorder.log("restartAlarmIfEnabled()");
+    if (nativeIsEnabled())
+      sAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + WAKEUP_INTERVAL_MS, getAlarmIntent());
   }
 
   private static void stop()
@@ -118,7 +119,7 @@ public final class TrackRecorder
     nativeSetEnabled(enabled);
 
     if (enabled)
-      restartAlarm();
+      restartAlarmIfEnabled();
     else
       stop();
   }
@@ -180,8 +181,8 @@ public final class TrackRecorder
     TrackRecorder.log("onServiceStopped()");
     LocationHelper.INSTANCE.removeLocationListener(sLocationListener);
 
-    if (nativeIsEnabled() && !MwmApplication.backgroundTracker().isForeground())
-      restartAlarm();
+    if (!MwmApplication.backgroundTracker().isForeground())
+      restartAlarmIfEnabled();
   }
 
   static void log(String message)