Cleanup.

src/main/java/de/dennisguse/opentracks/TrackController.java

@@ -61,7 +61,7 @@ public class TrackController {
         public void run() {
             if (isResumed && isRecording && !isPaused) {
                 totalTimeTextView.setText(StringUtils.formatElapsedTimeWithHour(System.currentTimeMillis() - totalTimeTimestamp + totalTime));
-                handlerUpdateTotalTime.postDelayed(this, UnitConversions.ONE_SECOND);
+                handlerUpdateTotalTime.postDelayed(this, UnitConversions.ONE_SECOND_MS);
             }
         }
     };
@@ -115,7 +115,7 @@ public class TrackController {
             totalTimeTextView.setText(StringUtils.formatElapsedTimeWithHour(totalTime));
             if (!isPaused) {
                 totalTimeTimestamp = System.currentTimeMillis();
-                handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UnitConversions.ONE_SECOND);
+                handlerUpdateTotalTime.postDelayed(updateTotalTimeRunnable, UnitConversions.ONE_SECOND_MS);
             }
         }
     }

src/main/java/de/dennisguse/opentracks/fragments/MarkerDetailFragment.java

@@ -57,7 +57,7 @@ public class MarkerDetailFragment extends Fragment {
 
     private static final String TAG = MarkerDetailFragment.class.getSimpleName();
     private static final String KEY_MARKER_ID = "markerId";
-    private static final long HIDE_TEXT_DELAY = 4 * UnitConversions.ONE_SECOND;
+    private static final long HIDE_TEXT_DELAY = 4 * UnitConversions.ONE_SECOND_MS;
     private ContentProviderUtils contentProviderUtils;
     private Handler handler;
     private ImageView photoView;

src/main/java/de/dennisguse/opentracks/fragments/StatsFragment.java

@@ -64,7 +64,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
 
     private static final String STATS_FRAGMENT_TAG = StatsFragment.class.getSimpleName();
 
-    private static final long UI_UPDATE_INTERVAL = UnitConversions.ONE_SECOND;
+    private static final long UI_UPDATE_INTERVAL = UnitConversions.ONE_SECOND_MS;
 
     private TrackDataHub trackDataHub;
     private Handler handlerUpdateUI;

src/main/java/de/dennisguse/opentracks/services/TrackRecordingService.java

@@ -72,16 +72,19 @@ import de.dennisguse.opentracks.util.UnitConversions;
  */
 public class TrackRecordingService extends Service {
 
-    private static final int NOTIFICATION_ID = 123;
+    // TODO Move to a different place.
-
+    @Deprecated
     public static final double PAUSE_LATITUDE = 100.0;
+    @Deprecated
     public static final double RESUME_LATITUDE = 200.0;
 
     // Anything faster than that (in meters per second) will be considered moving.
-    public static final double MAX_NO_MOVEMENT_SPEED = 0.224;
     private static final String TAG = TrackRecordingService.class.getSimpleName();
-    // 1 minute in milliseconds
+
-    private static final long ONE_MINUTE = (long) (UnitConversions.MIN_TO_S * UnitConversions.S_TO_MS);
+    private static final int NOTIFICATION_ID = 123;
+
+    public static final double MAX_NO_MOVEMENT_SPEED = 0.224;
+
     // The following variables are set in onCreate:
     private ExecutorService executorService;
     private ContentProviderUtils contentProviderUtils;
@@ -90,17 +93,15 @@ public class TrackRecordingService extends Service {
     private PeriodicTaskExecutor voiceExecutor;
     private SharedPreferences sharedPreferences;
     private TrackRecordingServiceNotificationManager notificationManager;
+    private LocationListenerPolicy locationListenerPolicy;
+
     private long recordingTrackId;
     private boolean recordingTrackPaused;
-    private LocationListenerPolicy locationListenerPolicy;
     private int recordingDistanceInterval;
     private int maxRecordingDistance;
     private int recordingGpsAccuracy;
     private long currentRecordingInterval;
 
-    // The following variables are set when recording:
-    private TripStatisticsUpdater trackTripStatisticsUpdater;
-    // Note that sharedPreferenceChangeListener cannot be an anonymous inner class; anonymous inner class will get garbage collected.
     private final OnSharedPreferenceChangeListener sharedPreferenceChangeListener = new OnSharedPreferenceChangeListener() {
         @Override
         public void onSharedPreferenceChanged(SharedPreferences preferences, String key) {
@@ -125,12 +126,12 @@ public class TrackRecordingService extends Service {
                 int minRecordingInterval = PreferencesUtils.getMinRecordingInterval(context);
                 if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptBatteryLife(context)) {
                     // Choose battery life over moving time accuracy.
-                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(30 * UnitConversions.ONE_SECOND, 5 * ONE_MINUTE, 5);
+                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(30 * UnitConversions.ONE_SECOND_MS, 5 * UnitConversions.ONE_MINUTE_MS, 5);
                 } else if (minRecordingInterval == PreferencesUtils.getMinRecordingIntervalAdaptAccuracy(context)) {
                     // Get all the updates.
-                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(UnitConversions.ONE_SECOND, 30 * UnitConversions.ONE_SECOND, 0);
+                    locationListenerPolicy = new AdaptiveLocationListenerPolicy(UnitConversions.ONE_SECOND_MS, 30 * UnitConversions.ONE_SECOND_MS, 0);
                 } else {
-                    locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND);
+                    locationListenerPolicy = new AbsoluteLocationListenerPolicy(minRecordingInterval * UnitConversions.ONE_SECOND_MS);
                 }
             }
             if (PreferencesUtils.isKey(context, R.string.recording_distance_interval_key, key)) {
@@ -145,11 +146,14 @@ public class TrackRecordingService extends Service {
         }
     };
 
+    // The following variables are set when recording:
+    private TripStatisticsUpdater trackTripStatisticsUpdater;
     private WakeLock wakeLock;
     private BluetoothRemoteSensorManager remoteSensorManager;
     private Location lastLocation;
     private boolean currentSegmentHasLocation;
-    private boolean isIdle; // true if idle
+    private boolean isIdle;
+
     private ServiceBinder binder = new ServiceBinder(this);
     private final LocationListener locationListener = new LocationListener() {
 
@@ -191,7 +195,7 @@ public class TrackRecordingService extends Service {
             if (isRecording() && !isPaused()) {
                 registerLocationListener();
             }
-            handler.postDelayed(this, ONE_MINUTE);
+            handler.postDelayed(this, UnitConversions.ONE_MINUTE_MS);
         }
     };
 
@@ -363,11 +367,6 @@ public class TrackRecordingService extends Service {
         return trackId;
     }
 
-    /**
-     * Restart a track.
-     *
-     * @param track the track
-     */
     private void restartTrack(Track track) {
         Log.d(TAG, "Restarting track: " + track.getId());
 
@@ -375,7 +374,6 @@ public class TrackRecordingService extends Service {
         trackTripStatisticsUpdater = new TripStatisticsUpdater(tripStatistics.getStartTime());
 
         try (TrackPointIterator locationIterator = contentProviderUtils.getTrackPointLocationIterator(track.getId(), -1L, false, TrackPointFactory.DEFAULT_LOCATION_FACTORY)) {
-
             while (locationIterator.hasNext()) {
                 Location location = locationIterator.next();
                 trackTripStatisticsUpdater.addLocation(location, recordingDistanceInterval);
@@ -386,9 +384,6 @@ public class TrackRecordingService extends Service {
         startRecording();
     }
 
-    /**
-     * Resumes current track.
-     */
     private void resumeCurrentTrack() {
         if (!isRecording() || !isPaused()) {
             Log.d(TAG, "Ignore resumeCurrentTrack. Not recording or not paused.");
@@ -429,18 +424,12 @@ public class TrackRecordingService extends Service {
         voiceExecutor.restore();
     }
 
-    /**
-     * Starts gps.
-     */
     private void startGps() {
         wakeLock = SystemUtils.acquireWakeLock(this, wakeLock);
         registerLocationListener();
         showNotification(true);
     }
 
-    /**
-     * Ends the current track.
-     */
     private void endCurrentTrack() {
         if (!isRecording()) {
             Log.d(TAG, "Ignore endCurrentTrack. Not recording.");
@@ -474,9 +463,6 @@ public class TrackRecordingService extends Service {
         endRecording(true);
     }
 
-    /**
-     * Pauses the current track.
-     */
     private void pauseCurrentTrack() {
         if (!isRecording() || isPaused()) {
             Log.d(TAG, "Ignore pauseCurrentTrack. Not recording or paused.");
@@ -569,7 +555,6 @@ public class TrackRecordingService extends Service {
      * @param location the location
      */
     private void onLocationChangedAsync(Location location) {
-        try {
         if (!isRecording() || isPaused()) {
             Log.w(TAG, "Ignore onLocationChangedAsync. Not recording or paused.");
             return;
@@ -657,13 +642,6 @@ public class TrackRecordingService extends Service {
             Log.d(TAG, "Not recording location, idle");
         }
         lastLocation = location;
-        } catch (Error e) {
-            Log.e(TAG, "Error in onLocationChangedAsync", e);
-            throw e;
-        } catch (RuntimeException e) {
-            Log.e(TAG, "RuntimeException in onLocationChangedAsync", e);
-            throw e;
-        }
     }
 
     /**
@@ -699,7 +677,7 @@ public class TrackRecordingService extends Service {
     }
 
     /**
-     * Updates the recording track time as well as the startId and the stopId.
+     * Updates the recording track time.
      * Increase the number of points if it is a new and valid track point.
      *
      * @param track                  the track
@@ -722,9 +700,6 @@ public class TrackRecordingService extends Service {
         return remoteSensorManager.getSensorDataSet();
     }
 
-    /**
-     * Registers the location listener.
-     */
     private void registerLocationListener() {
         if (locationManagerConnector == null) {
             Log.e(TAG, "locationManager is null.");
@@ -739,9 +714,6 @@ public class TrackRecordingService extends Service {
         }
     }
 
-    /**
-     * Unregisters the location manager.
-     */
     private void unregisterLocationListener() {
         if (locationManagerConnector == null) {
             Log.e(TAG, "locationManager is null.");
@@ -750,9 +722,6 @@ public class TrackRecordingService extends Service {
         locationManagerConnector.removeLocationUpdates(locationListener);
     }
 
-    /**
-     * Releases the wake lock.
-     */
     private void releaseWakeLock() {
         if (wakeLock != null && wakeLock.isHeld()) {
             wakeLock.release();
@@ -761,10 +730,14 @@ public class TrackRecordingService extends Service {
     }
 
     private void showNotification(boolean isGpsStarted) {
-        if ((isRecording() && isPaused()) || (!isRecording() && !isGpsStarted)) {
+        // Dijkstra If
+        if (isRecording() && isPaused()) {
+            stopForeground(true);
+
+        }
+        if (!isRecording() && !isGpsStarted) {
             stopForeground(true);
         }
-
         if (isRecording() && !isPaused()) {
             Intent intent = IntentUtils.newIntent(this, TrackDetailActivity.class)
                     .putExtra(TrackDetailActivity.EXTRA_TRACK_ID, recordingTrackId);
@@ -785,7 +758,6 @@ public class TrackRecordingService extends Service {
 
             notificationManager.updatePendingIntent(pendingIntent);
             notificationManager.updateContent(getString(R.string.gps_starting));
-
             startForeground(NOTIFICATION_ID, notificationManager.getNotification());
         }
     }

src/main/java/de/dennisguse/opentracks/util/BluetoothUtils.java

@@ -60,7 +60,7 @@ public class BluetoothUtils {
         while (adapters.isEmpty()) {
             synchronized (mutex) {
                 try {
-                    mutex.wait(UnitConversions.ONE_SECOND);
+                    mutex.wait(UnitConversions.ONE_SECOND_MS);
                 } catch (InterruptedException e) {
                     Log.e(TAG, "Interrupted while waiting for default bluetooth adapter", e);
                 }

src/main/java/de/dennisguse/opentracks/util/UnitConversions.java

@@ -27,7 +27,9 @@ public class UnitConversions {
 
     // Time
     // 1 second in milliseconds
-    public static final long ONE_SECOND = UnitConversions.S_TO_MS;
+    public static final long ONE_SECOND_MS = UnitConversions.S_TO_MS;
+    public static final long ONE_MINUTE_MS = (long) (UnitConversions.MIN_TO_S * UnitConversions.S_TO_MS);
+
     // multiplication factor to convert milliseconds to seconds
     public static final double MS_TO_S = 1d / S_TO_MS;
     // multiplication factor to convert minutes to seconds