From 493dc57a292e0ed708727d2bc1f7e2f9a2fbece6 Mon Sep 17 00:00:00 2001
From: Onuray Sahin <onuray.sahin@gmail.com>
Date: Tue, 19 Jul 2022 13:41:00 +0300
Subject: [PATCH] Code review fixes.

---
 .../features/location/LocationSharingFragment.kt    |  4 +---
 .../features/location/LocationSharingViewModel.kt   | 13 ++++++-------
 vector/src/main/res/values/strings.xml              |  4 ++--
 3 files changed, 9 insertions(+), 12 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 d131ff3f74..17e53e63d1 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
@@ -175,9 +175,7 @@ class LocationSharingFragment @Inject constructor(
         MaterialAlertDialogBuilder(requireActivity())
                 .setTitle(R.string.live_location_not_enough_permission_dialog_title)
                 .setMessage(R.string.live_location_not_enough_permission_dialog_description)
-                .setPositiveButton(R.string.ok) { dialogInterface, _ ->
-                    dialogInterface.dismiss()
-                }
+                .setPositiveButton(R.string.ok, null)
                 .show()
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
index 8e166ee350..8056b72d57 100644
--- a/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt
@@ -75,22 +75,21 @@ class LocationSharingViewModel @AssistedInject constructor(
         setUserItem()
         updatePin()
         compareTargetAndUserLocation()
-        checkPowerLevelsForLiveLocationSharing()
+        observePowerLevelsForLiveLocationSharing()
     }
 
-    private fun checkPowerLevelsForLiveLocationSharing() {
+    private fun observePowerLevelsForLiveLocationSharing() {
         PowerLevelsFlowFactory(room).createFlow()
                 .distinctUntilChanged()
-                .onEach {
+                .setOnEach {
                     val powerLevelsHelper = PowerLevelsHelper(it)
                     val canShareLiveLocation = EventType.STATE_ROOM_BEACON_INFO
-                            .map { beaconInfoType ->
+                            .all { beaconInfoType ->
                                 powerLevelsHelper.isUserAllowedToSend(session.myUserId, true, beaconInfoType)
                             }
-                            .all { isUserAllowed -> isUserAllowed }
 
-                    setState { copy(canShareLiveLocation = canShareLiveLocation) }
-                }.launchIn(viewModelScope)
+                    copy(canShareLiveLocation = canShareLiveLocation)
+                }
     }
 
     private fun initLocationTracking() {
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index bd5860c1ab..69ea15ea9b 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3054,8 +3054,8 @@
     <!-- TODO remove key -->
     <string name="live_location_bottom_sheet_stop_sharing" tools:ignore="UnusedResources">Stop sharing</string>
     <string name="live_location_bottom_sheet_last_updated_at">Updated %1$s ago</string>
-    <string name="live_location_not_enough_permission_dialog_title">You don’t have permission to share locations</string>
-    <string name="live_location_not_enough_permission_dialog_description">You need to have the right permissions in order to share locations in this room.</string>
+    <string name="live_location_not_enough_permission_dialog_title">You don’t have permission to share live location</string>
+    <string name="live_location_not_enough_permission_dialog_description">You need to have the right permissions in order to share live location in this room.</string>
 
     <string name="message_bubbles">Show Message bubbles</string>