android: more user-friendly way of granting permissions in call (#3945)

* android: more user-friendly way of granting permissions in call * changes * ask permissions without click at first * changes in logic and UI * enhancements * show alert only when non in PiP * change --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
simplex-chat · Mar 29, 2024 · 3d20465 · 3d20465
1 parent b64ae90
commit 3d20465
Show file tree

Hide file tree

Showing 7 changed files with 244 additions and 62 deletions.
diff --git a/apps/multiplatform/android/build.gradle.kts b/apps/multiplatform/android/build.gradle.kts
@@ -143,6 +143,9 @@ dependencies {
 
     implementation("com.jakewharton:process-phoenix:2.2.0")
 
+    //Camera Permission
+    implementation("com.google.accompanist:accompanist-permissions:0.23.0")
+
     //implementation("androidx.compose.material:material-icons-extended:$compose_version")
     //implementation("androidx.compose.ui:ui-util:$compose_version")
 

diff --git a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallActivity.kt
@@ -1,7 +1,9 @@
 package chat.simplex.app.views.call
 
+import android.Manifest
 import android.app.*
 import android.content.*
+import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Rect
 import android.os.*
@@ -28,6 +30,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.Lifecycle
 import chat.simplex.app.*
 import chat.simplex.app.R
@@ -36,10 +39,12 @@ import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.AcceptCallAction
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
+import chat.simplex.common.platform.chatModel
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
@@ -109,9 +114,20 @@ class CallActivity: ComponentActivity(), ServiceConnection {
     m.callCommand.add(WCallCommand.Layout(layoutType))
   }
 
+  private fun hasGrantedPermissions(): Boolean {
+    val grantedAudio = ContextCompat.checkSelfPermission(this, android.Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
+    val grantedCamera = !callSupportsVideo() || ContextCompat.checkSelfPermission(this, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED
+    return grantedAudio && grantedCamera
+  }
+
   override fun onBackPressed() {
     if (isOnLockScreenNow()) {
       super.onBackPressed()
+    } else if (!hasGrantedPermissions() && !callSupportsVideo()) {
+      val call = m.activeCall.value
+      if (call != null) {
+        withBGApi { chatModel.callManager.endCall(call) }
+      }
     } else {
       m.activeCallViewIsCollapsed.value = true
     }
@@ -223,8 +239,21 @@ fun CallActivityView() {
     }
     Box(Modifier.background(Color.Black)) {
       if (call != null) {
+        val permissionsState = rememberMultiplePermissionsState(
+          permissions = if (callSupportsVideo()) {
+            listOf(Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO)
+          } else {
+            listOf(Manifest.permission.RECORD_AUDIO)
+          }
+        )
+        if (permissionsState.allPermissionsGranted) {
+          ActiveCallView()
+        } else {
+          CallPermissionsView(remember { m.activeCallViewIsCollapsed }.value, callSupportsVideo()) {
+            withBGApi { chatModel.callManager.endCall(call) }
+          }
+        }
         val view = LocalView.current
-        ActiveCallView()
         if (callSupportsVideo()) {
           val scope = rememberCoroutineScope()
           LaunchedEffect(Unit) {
@@ -252,6 +281,9 @@ fun CallActivityView() {
         }
       }
     }
+    if (!m.activeCallViewIsCollapsed.value) {
+      AlertManager.shared.showInView()
+    }
   }
   LaunchedEffect(call == null) {
     if (call != null) {

diff --git a/apps/multiplatform/common/build.gradle.kts b/apps/multiplatform/common/build.gradle.kts
@@ -90,6 +90,9 @@ kotlin {
         implementation("androidx.camera:camera-camera2:${cameraXVersion}")
         implementation("androidx.camera:camera-lifecycle:${cameraXVersion}")
         implementation("androidx.camera:camera-view:${cameraXVersion}")
+
+        // Calls lifecycle listener
+        implementation("androidx.lifecycle:lifecycle-process:2.4.1")
       }
     }
     val desktopMain by getting {

diff --git a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Permissions.kt b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/helpers/Permissions.kt
@@ -0,0 +1,30 @@
+package chat.simplex.common.helpers
+
+import android.content.*
+import android.net.Uri
+import android.provider.Settings
+import chat.simplex.common.platform.*
+import chat.simplex.common.views.helpers.AlertManager
+import chat.simplex.common.views.helpers.generalGetString
+import chat.simplex.res.MR
+
+fun Context.openAppSettingsInSystem() {
+  Intent().apply {
+    action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+    data = Uri.parse("package:${androidAppContext.packageName}")
+    try {
+      startActivity(this)
+    } catch (e: ActivityNotFoundException) {
+      Log.e(TAG, e.stackTraceToString())
+    }
+  }
+}
+
+fun Context.showAllowPermissionInSettingsAlert(action: () -> Unit = ::openAppSettingsInSystem) {
+  AlertManager.shared.showAlertMsg(
+    title =  generalGetString(MR.strings.permissions_grant_in_settings),
+    text = generalGetString(MR.strings.permissions_find_in_settings_and_grant),
+    confirmText = generalGetString(MR.strings.permissions_open_settings),
+    onConfirm = action,
+  )
+}