From 8b0b74b4af43927c3f6710ee0adfe57b69e1f5e8 Mon Sep 17 00:00:00 2001
From: Jenna Antilla <46546946+jennantilla@users.noreply.github.com>
Date: Wed, 27 Dec 2023 09:56:32 -0800
Subject: [PATCH] Update LocationManager

- Change log to warn vs. error
- Access and save to constant PREFS_OS_LOCATION_SHARED
---
 .../com/onesignal/location/internal/LocationManager.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt b/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt
index 96d8c0c545..903183d369 100644
--- a/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt
+++ b/OneSignalSDK/onesignal/location/src/main/java/com/onesignal/location/internal/LocationManager.kt
@@ -5,6 +5,8 @@ import com.onesignal.common.AndroidUtils
 import com.onesignal.common.threading.suspendifyOnThread
 import com.onesignal.core.internal.application.IApplicationService
 import com.onesignal.core.internal.preferences.IPreferencesService
+import com.onesignal.core.internal.preferences.PreferenceOneSignalKeys
+import com.onesignal.core.internal.preferences.PreferenceStores
 import com.onesignal.core.internal.startup.IStartableService
 import com.onesignal.debug.LogLevel
 import com.onesignal.debug.internal.logging.Logging
@@ -25,12 +27,12 @@ internal class LocationManager(
     private val _locationPermissionController: LocationPermissionController,
     private val _prefs: IPreferencesService,
 ) : ILocationManager, IStartableService, ILocationPermissionChangedHandler {
-    private var _isShared: Boolean = _prefs.getBool("OneSignal", "PREFS_OS_LOCATION_SHARED", false)!!
+    private var _isShared: Boolean = _prefs.getBool(PreferenceStores.ONESIGNAL, PreferenceOneSignalKeys.PREFS_OS_LOCATION_SHARED, false)!!
     override var isShared
         get() = _isShared
         set(value) {
             Logging.debug("LocationManager.setIsShared(value: $value)")
-            _prefs.saveBool("OneSignal", "PREFS_OS_LOCATION_SHARED", value)
+            _prefs.saveBool(PreferenceStores.ONESIGNAL, PreferenceOneSignalKeys.PREFS_OS_LOCATION_SHARED, value)
             _isShared = value
 
             onLocationPermissionChanged(value)
@@ -76,7 +78,7 @@ internal class LocationManager(
         var result = false
         withContext(Dispatchers.Main) {
             if (!isShared) {
-                Logging.error("Location permissions must be granted by setting isShared to true")
+                Logging.warn("Requesting location permission, but location sharing must also be enabled by setting isShared to true")
             }
 
             val hasFinePermissionGranted =