From 72377c9e7e98781290964a5f369aeb9a03ec44e3 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <maxime.naturel@niji.fr>
Date: Wed, 3 Aug 2022 09:31:52 +0200
Subject: [PATCH] Fixing after rebase

---
 .../live/map/LiveLocationMapViewFragment.kt        | 14 +++++---------
 .../layout/item_timeline_event_location_stub.xml   |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
index dfc2fe3ef4..a866d54a79 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/map/LiveLocationMapViewFragment.kt
@@ -109,6 +109,10 @@ class LiveLocationMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
     }
 
     override fun onDestroyView() {
+        onSymbolClickListener?.let { symbolManager?.removeClickListener(it) }
+        symbolManager?.onDestroy()
+        bottomSheetController.callback = null
+        views.liveLocationBottomSheetRecyclerView.cleanup()
         mapLoadingErrorListener?.let { mapView?.removeOnDidFailLoadingMapListener(it) }
         mapLoadingErrorListener = null
         mapView = null
@@ -120,14 +124,6 @@ class LiveLocationMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
         setupMap()
     }
 
-    override fun onDestroyView() {
-        onSymbolClickListener?.let { symbolManager?.removeClickListener(it) }
-        symbolManager?.onDestroy()
-        bottomSheetController.callback = null
-        views.liveLocationBottomSheetRecyclerView.cleanup()
-        super.onDestroyView()
-    }
-
     private fun setupMap() {
         val mapFragment = getOrCreateSupportMapFragment()
         mapFragment.getMapAsync { mapboxMap ->
@@ -154,7 +150,7 @@ class LiveLocationMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
     private fun listenMapLoadingError(mapView: MapView) {
         this.mapView = mapView
         mapLoadingErrorListener = MapView.OnDidFailLoadingMapListener {
-            viewModel.handle(LocationLiveMapAction.ShowMapLoadingError)
+            viewModel.handle(LiveLocationMapAction.ShowMapLoadingError)
         }.also { mapView.addOnDidFailLoadingMapListener(it) }
     }
 
diff --git a/vector/src/main/res/layout/item_timeline_event_location_stub.xml b/vector/src/main/res/layout/item_timeline_event_location_stub.xml
index 3eef4a4084..8de98b2260 100644
--- a/vector/src/main/res/layout/item_timeline_event_location_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_location_stub.xml
@@ -34,7 +34,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/locationLiveRunningBanner"
+        app:layout_constraintBottom_toTopOf="@id/liveLocationRunningBanner"
         app:layout_constraintEnd_toEndOf="@id/staticMapImageView"
         app:layout_constraintStart_toStartOf="@id/staticMapImageView"
         app:layout_constraintTop_toTopOf="@id/staticMapImageView"