Fix issue with URL migration

app/build.gradle

@@ -9,8 +9,8 @@ android {
         buildConfigField "boolean", "HIDDEN_APP", "false"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 38
+        versionCode 39
-        versionName '5.1'
+        versionName '5.2'
     }
 
     lintOptions {

app/src/main/java/org/traccar/client/MainApplication.java

@@ -21,8 +21,11 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Color;
+import android.net.Uri;
 import android.os.Build;
+import android.preference.PreferenceManager;
 
 public class MainApplication extends Application {
 
@@ -33,6 +36,8 @@ public class MainApplication extends Application {
         super.onCreate();
         System.setProperty("http.keepAliveDuration", String.valueOf(30 * 60 * 1000));
 
+        migrateLegacyPreferences(PreferenceManager.getDefaultSharedPreferences(this));
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             registerChannel();
         }
@@ -47,4 +52,22 @@ public class MainApplication extends Application {
         ((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).createNotificationChannel(channel);
     }
 
+    private void migrateLegacyPreferences(SharedPreferences preferences) {
+        String port = preferences.getString("port", null);
+        if (port != null) {
+            String host = preferences.getString("address", getString(R.string.settings_url_default_value));
+            String scheme = preferences.getBoolean("secure", false) ? "https" : "http";
+
+            Uri.Builder builder = new Uri.Builder();
+            builder.scheme(scheme).encodedAuthority(host + ":" + port).build();
+            SharedPreferences.Editor editor = preferences.edit();
+            editor.putString(MainFragment.KEY_URL, builder.toString());
+
+            editor.remove("port");
+            editor.remove("address");
+            editor.remove("secure");
+            editor.apply();
+        }
+    }
+
 }

app/src/main/java/org/traccar/client/MainFragment.java

@@ -78,7 +78,6 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         setHasOptionsMenu(true);
 
         sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        migrateLegacyPreferences(sharedPreferences);
         addPreferencesFromResource(R.xml.preferences);
         initPreferences();
 
@@ -288,24 +287,4 @@ public class MainFragment extends PreferenceFragment implements OnSharedPreferen
         return false;
     }
 
-    private void migrateLegacyPreferences(SharedPreferences preferences) {
-        String port = preferences.getString("port", null);
-        if (port != null) {
-            Log.d(TAG, "Migrating to URL preference");
-
-            String host = preferences.getString("address", getString(R.string.settings_url_default_value));
-            String scheme = preferences.getBoolean("secure", false) ? "https" : "http";
-
-            Uri.Builder builder = new Uri.Builder();
-            builder.scheme(scheme).encodedAuthority(host + ":" + port).build();
-            SharedPreferences.Editor editor = preferences.edit();
-            editor.putString(KEY_URL, builder.toString());
-
-            editor.remove("port");
-            editor.remove("address");
-            editor.remove("secure");
-            editor.apply();
-        }
-    }
-
 }

app/src/main/java/org/traccar/client/TrackingController.java

@@ -66,7 +66,7 @@ public class TrackingController implements PositionProvider.PositionListener, Ne
         networkManager = new NetworkManager(context, this);
         isOnline = networkManager.isOnline();
 
-        url = preferences.getString(MainFragment.KEY_URL, null);
+        url = preferences.getString(MainFragment.KEY_URL, context.getString(R.string.settings_url_default_value));
 
         PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
         wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());

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

@@ -9,7 +9,6 @@
   <string name="settings_id_title">Device identifier</string>
   <string name="settings_url_title">Server URL</string>
   <string name="settings_url_summary">Tracking server URL</string>
-  <string name="settings_url_default_value" translatable="false">http://demo.traccar.org:5055</string>
   <string name="settings_interval_title">Frequency</string>
   <string name="settings_interval_summary">Reporting interval in seconds</string>
   <string name="settings_distance_title">Distance</string>

app/src/main/res/values/values.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <string name="settings_url_default_value" translatable="false">http://demo.traccar.org:5055</string>
+
     <string-array name="settings_provider_values" translatable="false">
         <item>gps</item>
         <item>network</item>