Places: Always recycle Bitmaps when clearing annotation cache. (#4451)

wikimedia · Feb 6, 2024 · f6432c1 · f6432c1
1 parent c0d7caf
commit f6432c1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/app/src/main/java/org/wikipedia/places/PlacesFragment.kt b/app/src/main/java/org/wikipedia/places/PlacesFragment.kt
@@ -156,7 +156,7 @@ class PlacesFragment : Fragment(), LinkPreviewDialog.LoadPageCallback, LinkPrevi
         if (it.resultCode == RESULT_OK) {
             val languageChanged = it.data?.getBooleanExtra(PlacesFilterActivity.EXTRA_LANG_CHANGED, false) ?: false
             if (languageChanged) {
-                annotationCache.clear()
+                clearAnnotationCache()
                 viewModel.highlightedPageTitle = null
                 symbolManager?.deleteAll()
                 viewModel.fetchNearbyPages(lastLocation?.latitude ?: 0.0,
@@ -252,10 +252,6 @@ class PlacesFragment : Fragment(), LinkPreviewDialog.LoadPageCallback, LinkPrevi
             }
         }
 
-        binding.viewButtonsGroup.post {
-            binding.viewButtonsGroup.isVisible = true
-        }
-
         binding.viewButtonsGroup.addOnButtonCheckedListener { _, checkedId, isChecked ->
             if (!isChecked) {
                 return@addOnButtonCheckedListener
@@ -546,18 +542,23 @@ class PlacesFragment : Fragment(), LinkPreviewDialog.LoadPageCallback, LinkPrevi
         binding.mapView.onDestroy()
         _binding = null
 
-        annotationCache.forEach {
-            if (it.bitmap != null) {
-                Glide.get(requireContext()).bitmapPool.put(it.bitmap!!)
-            }
-        }
+        clearAnnotationCache()
         markerBitmapBase.recycle()
         if (Prefs.shouldShowOneTimePlacesSurvey == SURVEY_NOT_INITIALIZED) {
             Prefs.shouldShowOneTimePlacesSurvey = SURVEY_SHOW
         }
         super.onDestroyView()
     }
 
+    private fun clearAnnotationCache() {
+        annotationCache.forEach {
+            if (it.bitmap != null) {
+                Glide.get(requireContext()).bitmapPool.put(it.bitmap!!)
+            }
+        }
+        annotationCache.clear()
+    }
+
     private fun onUpdateCameraPosition(latLng: LatLng) {
         lastLocation = Location("").also {
             it.latitude = latLng.latitude

diff --git a/app/src/main/res/layout/fragment_places.xml b/app/src/main/res/layout/fragment_places.xml
@@ -94,7 +94,6 @@
             android:layout_height="wrap_content"
             android:layout_marginVertical="8dp"
             android:layout_gravity="center_horizontal"
-            android:visibility="gone"
             app:selectionRequired="true"
             app:singleSelection="true">