fix: preferences that are enums can be set either by integer or case-insensitive string

fixes #1874

Author: growse

CHANGELOG.md

@@ -14,6 +14,8 @@
 - Try to not block the main thread when generating an Status Message, which causes an ANR
 - Messages that fail to send because the endpoint isn't ready now retry every 10 seconds, not every second
 - Import config screen displays JSON config LTR under RTL locales
+- setting / importing configuration options that are enums are now case-insensitive
+- Fix regression where setting the locatorPriority preference using a number wasn't working (#1874)
 
 ## Version 2.5.3
 

project/app/src/androidTest/java/org/owntracks/android/mqtt/MQTTMessagePublishTests.kt

@@ -196,7 +196,7 @@ class MQTTMessagePublishTests :
   private fun setupTestActivity() {
     PreferenceManager.getDefaultSharedPreferences(app)
         .edit()
-        .putInt(Preferences::monitoring.name, MonitoringMode.QUIET.value)
+        .putInt(Preferences::monitoring.name, MonitoringMode.Quiet.value)
         .putString(Preferences::reverseGeocodeProvider.name, "None")
         .apply()
     setNotFirstStartPreferences()

project/app/src/androidTest/java/org/owntracks/android/ui/ClickOnPreference.kt

@@ -9,7 +9,7 @@ import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import com.adevinta.android.barista.interaction.BaristaSleepInteractions.sleep
 import org.hamcrest.Matchers.allOf
 
-private const val SLEEP_MILLIS = 100L
+private const val SLEEP_MILLIS = 10L
 
 fun clickOnDrawerAndWait(text: Int) {
   Espresso.onView(

project/app/src/androidTest/java/org/owntracks/android/ui/ContactsActivityTests.kt

@@ -43,7 +43,7 @@ class ContactsActivityTests :
     setNotFirstStartPreferences()
     getPreferences()
         .edit()
-        .putInt(Preferences::monitoring.name, MonitoringMode.QUIET.value)
+        .putInt(Preferences::monitoring.name, MonitoringMode.Quiet.value)
         .putString(Preferences::reverseGeocodeProvider.name, "None")
         .apply()
     launchActivity()

project/app/src/androidTest/java/org/owntracks/android/ui/PreferencesActivityTests.kt

@@ -190,7 +190,7 @@ class PreferencesActivityTests :
     val expected =
         baristaRule.activityTestRule.activity.resources.run {
           getStringArray(R.array.geocoders)[
-              getStringArray(R.array.geocoderValues).indexOfFirst { it == defaultGeocoder.value }]
+              getStringArray(R.array.geocoderValues).indexOfFirst { it == defaultGeocoder.name }]
         }
     assertContains(android.R.id.summary, expected)
   }

project/app/src/gms/java/org/owntracks/android/preferences/DefaultsProviderImpl.kt

@@ -9,7 +9,7 @@ class DefaultsProviderImpl : DefaultsProvider {
   override fun <T> getDefaultValue(preferences: Preferences, property: KProperty<*>): T {
     return when (property) {
       Preferences::mapLayerStyle -> MapLayerStyle.GoogleMapDefault
-      Preferences::reverseGeocodeProvider -> ReverseGeocodeProvider.DEVICE
+      Preferences::reverseGeocodeProvider -> ReverseGeocodeProvider.Device
       else -> super.getDefaultValue<T>(preferences, property)
     }
         as T

project/app/src/gms/java/org/owntracks/android/ui/map/MapLayerStyle.kt

@@ -34,7 +34,7 @@ enum class MapLayerStyle {
     @JvmStatic
     @FromConfiguration
     fun getByValue(value: String): MapLayerStyle =
-        entries.firstOrNull { it.name == value } ?: GoogleMapDefault
+        entries.firstOrNull { it.name.equals(value, true) } ?: GoogleMapDefault
   }
 }
 

project/app/src/main/java/org/owntracks/android/App.kt

@@ -193,9 +193,9 @@ class App :
   @MainThread
   private fun setThemeFromPreferences() {
     when (preferences.theme) {
-      AppTheme.AUTO -> AppCompatDelegate.setDefaultNightMode(Preferences.SYSTEM_NIGHT_AUTO_MODE)
-      AppTheme.DARK -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
-      AppTheme.LIGHT -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+      AppTheme.Auto -> AppCompatDelegate.setDefaultNightMode(Preferences.SYSTEM_NIGHT_AUTO_MODE)
+      AppTheme.Dark -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+      AppTheme.Light -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
     }
   }
 

project/app/src/main/java/org/owntracks/android/geocoding/GeocoderProvider.kt

@@ -51,10 +51,10 @@ constructor(
           withContext(ioDispatcher) {
             geocoder =
                 when (preferences.reverseGeocodeProvider) {
-                  ReverseGeocodeProvider.OPENCAGE ->
+                  ReverseGeocodeProvider.OpenCage ->
                       OpenCageGeocoder(preferences.opencageApiKey, httpClient)
-                  ReverseGeocodeProvider.DEVICE -> DeviceGeocoder(context)
-                  ReverseGeocodeProvider.NONE -> GeocoderNone()
+                  ReverseGeocodeProvider.Device -> DeviceGeocoder(context)
+                  ReverseGeocodeProvider.None -> GeocoderNone()
                 }
           }
         }

project/app/src/main/java/org/owntracks/android/location/LocatorPriority.kt

@@ -2,16 +2,23 @@ package org.owntracks.android.location
 
 import org.owntracks.android.preferences.types.FromConfiguration
 
-enum class LocatorPriority {
-  HighAccuracy,
-  BalancedPowerAccuracy,
-  LowPower,
-  NoPower;
+enum class LocatorPriority(private val value: Int) {
+  HighAccuracy(3),
+  BalancedPowerAccuracy(2),
+  LowPower(1),
+  NoPower(0);
 
   companion object {
     @JvmStatic
     @FromConfiguration
-    fun getByValue(value: String?): LocatorPriority? =
-        LocatorPriority.entries.firstOrNull { it.name == value }
+    fun getByValue(value: Int): LocatorPriority =
+        LocatorPriority.entries.firstOrNull { it.value == value } ?: BalancedPowerAccuracy
+
+    @JvmStatic
+    @FromConfiguration
+    fun getByValue(value: String): LocatorPriority =
+        value.toIntOrNull()?.run(::getByValue)
+            ?: entries.firstOrNull { it.name.equals(value, true) }
+            ?: BalancedPowerAccuracy
   }
 }