Merge pull request #47 from NordicPlayground/use-context-ble-permissions

Use local context provided by the composable when requesting permission

Author: sylwester-zielinski

permission/src/main/java/no/nordicsemi/android/common/permission/bluetooth/BluetoothStateManager.kt

@@ -83,8 +83,8 @@ class BluetoothStateManager @Inject constructor(
         dataProvider.bluetoothPermissionRequested = true
     }
 
-    fun isBluetoothScanPermissionDeniedForever(): Boolean {
-        return utils.isBluetoothScanPermissionDeniedForever()
+    fun isBluetoothScanPermissionDeniedForever(context: Context): Boolean {
+        return utils.isBluetoothScanPermissionDeniedForever(context)
     }
 
     private fun getBluetoothPermissionState() = when {

permission/src/main/java/no/nordicsemi/android/common/permission/location/LocationStateManager.kt

@@ -44,7 +44,8 @@ import no.nordicsemi.android.common.permission.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
-private const val REFRESH_PERMISSIONS = "no.nordicsemi.android.common.permission.REFRESH_LOCATION_PERMISSIONS"
+private const val REFRESH_PERMISSIONS =
+    "no.nordicsemi.android.common.permission.REFRESH_LOCATION_PERMISSIONS"
 
 @Singleton
 internal class LocationStateManager @Inject constructor(
@@ -80,17 +81,19 @@ internal class LocationStateManager @Inject constructor(
         dataProvider.locationPermissionRequested = true
     }
 
-    fun isLocationPermissionDeniedForever(): Boolean {
-        return utils.isLocationPermissionDeniedForever()
+    fun isLocationPermissionDeniedForever(context: Context): Boolean {
+        return utils.isLocationPermissionDeniedForever(context)
     }
 
     private fun getLocationState(): FeatureState {
         val lm = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
         return when {
             !utils.isLocationPermissionGranted ->
                 NotAvailable(FeatureNotAvailableReason.PERMISSION_REQUIRED)
+
             dataProvider.isLocationPermissionRequired && !LocationManagerCompat.isLocationEnabled(lm) ->
                 NotAvailable(FeatureNotAvailableReason.DISABLED)
+
             else -> Available
         }
     }

permission/src/main/java/no/nordicsemi/android/common/permission/util/PermissionUtils.kt

@@ -98,15 +98,15 @@ internal class PermissionUtils(
         dataProvider.locationPermissionRequested = true
     }
 
-    fun isBluetoothScanPermissionDeniedForever(): Boolean {
+    fun isBluetoothScanPermissionDeniedForever(context: Context): Boolean {
         return dataProvider.isSOrAbove &&
                 !isBluetoothScanPermissionGranted && // Bluetooth Scan permission must be denied
                 dataProvider.bluetoothPermissionRequested && // Permission must have been requested before
                 !context.findActivity()
                     .shouldShowRequestPermissionRationale(Manifest.permission.BLUETOOTH_SCAN)
     }
 
-    fun isLocationPermissionDeniedForever(): Boolean {
+    fun isLocationPermissionDeniedForever(context: Context): Boolean {
         return dataProvider.isMarshmallowOrAbove &&
                 !isLocationPermissionGranted // Location permission must be denied
                 && dataProvider.locationPermissionRequested // Permission must have been requested before

permission/src/main/java/no/nordicsemi/android/common/permission/view/BluetoothPermissionRequiredView.kt

@@ -32,7 +32,6 @@
 package no.nordicsemi.android.common.permission.view
 
 import android.Manifest
-import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -68,8 +67,8 @@ import no.nordicsemi.android.common.theme.view.WarningView
 @Composable
 internal fun BluetoothPermissionRequiredView() {
     val viewModel = hiltViewModel<PermissionViewModel>()
-    val activity = LocalContext.current as Activity
-    var permissionDenied by remember { mutableStateOf(viewModel.isBluetoothScanPermissionDeniedForever()) }
+    val context = LocalContext.current
+    var permissionDenied by remember { mutableStateOf(viewModel.isBluetoothScanPermissionDeniedForever(context)) }
 
     WarningView(
         imageVector = Icons.Default.BluetoothDisabled,
@@ -89,7 +88,7 @@ internal fun BluetoothPermissionRequiredView() {
             ActivityResultContracts.RequestMultiplePermissions()
         ) {
             viewModel.markBluetoothPermissionRequested()
-            permissionDenied = viewModel.isBluetoothScanPermissionDeniedForever()
+            permissionDenied = viewModel.isBluetoothScanPermissionDeniedForever(context)
             viewModel.refreshBluetoothPermission()
         }
 
@@ -98,7 +97,7 @@ internal fun BluetoothPermissionRequiredView() {
                 Text(text = stringResource(id = R.string.action_grant_permission))
             }
         } else {
-            Button(onClick = { openPermissionSettings(activity) }) {
+            Button(onClick = { openPermissionSettings(context) }) {
                 Text(text = stringResource(id = R.string.action_settings))
             }
         }

permission/src/main/java/no/nordicsemi/android/common/permission/view/LocationPermissionRequiredView.kt

@@ -66,13 +66,13 @@ import no.nordicsemi.android.common.theme.view.WarningView
 internal fun LocationPermissionRequiredView() {
     val viewModel = hiltViewModel<PermissionViewModel>()
     val context = LocalContext.current
-    var permissionDenied by remember { mutableStateOf(viewModel.isLocationPermissionDeniedForever()) }
+    var permissionDenied by remember { mutableStateOf(viewModel.isLocationPermissionDeniedForever(context)) }
 
     val launcher = rememberLauncherForActivityResult(
         ActivityResultContracts.RequestMultiplePermissions()
     ) {
         viewModel.markLocationPermissionRequested()
-        permissionDenied = viewModel.isLocationPermissionDeniedForever()
+        permissionDenied = viewModel.isLocationPermissionDeniedForever(context)
         viewModel.refreshLocationPermission()
     }
 

permission/src/main/java/no/nordicsemi/android/common/permission/viewmodel/PermissionViewModel.kt

@@ -31,6 +31,7 @@
 
 package no.nordicsemi.android.common.permission.viewmodel
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -77,11 +78,11 @@ internal class PermissionViewModel @Inject internal constructor(
         bluetoothManager.markBluetoothPermissionRequested()
     }
 
-    fun isBluetoothScanPermissionDeniedForever(): Boolean {
-        return bluetoothManager.isBluetoothScanPermissionDeniedForever()
+    fun isBluetoothScanPermissionDeniedForever(context: Context): Boolean {
+        return bluetoothManager.isBluetoothScanPermissionDeniedForever(context)
     }
 
-    fun isLocationPermissionDeniedForever(): Boolean {
-        return locationManager.isLocationPermissionDeniedForever()
+    fun isLocationPermissionDeniedForever(context: Context): Boolean {
+        return locationManager.isLocationPermissionDeniedForever(context)
     }
 }