fix edit history selection was never cleared (fixes #5600)

streetcomplete · Apr 28, 2024 · e2d1e15 · e2d1e15
1 parent 1dcfd10
commit e2d1e15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt
@@ -1013,8 +1013,7 @@ class MainFragment :
         if (editHistoryFragment != null) {
             childFragmentManager.popBackStack(EDIT_HISTORY, FragmentManager.POP_BACK_STACK_INCLUSIVE)
         }
-        clearHighlighting()
-        mapFragment?.clearFocus()
+        editHistoryViewModel.select(null)
         mapFragment?.pinMode = MainMapFragment.PinMode.QUESTS
         historyBackPressedCallback.isEnabled = false
     }

diff --git a/.../main/java/de/westnordost/streetcomplete/screens/main/edithistory/EditHistoryViewModel.kt b/.../main/java/de/westnordost/streetcomplete/screens/main/edithistory/EditHistoryViewModel.kt
@@ -86,7 +86,9 @@ class EditHistoryViewModelImpl(
     } ?: ElementPointGeometry(edit.position)
 
     override fun select(editKey: EditKey?) {
-        selectedEdit.value = edits.value.firstOrNull { it.key == editKey }
+        selectedEdit.value =
+            if (editKey != null) edits.value.firstOrNull { it.key == editKey }
+            else null
     }
 
     override fun undo(edit: Edit) {