commit fe30cc326a7a89202b0dd8ed721f449d0557161c Author: Fabio Mazza Date: Mon Jan 22 13:40:01 2024 +0100 Set default value in settings for live positions source diff --git a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java index f5bfea6..e593268 100644 --- a/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java +++ b/app/src/main/java/it/reyboz/bustorino/ActivityPrincipal.java @@ -769,6 +769,14 @@ public class ActivityPrincipal extends GeneralActivity implements FragmentListen editor.putStringSet(SettingsFragment.KEY_ARRIVALS_FETCHERS_USE, utils.convertArrayToSet(defaultVals)); edit=true; } + //Live bus positions + final String keySourcePositions=getString(R.string.pref_positions_source); + final String positionsSource = mainSharedPref.getString(keySourcePositions, ""); + if(positionsSource.isEmpty()){ + String[] defaultVals = getResources().getStringArray(R.array.positions_source_values); + editor.putString(keySourcePositions, defaultVals[0]); + edit=true; + } if (edit){ editor.commit(); } diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/MapFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/MapFragment.java index 5c9ca24..0035c62 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/MapFragment.java +++ b/app/src/main/java/it/reyboz/bustorino/fragments/MapFragment.java @@ -76,6 +76,8 @@ import it.reyboz.bustorino.backend.Stop; import it.reyboz.bustorino.middleware.GeneralActivity; import it.reyboz.bustorino.util.Permissions; +import static it.reyboz.bustorino.fragments.SettingsFragment.LIVE_POSITIONS_PREF_MQTT_VALUE; + public class MapFragment extends ScreenBaseFragment { //private static final String TAG = "Busto-MapActivity"; @@ -234,7 +236,7 @@ public class MapFragment extends ScreenBaseFragment { String keySourcePositions=getString(R.string.pref_positions_source); useMQTTViewModel = ( PreferenceManager.getDefaultSharedPreferences(requireContext()) - .getString(keySourcePositions,"mqtt").contentEquals("mqtt")); + .getString(keySourcePositions,LIVE_POSITIONS_PREF_MQTT_VALUE).contentEquals(LIVE_POSITIONS_PREF_MQTT_VALUE)); //Start map from bundle @@ -363,7 +365,8 @@ public class MapFragment extends ScreenBaseFragment { /// choose which to use String keySourcePositions=getString(R.string.pref_positions_source); useMQTTViewModel = PreferenceManager.getDefaultSharedPreferences(requireContext()) - .getString(keySourcePositions,"mqtt").contentEquals("mqtt"); + .getString(keySourcePositions,LIVE_POSITIONS_PREF_MQTT_VALUE).contentEquals( + LIVE_POSITIONS_PREF_MQTT_VALUE); if(livePositionsViewModel !=null) { //gtfsPosViewModel.requestUpdates(); if(useMQTTViewModel) diff --git a/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java index ac9dc4a..d94e929 100644 --- a/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java +++ b/app/src/main/java/it/reyboz/bustorino/fragments/SettingsFragment.java @@ -51,6 +51,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared Handler mHandler; public final static String PREF_KEY_STARTUP_SCREEN="startup_screen_to_show"; public final static String KEY_ARRIVALS_FETCHERS_USE = "arrivals_fetchers_use_setting"; + public final static String LIVE_POSITIONS_PREF_MQTT_VALUE="mqtt"; private boolean setSummaryStartupPref = false;