smoother permissions (fixes #4873)

open-learning-exchange · Dec 13, 2024 · 9c77ec5 · 9c77ec5
1 parent 8a22788
commit 9c77ec5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt
@@ -83,11 +83,9 @@ abstract class PermissionActivity : AppCompatActivity() {
                 permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE)
             }
         }
-        if (permissions.isNotEmpty()) {
+        if (permissions.isNotEmpty() && !checkPermission(Manifest.permission.RECORD_AUDIO) &&!checkPermission(Manifest.permission.CAMERA)) {
             val permissionsArray = permissions.toTypedArray<String>()
             ActivityCompat.requestPermissions(this, permissionsArray, PERMISSION_REQUEST_CODE_FILE)
-        } else {
-            Toast.makeText(this, R.string.permissions_granted, Toast.LENGTH_SHORT).show()
         }
     }
 

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt.lite b/app/src/main/java/org/ole/planet/myplanet/base/PermissionActivity.kt.lite
@@ -83,11 +83,9 @@ abstract class PermissionActivity : AppCompatActivity() {
                 permissions.add(Manifest.permission.READ_EXTERNAL_STORAGE)
             }
         }
-        if (permissions.isNotEmpty()) {
+        if (permissions.isNotEmpty() && !checkPermission(Manifest.permission.RECORD_AUDIO) &&!checkPermission(Manifest.permission.CAMERA)) {
             val permissionsArray = permissions.toTypedArray<String>()
             ActivityCompat.requestPermissions(this, permissionsArray, PERMISSION_REQUEST_CODE_FILE)
-        } else {
-            Toast.makeText(this, R.string.permissions_granted, Toast.LENGTH_SHORT).show()
         }
     }