Fix tag settings, disable controlServerOverride when dev mode disabled

rtr-nettest · Apr 23, 2023 · 1530d4d · 1530d4d
1 parent e3f5777
commit 1530d4d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/app/src/main/java/at/rtr/rmbt/android/config/AppConfig.kt b/app/src/main/java/at/rtr/rmbt/android/config/AppConfig.kt
@@ -179,13 +179,7 @@ class AppConfig @Inject constructor(context: Context, private val serverSettings
         set(value) = setString(BuildConfig.CONTROL_SERVER_HOST, value)
 
     override var measurementTag: String?
-        get() {
-            return if (developerModeIsEnabled && developerModeIsAvailable) {
-                preferences.getString(KEY_MEASUREMENT_TAG, null)
-            } else {
-                return null
-            }
-        }
+        get() = preferences.getString(KEY_MEASUREMENT_TAG, null)
         set(value) = preferences.edit()
             .putString(KEY_MEASUREMENT_TAG, value)
             .apply()

diff --git a/app/src/main/java/at/rtr/rmbt/android/viewmodel/SettingsViewModel.kt b/app/src/main/java/at/rtr/rmbt/android/viewmodel/SettingsViewModel.kt
@@ -78,6 +78,8 @@ class SettingsViewModel @Inject constructor(
                 }
                 appConfig.secretCodeDeveloperModeOff -> {
                     state.developerModeIsEnabled.set(false)
+                    state.controlServerOverrideEnabled.set(false)
+                    state.mapServerOverrideEnabled.set(false)
                     R.string.preferences_developer_options_disabled
                 }
                 appConfig.secretCodeCoverageModeOn -> {
@@ -96,6 +98,8 @@ class SettingsViewModel @Inject constructor(
                     state.developerModeIsEnabled.set(false)
                     state.coverageModeEnabled.set(false)
                     state.developerModeTag.set(null)
+                    state.controlServerOverrideEnabled.set(false)
+                    state.mapServerOverrideEnabled.set(false)
                     R.string.preferences_all_disabled
                 }
                 else -> {