From 9641ff132d520d54306a333cf31c1b26f08fe7a1 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 20 Jun 2022 13:58:28 +0300
Subject: [PATCH 1/8] Show live location sharing option even if labs flag is
 disabled.

---
 .../app/features/location/LocationSharingFragment.kt   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index 1b25f3fcec..e25520ed81 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -41,7 +41,6 @@ import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
 import im.vector.app.features.location.live.duration.ChooseLiveDurationBottomSheet
 import im.vector.app.features.location.option.LocationSharingOption
-import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.util.MatrixItem
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -53,7 +52,6 @@ class LocationSharingFragment @Inject constructor(
         private val urlMapProvider: UrlMapProvider,
         private val avatarRenderer: AvatarRenderer,
         private val matrixItemColorProvider: MatrixItemColorProvider,
-        private val vectorPreferences: VectorPreferences,
 ) : VectorBaseFragment<FragmentLocationSharingBinding>(),
         LocationTargetChangeListener,
         VectorBaseBottomSheetDialogFragment.ResultListener {
@@ -223,13 +221,7 @@ class LocationSharingFragment @Inject constructor(
     private fun updateMap(state: LocationSharingViewState) {
         // first, update the options view
         val options: Set<LocationSharingOption> = when (state.areTargetAndUserLocationEqual) {
-            true -> {
-                if (vectorPreferences.labsEnableLiveLocation()) {
-                    setOf(LocationSharingOption.USER_CURRENT, LocationSharingOption.USER_LIVE)
-                } else {
-                    setOf(LocationSharingOption.USER_CURRENT)
-                }
-            }
+            true -> setOf(LocationSharingOption.USER_CURRENT, LocationSharingOption.USER_LIVE)
             false -> setOf(LocationSharingOption.PINNED)
             else -> emptySet()
         }

From b37dce7da7aa4df47d46fa27f343e429d3acdacf Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 20 Jun 2022 15:19:22 +0300
Subject: [PATCH 2/8] Create layout for promoting live location labs flag.

---
 ...heet_live_location_labs_flag_promotion.xml | 56 +++++++++++++++++++
 vector/src/main/res/values/strings.xml        |  6 ++
 2 files changed, 62 insertions(+)
 create mode 100644 vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml

diff --git a/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml b/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml
new file mode 100644
index 0000000000..438e60a4d3
--- /dev/null
+++ b/vector/src/main/res/layout/bottom_sheet_live_location_labs_flag_promotion.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?colorSurface"
+    android:orientation="vertical"
+    android:paddingHorizontal="16dp"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/circle"
+        android:backgroundTint="?vctr_live_location"
+        android:importantForAccessibility="no"
+        android:padding="4dp"
+        android:src="@drawable/ic_attachment_location_live_white" />
+
+    <TextView
+        style="@style/TextAppearance.Vector.Headline.Medium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="24dp"
+        android:text="@string/live_location_labs_promotion_title" />
+
+    <TextView
+        style="@style/TextAppearance.Vector.Body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="24dp"
+        android:gravity="center"
+        android:text="@string/live_location_labs_promotion_description" />
+
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/promoteLiveLocationFlagSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="40dp"
+        android:text="@string/live_location_labs_promotion_switch_title"
+        app:switchPadding="8dp" />
+
+    <Button
+        android:id="@+id/promoteLiveLocationFlagOkButton"
+        style="@style/Widget.Vector.Button.Positive"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/ok" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index f60da53c09..9c310565d1 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3088,4 +3088,10 @@
     <string name="settings_troubleshoot_test_current_endpoint_failed">Cannot find the endpoint.</string>
     <string name="settings_troubleshoot_test_current_gateway_title">Gateway</string>
     <string name="settings_troubleshoot_test_current_gateway">Current gateway: %s</string>
+
+    <!-- Live Location Sharing Labs Flag Promotional BottomSheet -->
+    <string name="live_location_labs_promotion_title">Live location sharing</string>
+    <string name="live_location_labs_promotion_description">Please note: this is a labs feature using a temporary implementation. This means you will not be able to delete your location history, and advanced users will be able to see your location history even after you stop sharing your live location with this room.</string>
+    <string name="live_location_labs_promotion_switch_title">Enable location sharing</string>
+
 </resources>

From 13144f078a4aa9170121642782afacce3e7d1bbf Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 20 Jun 2022 15:41:43 +0300
Subject: [PATCH 3/8] Implement live location promotional bottom sheet.

---
 ...iveLocationLabsFlagPromotionBottomSheet.kt | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt

diff --git a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
new file mode 100644
index 0000000000..283e44b0e3
--- /dev/null
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.app.features.location.live
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
+import im.vector.app.databinding.BottomSheetLiveLocationLabsFlagPromotionBinding
+
+/**
+ * Bottom sheet to warn users that feature is still in active development. Users are able to enable labs flag by using the switch in this bottom sheet.
+ * This should not be shown if the user already enabled the labs flag.
+ */
+class LiveLocationLabsFlagPromotionBottomSheet
+    : VectorBaseBottomSheetDialogFragment<BottomSheetLiveLocationLabsFlagPromotionBinding>() {
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetLiveLocationLabsFlagPromotionBinding {
+        return BottomSheetLiveLocationLabsFlagPromotionBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initOkButton()
+    }
+
+    private fun initOkButton() {
+        views.promoteLiveLocationFlagOkButton.debouncedClicks {
+            val enableLabsFlag = views.promoteLiveLocationFlagSwitch.isChecked
+            resultListener?.onBottomSheetResult(ResultListener.RESULT_OK, enableLabsFlag)
+            dismiss()
+        }
+    }
+
+    companion object {
+        fun newInstance(resultListener: ResultListener): LiveLocationLabsFlagPromotionBottomSheet {
+            return LiveLocationLabsFlagPromotionBottomSheet().also {
+                it.resultListener = resultListener
+            }
+        }
+    }
+}

From 80abe1f6750ee1c9d34dade566618223f7daad4a Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 20 Jun 2022 17:04:56 +0300
Subject: [PATCH 4/8] Show live location promotional bottom sheet.

---
 .../location/LocationSharingFragment.kt       | 32 +++++++++++++++----
 ...iveLocationLabsFlagPromotionBottomSheet.kt |  6 ++--
 .../features/settings/VectorPreferences.kt    |  6 ++++
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index e25520ed81..84034c6461 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -39,8 +39,10 @@ import im.vector.app.core.utils.registerForPermissionsResult
 import im.vector.app.databinding.FragmentLocationSharingBinding
 import im.vector.app.features.home.AvatarRenderer
 import im.vector.app.features.home.room.detail.timeline.helper.MatrixItemColorProvider
+import im.vector.app.features.location.live.LiveLocationLabsFlagPromotionBottomSheet
 import im.vector.app.features.location.live.duration.ChooseLiveDurationBottomSheet
 import im.vector.app.features.location.option.LocationSharingOption
+import im.vector.app.features.settings.VectorPreferences
 import org.matrix.android.sdk.api.util.MatrixItem
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -52,6 +54,7 @@ class LocationSharingFragment @Inject constructor(
         private val urlMapProvider: UrlMapProvider,
         private val avatarRenderer: AvatarRenderer,
         private val matrixItemColorProvider: MatrixItemColorProvider,
+        private val vectorPreferences: VectorPreferences,
 ) : VectorBaseFragment<FragmentLocationSharingBinding>(),
         LocationTargetChangeListener,
         VectorBaseBottomSheetDialogFragment.ResultListener {
@@ -192,6 +195,25 @@ class LocationSharingFragment @Inject constructor(
         }
     }
 
+    private val liveLocationLabsFlagPromotionListener = object : VectorBaseBottomSheetDialogFragment.ResultListener {
+        override fun onBottomSheetResult(resultCode: Int, data: Any?) {
+            // Check if the user wants to enable the labs flag
+            if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK && (data as? Boolean) == true) {
+                vectorPreferences.setLiveLocationLabsEnabled()
+                startLiveLocationSharing()
+            }
+        }
+    }
+
+    private fun tryStartLiveLocationSharing() {
+        if (vectorPreferences.labsEnableLiveLocation()) {
+            startLiveLocationSharing()
+        } else {
+            LiveLocationLabsFlagPromotionBottomSheet.newInstance(liveLocationLabsFlagPromotionListener)
+                    .show(requireActivity().supportFragmentManager, "DISPLAY_LIVE_LOCATION_LABS_FLAG_PROMOTION")
+        }
+    }
+
     private val foregroundLocationResultLauncher = registerForPermissionsResult { allGranted, deniedPermanently ->
         if (allGranted) {
             startLiveLocationSharing()
@@ -200,18 +222,14 @@ class LocationSharingFragment @Inject constructor(
         }
     }
 
-    private fun tryStartLiveLocationSharing() {
+    private fun startLiveLocationSharing() {
         // we need to re-check foreground location to be sure it has not changed after landing on this screen
         if (checkPermissions(PERMISSIONS_FOR_FOREGROUND_LOCATION_SHARING, requireActivity(), foregroundLocationResultLauncher)) {
-            startLiveLocationSharing()
+            ChooseLiveDurationBottomSheet.newInstance(this)
+                    .show(requireActivity().supportFragmentManager, "DISPLAY_CHOOSE_DURATION_OPTIONS")
         }
     }
 
-    private fun startLiveLocationSharing() {
-        ChooseLiveDurationBottomSheet.newInstance(this)
-                .show(requireActivity().supportFragmentManager, "DISPLAY_CHOOSE_DURATION_OPTIONS")
-    }
-
     override fun onBottomSheetResult(resultCode: Int, data: Any?) {
         if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK) {
             (data as? Long)?.let { viewModel.handle(LocationSharingAction.StartLiveLocationSharing(it)) }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
index 283e44b0e3..5c11a26d6d 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
@@ -27,8 +27,10 @@ import im.vector.app.databinding.BottomSheetLiveLocationLabsFlagPromotionBinding
  * Bottom sheet to warn users that feature is still in active development. Users are able to enable labs flag by using the switch in this bottom sheet.
  * This should not be shown if the user already enabled the labs flag.
  */
-class LiveLocationLabsFlagPromotionBottomSheet
-    : VectorBaseBottomSheetDialogFragment<BottomSheetLiveLocationLabsFlagPromotionBinding>() {
+class LiveLocationLabsFlagPromotionBottomSheet :
+    VectorBaseBottomSheetDialogFragment<BottomSheetLiveLocationLabsFlagPromotionBinding>() {
+
+    override val showExpanded = true
 
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): BottomSheetLiveLocationLabsFlagPromotionBinding {
         return BottomSheetLiveLocationLabsFlagPromotionBinding.inflate(inflater, container, false)
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index 276317b557..d389c76dfa 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -1047,6 +1047,12 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_LIVE_LOCATION, false)
     }
 
+    fun setLiveLocationLabsEnabled() {
+        defaultPrefs.edit {
+            putBoolean(SETTINGS_LABS_ENABLE_LIVE_LOCATION, true)
+        }
+    }
+
     /**
      * Indicates whether or not thread messages are enabled.
      */

From ab34bb6df7e3eaae5bcfe007d7df085a8abd15dc Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Mon, 20 Jun 2022 17:10:00 +0300
Subject: [PATCH 5/8] Changelog added.

---
 changelog.d/6350.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6350.feature

diff --git a/changelog.d/6350.feature b/changelog.d/6350.feature
new file mode 100644
index 0000000000..e0bc4ac28b
--- /dev/null
+++ b/changelog.d/6350.feature
@@ -0,0 +1 @@
+Promote live location labs flag

From 320915e0a1186d7908cf543b9f5e03179ca8924f Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 28 Jun 2022 14:52:01 +0300
Subject: [PATCH 6/8] Code review fixes.

---
 .../features/location/LocationSharingFragment.kt    | 13 ++++++++-----
 .../app/features/settings/VectorPreferences.kt      |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index 84034c6461..1deb9fade2 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -197,11 +197,14 @@ class LocationSharingFragment @Inject constructor(
 
     private val liveLocationLabsFlagPromotionListener = object : VectorBaseBottomSheetDialogFragment.ResultListener {
         override fun onBottomSheetResult(resultCode: Int, data: Any?) {
-            // Check if the user wants to enable the labs flag
-            if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK && (data as? Boolean) == true) {
-                vectorPreferences.setLiveLocationLabsEnabled()
-                startLiveLocationSharing()
-            }
+            handleLiveLocationLabsFlagPromotionResult(resultCode, data)
+        }
+    }
+
+    private fun handleLiveLocationLabsFlagPromotionResult(resultCode: Int, data: Any?) {
+        if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK && (data as? Boolean) == true) {
+            vectorPreferences.setLiveLocationLabsEnabled(isEnabled = true)
+            startLiveLocationSharing()
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
index d389c76dfa..8fd520e883 100755
--- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
@@ -1047,9 +1047,9 @@ class VectorPreferences @Inject constructor(
         return defaultPrefs.getBoolean(SETTINGS_LABS_ENABLE_LIVE_LOCATION, false)
     }
 
-    fun setLiveLocationLabsEnabled() {
+    fun setLiveLocationLabsEnabled(isEnabled: Boolean) {
         defaultPrefs.edit {
-            putBoolean(SETTINGS_LABS_ENABLE_LIVE_LOCATION, true)
+            putBoolean(SETTINGS_LABS_ENABLE_LIVE_LOCATION, isEnabled)
         }
     }
 

From 2fe03a0016d268d79e1492b9c3b3d265c7e2e0aa Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 28 Jun 2022 15:06:42 +0300
Subject: [PATCH 7/8] Code review fixes.

---
 .../location/LocationSharingFragment.kt       | 35 +++++++++++++++----
 ...iveLocationLabsFlagPromotionBottomSheet.kt |  6 ++--
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index 1deb9fade2..fa121005cb 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -24,6 +24,8 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -68,6 +70,29 @@ class LocationSharingFragment @Inject constructor(
 
     private var hasRenderedUserAvatar = false
 
+    private val liveLocationLabsFlagPromotionListener = object : VectorBaseBottomSheetDialogFragment.ResultListener {
+        override fun onBottomSheetResult(resultCode: Int, data: Any?) {
+            handleLiveLocationLabsFlagPromotionResult(resultCode, data)
+        }
+    }
+
+    private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
+        override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
+            if (f is LiveLocationLabsFlagPromotionBottomSheet) {
+                f.resultListener = liveLocationLabsFlagPromotionListener
+            }
+            super.onFragmentResumed(fm, f)
+
+        }
+
+        override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
+            if (f is LiveLocationLabsFlagPromotionBottomSheet) {
+                f.resultListener = null
+            }
+            super.onFragmentPaused(fm, f)
+        }
+    }
+
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationSharingBinding {
         return FragmentLocationSharingBinding.inflate(inflater, container, false)
     }
@@ -75,6 +100,8 @@ class LocationSharingFragment @Inject constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        activity?.supportFragmentManager?.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
+
         mapView = WeakReference(views.mapView)
         views.mapView.onCreate(savedInstanceState)
 
@@ -195,12 +222,6 @@ class LocationSharingFragment @Inject constructor(
         }
     }
 
-    private val liveLocationLabsFlagPromotionListener = object : VectorBaseBottomSheetDialogFragment.ResultListener {
-        override fun onBottomSheetResult(resultCode: Int, data: Any?) {
-            handleLiveLocationLabsFlagPromotionResult(resultCode, data)
-        }
-    }
-
     private fun handleLiveLocationLabsFlagPromotionResult(resultCode: Int, data: Any?) {
         if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK && (data as? Boolean) == true) {
             vectorPreferences.setLiveLocationLabsEnabled(isEnabled = true)
@@ -212,7 +233,7 @@ class LocationSharingFragment @Inject constructor(
         if (vectorPreferences.labsEnableLiveLocation()) {
             startLiveLocationSharing()
         } else {
-            LiveLocationLabsFlagPromotionBottomSheet.newInstance(liveLocationLabsFlagPromotionListener)
+            LiveLocationLabsFlagPromotionBottomSheet.newInstance()
                     .show(requireActivity().supportFragmentManager, "DISPLAY_LIVE_LOCATION_LABS_FLAG_PROMOTION")
         }
     }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
index 5c11a26d6d..77928ec536 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
@@ -50,10 +50,8 @@ class LiveLocationLabsFlagPromotionBottomSheet :
     }
 
     companion object {
-        fun newInstance(resultListener: ResultListener): LiveLocationLabsFlagPromotionBottomSheet {
-            return LiveLocationLabsFlagPromotionBottomSheet().also {
-                it.resultListener = resultListener
-            }
+        fun newInstance(): LiveLocationLabsFlagPromotionBottomSheet {
+            return LiveLocationLabsFlagPromotionBottomSheet()
         }
     }
 }

From 3ec8c77d1775c533d060203bbcf0c24a41a5163c Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 28 Jun 2022 17:12:52 +0300
Subject: [PATCH 8/8] Code review fix.

---
 .../location/LocationSharingFragment.kt       | 41 ++++++-------------
 ...iveLocationLabsFlagPromotionBottomSheet.kt |  9 +++-
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
index fa121005cb..f881e694b6 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt
@@ -24,8 +24,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
 import androidx.core.view.isGone
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.setFragmentResultListener
 import androidx.lifecycle.lifecycleScope
 import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
@@ -70,38 +69,22 @@ class LocationSharingFragment @Inject constructor(
 
     private var hasRenderedUserAvatar = false
 
-    private val liveLocationLabsFlagPromotionListener = object : VectorBaseBottomSheetDialogFragment.ResultListener {
-        override fun onBottomSheetResult(resultCode: Int, data: Any?) {
-            handleLiveLocationLabsFlagPromotionResult(resultCode, data)
-        }
-    }
-
-    private val fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
-        override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {
-            if (f is LiveLocationLabsFlagPromotionBottomSheet) {
-                f.resultListener = liveLocationLabsFlagPromotionListener
-            }
-            super.onFragmentResumed(fm, f)
-
-        }
-
-        override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {
-            if (f is LiveLocationLabsFlagPromotionBottomSheet) {
-                f.resultListener = null
-            }
-            super.onFragmentPaused(fm, f)
-        }
-    }
-
     override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationSharingBinding {
         return FragmentLocationSharingBinding.inflate(inflater, container, false)
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setFragmentResultListener(LiveLocationLabsFlagPromotionBottomSheet.REQUEST_KEY) { _, bundle ->
+            val isApproved = bundle.getBoolean(LiveLocationLabsFlagPromotionBottomSheet.BUNDLE_KEY_LABS_APPROVAL)
+            handleLiveLocationLabsFlagPromotionResult(isApproved)
+        }
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        activity?.supportFragmentManager?.registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false)
-
         mapView = WeakReference(views.mapView)
         views.mapView.onCreate(savedInstanceState)
 
@@ -222,8 +205,8 @@ class LocationSharingFragment @Inject constructor(
         }
     }
 
-    private fun handleLiveLocationLabsFlagPromotionResult(resultCode: Int, data: Any?) {
-        if (resultCode == VectorBaseBottomSheetDialogFragment.ResultListener.RESULT_OK && (data as? Boolean) == true) {
+    private fun handleLiveLocationLabsFlagPromotionResult(isApproved: Boolean) {
+        if (isApproved) {
             vectorPreferences.setLiveLocationLabsEnabled(isEnabled = true)
             startLiveLocationSharing()
         }
diff --git a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
index 77928ec536..cf360ec277 100644
--- a/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
+++ b/vector/src/main/java/im/vector/app/features/location/live/LiveLocationLabsFlagPromotionBottomSheet.kt
@@ -20,6 +20,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.setFragmentResult
 import im.vector.app.core.platform.VectorBaseBottomSheetDialogFragment
 import im.vector.app.databinding.BottomSheetLiveLocationLabsFlagPromotionBinding
 
@@ -44,12 +45,18 @@ class LiveLocationLabsFlagPromotionBottomSheet :
     private fun initOkButton() {
         views.promoteLiveLocationFlagOkButton.debouncedClicks {
             val enableLabsFlag = views.promoteLiveLocationFlagSwitch.isChecked
-            resultListener?.onBottomSheetResult(ResultListener.RESULT_OK, enableLabsFlag)
+            setFragmentResult(REQUEST_KEY, Bundle().apply {
+                putBoolean(BUNDLE_KEY_LABS_APPROVAL, enableLabsFlag)
+            })
             dismiss()
         }
     }
 
     companion object {
+
+        const val REQUEST_KEY = "LiveLocationLabsFlagPromotionBottomSheetRequest"
+        const val BUNDLE_KEY_LABS_APPROVAL = "BUNDLE_KEY_LABS_APPROVAL"
+
         fun newInstance(): LiveLocationLabsFlagPromotionBottomSheet {
             return LiveLocationLabsFlagPromotionBottomSheet()
         }