Various Play insight fixes

app/src/main/org/runnerup/db/PathSimplifier.java

@@ -13,6 +13,7 @@
 import java.util.Locale;
 import org.runnerup.R;
 import org.runnerup.common.util.Constants;
+import org.runnerup.util.SafeParse;
 
 /** Wrapper for com.goebl.simplify.Simplify. */
 public class PathSimplifier {
@@ -82,16 +83,13 @@ public PathSimplifier(Context context) {
     // get user settings
 
     // tolerance in meters (default to R.string.path_simplification_default_tolerance)
-    double tolerance;
-    try {
-      tolerance =
-          Double.parseDouble(
-              prefs.getString(
-                  res.getString(R.string.pref_path_simplification_tolerance),
-                  res.getString(R.string.path_simplification_default_tolerance)));
-    } catch (Exception ex) {
-      tolerance = Double.parseDouble(res.getString(R.string.path_simplification_default_tolerance));
-    }
+    double tolerance =
+        SafeParse.parseDouble(
+            prefs.getString(
+                res.getString(R.string.pref_path_simplification_tolerance),
+                res.getString(R.string.path_simplification_default_tolerance)),
+            SafeParse.parseDouble(
+                res.getString(R.string.path_simplification_default_tolerance), 3.0));
     // squared tolerance in meters has to be transformed to tolerance in degrees
     this.toleranceDeg = tolerance / ONE_DEGREE;
 

app/src/main/org/runnerup/export/RunKeeperSynchronizer.java

@@ -61,6 +61,7 @@
 import org.runnerup.export.oauth2client.OAuth2Server;
 import org.runnerup.export.util.SyncHelper;
 import org.runnerup.util.Formatter;
+import org.runnerup.util.SafeParse;
 import org.runnerup.util.SyncActivityItem;
 import org.runnerup.workout.Sport;
 
@@ -556,11 +557,7 @@ private double getLapLength() {
     if (prefs.getBoolean(res.getString(R.string.pref_autolap_active), false)) {
       String autoLap =
           prefs.getString(res.getString(R.string.pref_autolap), String.valueOf(lapLength));
-      try {
-        lapLength = Double.parseDouble(autoLap);
-      } catch (NumberFormatException e) {
-        return lapLength;
-      }
+      lapLength = SafeParse.parseDouble(autoLap, lapLength);
       return lapLength;
     }
     return lapLength;

app/src/main/org/runnerup/export/SyncManager.java

@@ -338,7 +338,12 @@ private void handleAuth(Callback callback, final Synchronizer l, AuthMethod auth
     authCallback = callback;
     switch (authMethod) {
       case OAUTH2:
-        mActivity.startActivityForResult(l.getAuthIntent(mActivity), CONFIGURE_REQUEST);
+        if (mActivity != null) {
+          mActivity.startActivityForResult(l.getAuthIntent(mActivity), CONFIGURE_REQUEST);
+        } else {
+          Log.e(getClass().getName(), "Cannot start auth activity, no Activity context");
+          handleAuthComplete(l, Status.ERROR);
+        }
         return;
       case USER_PASS:
       case USER_PASS_URL:
@@ -591,7 +596,9 @@ private void nextSynchronizer() {
       return;
     }
 
-    mSpinner.setTitle("Uploading (" + pendingSynchronizers.size() + ")");
+    if (mSpinner != null && mSpinner.isShowing()) {
+      mSpinner.setTitle("Uploading (" + pendingSynchronizers.size() + ")");
+    }
     final Synchronizer synchronizer = synchronizers.get(pendingSynchronizers.iterator().next());
     pendingSynchronizers.remove(synchronizer.getName());
     doUpload(synchronizer);

app/src/main/org/runnerup/export/format/RunKeeper.java

@@ -48,6 +48,7 @@
 import org.runnerup.db.entities.LocationEntity;
 import org.runnerup.export.RunKeeperSynchronizer;
 import org.runnerup.util.JsonWriter;
+import org.runnerup.util.SafeParse;
 import org.runnerup.workout.Sport;
 
 /**
@@ -182,7 +183,7 @@ public static ActivityEntity parseToActivity(JSONObject response, double unitMet
       newActivity.setComment(response.getString("notes"));
     }
     newActivity.setTime((long) Float.parseFloat(response.getString("duration")));
-    newActivity.setDistance(Double.parseDouble(response.getString("total_distance")));
+    newActivity.setDistance(SafeParse.parseDouble(response.getString("total_distance"), 0.0));
 
     String startTime = response.getString("start_time");
     SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss", Locale.US);

app/src/main/org/runnerup/notification/ForegroundNotificationDisplayStrategy.java

@@ -3,6 +3,7 @@
 import android.Manifest;
 import android.app.Notification;
 import android.app.Service;
+import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Build;
@@ -16,25 +17,35 @@ public ForegroundNotificationDisplayStrategy(Service service) {
     this.service = service;
   }
 
+  private boolean isForeground = false;
+
   @Override
   public void notify(int notificationId, Notification notification) {
-    int type = 0;
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      if (ContextCompat.checkSelfPermission(service, Manifest.permission.ACCESS_FINE_LOCATION)
-          == PackageManager.PERMISSION_GRANTED) {
-        type = ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
-      }
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
-          && ContextCompat.checkSelfPermission(service, Manifest.permission.ACTIVITY_RECOGNITION)
-              == PackageManager.PERMISSION_GRANTED) {
-        type |= ServiceInfo.FOREGROUND_SERVICE_TYPE_HEALTH;
+    if (!isForeground) {
+      int type = 0;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        if (ContextCompat.checkSelfPermission(service, Manifest.permission.ACCESS_FINE_LOCATION)
+            == PackageManager.PERMISSION_GRANTED) {
+          type = ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION;
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE
+            && ContextCompat.checkSelfPermission(service, Manifest.permission.ACTIVITY_RECOGNITION)
+                == PackageManager.PERMISSION_GRANTED) {
+          type |= ServiceInfo.FOREGROUND_SERVICE_TYPE_HEALTH;
+        }
       }
+      ServiceCompat.startForeground(service, notificationId, notification, type);
+      isForeground = true;
+    } else {
+      android.app.NotificationManager notificationManager =
+          (android.app.NotificationManager) service.getSystemService(Context.NOTIFICATION_SERVICE);
+      notificationManager.notify(notificationId, notification);
     }
-    ServiceCompat.startForeground(service, notificationId, notification, type);
   }
 
   @Override
   public void cancel(int notificationId) {
+    isForeground = false;
     ServiceCompat.stopForeground(service, ServiceCompat.STOP_FOREGROUND_REMOVE);
   }
 }

app/src/main/org/runnerup/tracker/Tracker.java

@@ -554,7 +554,12 @@ public void completeActivity(boolean save, Double manualDistance) {
       ContentValues tmp = new ContentValues();
       tmp.put("deleted", 1);
       String[] key = {Long.toString(mActivityId)};
-      mDB.update(DB.ACTIVITY.TABLE, tmp, "_id = ?", key);
+
+      if (mDB == null) {
+        android.util.Log.e("Tracker", "completeActivity called but mDB is null");
+      } else {
+        mDB.update(DB.ACTIVITY.TABLE, tmp, "_id = ?", key);
+      }
       liveLog(DB.LOCATION.TYPE_DISCARD);
     }
 
@@ -564,6 +569,10 @@ public void completeActivity(boolean save, Double manualDistance) {
   }
 
   private void saveActivity(Double manualDistance) {
+    if (mDB == null) {
+      android.util.Log.e("Tracker", "saveActivity called but mDB is null");
+      return;
+    }
     ContentValues tmp = new ContentValues();
     if (mHeartbeatNanos > 0) {
       long avgHR = Math.round(60 * mHeartbeats * 1000 * NANO_IN_MILLI / mHeartbeatNanos); // BPM
@@ -595,6 +604,11 @@ private void saveActivity(Double manualDistance) {
   }
 
   private void setNextLocationType(int newType) {
+    if (mDBWriter == null) {
+      android.util.Log.w(
+          "Tracker", "setNextLocationType: mDBWriter is null (newType=" + newType + ")");
+      return;
+    }
     ContentValues key = mDBWriter.getKey();
     key.put(DB.LOCATION.TYPE, newType);
     mDBWriter.setKey(key);

app/src/main/org/runnerup/util/SafeParse.java

@@ -36,11 +36,14 @@ public static long parseLong(String string, long defaultValue) {
   }
 
   public static double parseDouble(String string, double defaultValue) {
+    if (string == null) return defaultValue;
     try {
-      return Double.parseDouble(string);
+      // Normalize input: replace comma with dot to support international format
+      String normalized = string.replace(',', '.');
+      return Double.parseDouble(normalized);
     } catch (Exception ex) {
+      return defaultValue;
     }
-    return defaultValue;
   }
 
   /**

app/src/main/org/runnerup/view/AudioCueSettingsFragment.java

@@ -11,6 +11,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.speech.tts.TextToSpeech;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -59,11 +60,39 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     setHasOptionsMenu(true); // this fragment has menu items
   }
 
+  private String sanitizeSettingsName(String name) {
+    if (name == null) return null;
+    return name.replaceAll("[\\\\/:*?\"<>|\\p{Cntrl}]", "_");
+  }
+
   @Override
   public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-    settingsName = requireArguments().getString("name");
+    String optionName = requireArguments().getString("name");
+    settingsName = sanitizeSettingsName(optionName);
 
     if (settingsName != null) {
+      if (!settingsName.equals(optionName)) {
+        // illegal names could previously be created, raised exceptions
+        Log.d(getClass().getName(), "Audio cue name contains illegal characters: " + optionName);
+        settingsName = optionName;
+        new AlertDialog.Builder(requireContext())
+            .setMessage(org.runnerup.common.R.string.Delete_audio_cue)
+            .setPositiveButton(
+                org.runnerup.common.R.string.Yes,
+                (dialog, which) -> {
+                  dialog.dismiss();
+                  deleteAudioScheme();
+                })
+            .setNegativeButton(
+                org.runnerup.common.R.string.No,
+                (dialog, which) -> {
+                  // Do nothing but close the dialog
+                  dialog.dismiss();
+                })
+            .show();
+        return;
+      }
+
       PreferenceManager prefMgr = getPreferenceManager();
       prefMgr.setSharedPreferencesName(settingsName + SUFFIX);
       prefMgr.setSharedPreferencesMode(MODE_PRIVATE);
@@ -182,8 +211,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
       createNewAudioSchemeDialog();
       return true;
     }
+    // deleteMenuItem selected
     new AlertDialog.Builder(requireContext())
-        .setMessage(org.runnerup.common.R.string.Are_you_sure)
+        .setMessage(org.runnerup.common.R.string.Delete_audio_cue)
         .setPositiveButton(
             org.runnerup.common.R.string.Yes,
             (dialog, which) -> {
@@ -223,7 +253,7 @@ private void deleteAudioSchemeImpl(String name) {
                 + File.separator
                 + PREFS_DIR
                 + "/"
-                + name
+                + sanitizeSettingsName(name)
                 + SUFFIX
                 + ".xml");
     //noinspection ResultOfMethodCallIgnored
@@ -291,6 +321,7 @@ private void switchTo(String name) {
     }
 
     if (name != null && settingsName != null && name.contentEquals(settingsName)) {
+      Log.e(getClass().getName(), "Settings name: " + settingsName + " do not match: " + name);
       return;
     }
 
@@ -320,11 +351,18 @@ private void createNewAudioSchemeDialog() {
             org.runnerup.common.R.string.OK,
             (dialog, which) -> {
               String scheme = editText.getText().toString();
-              if (!scheme.contentEquals("")) {
-                createNewAudioScheme(scheme);
-                updateSortOrder(scheme);
-                switchTo(scheme);
+              if (!scheme.equals(sanitizeSettingsName(scheme))
+                  || scheme.isEmpty()
+                  || scheme.contains("/")
+                  || scheme.contains("\\")
+                  || scheme.contains("..")) {
+                Log.d(
+                    getClass().getName(), "Audio cue name contains illegal characters: " + scheme);
+                return;
               }
+              createNewAudioScheme(scheme);
+              updateSortOrder(scheme);
+              switchTo(scheme);
             })
         .setNegativeButton(org.runnerup.common.R.string.Cancel, (dialog, which) -> {})
         .show();
@@ -351,13 +389,13 @@ private void CreateNewNoTtsAvailableDialog() {
                 return;
               }
 
+              Context context = getContext();
+              if (context == null) return;
               SharedPreferences prefs;
               if (settingsName == null || settingsName.contentEquals(DEFAULT))
-                prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
+                prefs = PreferenceManager.getDefaultSharedPreferences(context);
               else
-                prefs =
-                    requireContext()
-                        .getSharedPreferences(settingsName + SUFFIX, Context.MODE_PRIVATE);
+                prefs = context.getSharedPreferences(settingsName + SUFFIX, Context.MODE_PRIVATE);
               final boolean mute =
                   prefs.getBoolean(getResources().getString(R.string.pref_mute_bool), false);
 

app/src/main/org/runnerup/view/ManualActivity.java

@@ -185,7 +185,7 @@ final void saveEntry() {
     }
     double dist = 0;
     if (distance.length() > 0) {
-      dist = Double.parseDouble(distance.toString()); // convert to
+      dist = SafeParse.parseDouble(distance.toString(), 0.0); // convert to
       // meters
       save.put(DB.ACTIVITY.DISTANCE, dist);
     }

app/src/main/org/runnerup/view/StartFragment.java

@@ -18,6 +18,7 @@
 package org.runnerup.view;
 
 import android.Manifest;
+import android.app.Activity;
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -857,9 +858,12 @@ private boolean checkPermissions(boolean popup) {
           builder
               .setPositiveButton(
                   org.runnerup.common.R.string.OK,
-                  (dialog, id) ->
-                      ActivityCompat.requestPermissions(
-                          requireActivity(), permissions, REQUEST_LOCATION))
+                  (dialog, id) -> {
+                    Activity activity = getActivity();
+                    if (activity != null) {
+                      ActivityCompat.requestPermissions(activity, permissions, REQUEST_LOCATION);
+                    }
+                  })
               .setMessage(
                   baseMessage
                       + "\n"

app/src/main/org/runnerup/workout/RepeatStep.java

@@ -162,11 +162,17 @@ public void onComplete(Scope scope, Workout s) {
 
   @Override
   public double getDistance(Workout w, Scope s) {
+    if (currentStep < 0 || currentStep >= steps.size()) {
+      return 0.0;
+    }
     return steps.get(currentStep).getDistance(w, s);
   }
 
   @Override
   public double getTime(Workout w, Scope s) {
+    if (currentStep < 0 || currentStep >= steps.size()) {
+      return 0.0;
+    }
     return steps.get(currentStep).getTime(w, s);
   }
 

app/src/main/org/runnerup/workout/Step.java

@@ -354,7 +354,11 @@ public void onResume(Workout s) {
     for (Trigger t : triggers) {
       t.onResume(s);
     }
-    s.tracker.resume();
+    if (s.tracker != null) {
+      s.tracker.resume();
+    } else {
+      android.util.Log.w("Step", "onResume: s.tracker is null");
+    }
   }
 
   @Override