don't crash when last-selected value in overlay does not exist anymore (

fixes #5604) regression from #5596 but this commit solves the issue generally by just returning null if last-selected value is unknown
streetcomplete · Apr 29, 2024 · 2a52af4 · 2a52af4
1 parent dd0823d
commit 2a52af4
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/buildings/BuildingsOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/buildings/BuildingsOverlayForm.kt
@@ -15,6 +15,7 @@ import de.westnordost.streetcomplete.osm.building.toItems
 import de.westnordost.streetcomplete.overlays.AGroupedImageSelectOverlayForm
 import de.westnordost.streetcomplete.util.LastPickedValuesStore
 import de.westnordost.streetcomplete.util.getNameAndLocationLabel
+import de.westnordost.streetcomplete.util.ktx.valueOfOrNull
 import de.westnordost.streetcomplete.util.mostCommonWithin
 import de.westnordost.streetcomplete.util.padWith
 import de.westnordost.streetcomplete.view.image_select.GroupableDisplayItem
@@ -46,7 +47,7 @@ class BuildingsOverlayForm : AGroupedImageSelectOverlayForm<BuildingType>() {
             prefs,
             key = javaClass.simpleName,
             serialize = { it.value!!.name },
-            deserialize = { BuildingType.valueOf(it).asItem() }
+            deserialize = { valueOfOrNull<BuildingType>(it)?.asItem() }
         )
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/SeparateCyclewayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/cycleway/SeparateCyclewayForm.kt
@@ -14,6 +14,7 @@ import de.westnordost.streetcomplete.osm.cycleway_separate.asItem
 import de.westnordost.streetcomplete.osm.cycleway_separate.parseSeparateCycleway
 import de.westnordost.streetcomplete.overlays.AImageSelectOverlayForm
 import de.westnordost.streetcomplete.util.LastPickedValuesStore
+import de.westnordost.streetcomplete.util.ktx.valueOfOrNull
 import de.westnordost.streetcomplete.view.image_select.DisplayItem
 import org.koin.android.ext.android.inject
 
@@ -41,7 +42,7 @@ class SeparateCyclewayForm : AImageSelectOverlayForm<SeparateCycleway>() {
             prefs,
             key = javaClass.simpleName,
             serialize = { it.value!!.name },
-            deserialize = { SeparateCycleway.valueOf(it).asItem(countryInfo.isLeftHandTraffic) }
+            deserialize = { valueOfOrNull<SeparateCycleway>(it)?.asItem(countryInfo.isLeftHandTraffic) }
         )
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/surface/SurfaceOverlayForm.kt
@@ -28,6 +28,7 @@ import de.westnordost.streetcomplete.overlays.IAnswerItem
 import de.westnordost.streetcomplete.util.LastPickedValuesStore
 import de.westnordost.streetcomplete.util.getLocalesForFeatureDictionary
 import de.westnordost.streetcomplete.util.ktx.couldBeSteps
+import de.westnordost.streetcomplete.util.ktx.valueOfOrNull
 import de.westnordost.streetcomplete.view.setImage
 import org.koin.android.ext.android.inject
 
@@ -79,7 +80,7 @@ class SurfaceOverlayForm : AbstractOverlayForm() {
             prefs,
             key = javaClass.simpleName,
             serialize = { it.name },
-            deserialize = { Surface.valueOf(it) }
+            deserialize = { valueOfOrNull<Surface>(it) }
         )
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/overlays/way_lit/WayLitOverlayForm.kt b/app/src/main/java/de/westnordost/streetcomplete/overlays/way_lit/WayLitOverlayForm.kt
@@ -20,6 +20,7 @@ import de.westnordost.streetcomplete.overlays.AImageSelectOverlayForm
 import de.westnordost.streetcomplete.overlays.AnswerItem
 import de.westnordost.streetcomplete.util.LastPickedValuesStore
 import de.westnordost.streetcomplete.util.ktx.couldBeSteps
+import de.westnordost.streetcomplete.util.ktx.valueOfOrNull
 import de.westnordost.streetcomplete.view.image_select.DisplayItem
 import org.koin.android.ext.android.inject
 
@@ -48,7 +49,7 @@ class WayLitOverlayForm : AImageSelectOverlayForm<LitStatus>() {
             prefs,
             key = javaClass.simpleName,
             serialize = { it.value!!.name },
-            deserialize = { LitStatus.valueOf(it).asItem() }
+            deserialize = { valueOfOrNull<LitStatus>(it)?.asItem() }
         )
     }
 

diff --git a/app/src/main/java/de/westnordost/streetcomplete/util/ktx/Enum.kt b/app/src/main/java/de/westnordost/streetcomplete/util/ktx/Enum.kt
@@ -0,0 +1,4 @@
+package de.westnordost.streetcomplete.util.ktx
+
+inline fun <reified E : Enum<E>> valueOfOrNull(str: String): E? =
+    enumValues<E>().firstOrNull { str == it.name }