Merge pull request #1332 from mendhak/milestone137

Milestone 137

Author: mendhak

gpslogger/build.gradle

@@ -45,8 +45,8 @@ android {
 
         targetSdkVersion 35
         compileSdk 35
-        versionCode 136
-        versionName "136"
+        versionCode 137
+        versionName "137"
 
         // Used by AppAuth-Android
         manifestPlaceholders = [

gpslogger/src/main/java/com/mendhak/gpslogger/GpsMainActivity.java

@@ -163,6 +163,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setUpNavigationDrawer(savedInstanceState);
 
         loadDefaultFragmentView();
+        handleVersionChanges();
 
 
         if(!Systems.hasUserGrantedAllNecessaryPermissions(this)){
@@ -189,6 +190,21 @@ protected void onCreate(Bundle savedInstanceState) {
             }
         }
     }
+    private void handleVersionChanges() {
+        int currentVersion = BuildConfig.VERSION_CODE;
+        if (preferenceHelper.getLastVersionSeen() < currentVersion) {
+            String visibility = preferenceHelper.getSharedPreferences().getString(PreferenceNames.OPENSTREETMAP_VISIBILITY, null);
+            if (visibility != null && ("public".equals(visibility) || "private".equals(visibility))) {
+                preferenceHelper.setOSMVisibility("trackable");
+                SimpleDialog.build()
+                        .msg(R.string.osm_visibility_migration_message)
+                        .pos(R.string.ok)
+                        .cancelable(false)
+                        .show(this);
+            }
+            preferenceHelper.setLastVersionSeen(currentVersion);
+        }
+    }
 
     private final ActivityResultLauncher<String> backgroundPermissionLauncher =
             registerForActivityResult(new ActivityResultContracts.RequestPermission(),

gpslogger/src/main/java/com/mendhak/gpslogger/common/PreferenceHelper.java

@@ -1082,13 +1082,16 @@ public void setOSMTags(String tags){
      */
     @ProfilePreference(name= PreferenceNames.OPENSTREETMAP_VISIBILITY)
     public String getOSMVisibility() {
-        return prefs.getString(PreferenceNames.OPENSTREETMAP_VISIBILITY, "private");
+        return prefs.getString(PreferenceNames.OPENSTREETMAP_VISIBILITY, "trackable");
     }
 
     public void setOSMVisibility(String visibility){
         prefs.edit().putString(PreferenceNames.OPENSTREETMAP_VISIBILITY, visibility).apply();
     }
 
+    public SharedPreferences getSharedPreferences() {
+        return prefs;
+    }
 
     /**
      * Whether to auto send to OpenStreetMap

gpslogger/src/main/res/values/arrays.xml

@@ -31,8 +31,6 @@
 
 
     <string-array name="osm_visibility_choices">
-        <item>private</item>
-        <item>public</item>
         <item>trackable</item>
         <item>identifiable</item>
     </string-array>

gpslogger/src/main/res/values/strings.xml

@@ -225,6 +225,7 @@
 
     <string name="osm_description">Description</string>
     <string name="osm_description_summary">The description to use when uploading a trace</string>
+    <string name="osm_visibility_migration_message">OpenStreetMap is removing "public" and "private" GPS trace visibility options. Your setting has been updated to "trackable" to avoid errors.</string>
     <string name="osm_tags">Tags</string>
     <string name="osm_tags_summary">The tags to apply when uploading a trace</string>
 

gpslogger/src/main/res/xml/osmsettings.xml

@@ -14,7 +14,7 @@
         app:iconSpaceReserved="false" />
 
     <Preference
-        android:defaultValue="private"
+        android:defaultValue="trackable"
         android:entries="@array/osm_visibility_choices"
         android:entryValues="@array/osm_visibility_choices"
         android:key="osm_visibility"

gradle.properties

@@ -11,3 +11,6 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 org.gradle.unsafe.configuration-cache=true
 org.gradle.configuration-cache=false
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true