Fix background location false warning

Semper-Viventem · Jan 25, 2025 · 36b4b7e · 36b4b7e
1 parent d2e25ee
commit 36b4b7e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -26,8 +26,8 @@ android {
         minSdk = 29
         targetSdk = 35
 
-        versionCode = 1708536363
-        versionName = "0.27.1-beta"
+        versionCode = 1708536364
+        versionName = "0.27.2-beta"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/src/main/java/f/cking/software/data/helpers/PermissionHelper.kt b/app/src/main/java/f/cking/software/data/helpers/PermissionHelper.kt
@@ -23,7 +23,7 @@ class PermissionHelper(
 
     private var pending: (() -> Unit)? = null
     private var permissionRequestTime: Long? = null
-    private val backgroundPermissionState = MutableStateFlow(checkBackgroundLocationPermition())
+    private val backgroundPermissionState = MutableStateFlow(backgroundLocationAllowed())
 
     fun checkBlePermissions(
         onRequestPermissions: (permissions: Array<String>, permissionRequestCode: Int, pendingFun: () -> Unit) -> Unit = ::requestPermissions,
@@ -90,15 +90,15 @@ class PermissionHelper(
         return backgroundPermissionState
     }
 
-    fun checkBackgroundLocationPermition(): Boolean {
+    fun backgroundLocationAllowed(): Boolean {
         return checkPermission(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
     }
 
     private fun fetchBackgroundLocationPermission() {
-        backgroundPermissionState.value = checkBackgroundLocationPermition()
+        backgroundPermissionState.value = backgroundLocationAllowed()
     }
 
-    fun checkLocationPermission(): Boolean {
+    fun locationAllowed(): Boolean {
         return checkPermission(Manifest.permission.ACCESS_FINE_LOCATION)
     }
 

diff --git a/app/src/main/java/f/cking/software/service/BgScanService.kt b/app/src/main/java/f/cking/software/service/BgScanService.kt
@@ -170,7 +170,7 @@ class BgScanService : Service() {
         return when {
             !locationProvider.isLocationAvailable() -> handleLocationDisabled()
             !bleScannerHelper.isBluetoothEnabled() -> handleBleIsTurnedOffError()
-            permissionHelper.checkBackgroundLocationPermition() -> handleBackgroundLocationRestricted()
+            !permissionHelper.backgroundLocationAllowed() -> handleBackgroundLocationRestricted()
             else -> NotificationsHelper.ServiceNotificationContent.NoDataYet
         }
     }

diff --git a/app/src/main/java/f/cking/software/ui/selectlocation/SelectLocationScreen.kt b/app/src/main/java/f/cking/software/ui/selectlocation/SelectLocationScreen.kt
@@ -225,7 +225,7 @@ object SelectLocationScreen {
                 mapView.controller.setZoom(MapConfig.DEFAULT_MAP_ZOOM)
             } else {
                 scope.launch {
-                    if (permissionHelper.checkLocationPermission()) {
+                    if (permissionHelper.locationAllowed()) {
                         locationProvider.observeLocation()
                             .filterNotNull()
                             .take(1)

diff --git a/app/src/main/java/f/cking/software/ui/settings/SettingsViewModel.kt b/app/src/main/java/f/cking/software/ui/settings/SettingsViewModel.kt
@@ -91,7 +91,7 @@ class SettingsViewModel(
             if (locationProvider.isActive()) {
                 locationProvider.stopLocationListening()
                 locationProvider.startLocationFetching()
-            } else if (permissionHelper.checkLocationPermission()) {
+            } else if (permissionHelper.locationAllowed()) {
                 locationProvider.fetchOnce()
             }
         }