Merge pull request #52 from SergKhram/feature/permission-requester-fo…

…r-newer-api Issue 43 Permission requester for Android API > 28 (10 && 11 android os)
allure-framework · Mar 23, 2021 · e5e66a6 · e5e66a6
2 parents ccbc556 + 6b41723
commit e5e66a6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/allure-kotlin-android/src/main/kotlin/io/qameta/allure/android/internal/TestUtils.kt b/allure-kotlin-android/src/main/kotlin/io/qameta/allure/android/internal/TestUtils.kt
@@ -20,12 +20,25 @@ internal fun isDeviceTest(): Boolean =
     System.getProperty("java.runtime.name")?.toLowerCase()?.contains("android") ?: false
 
 internal fun requestExternalStoragePermissions() {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M || Build.VERSION.SDK_INT > Build.VERSION_CODES.P ) return
-
-    with(PermissionRequester()) {
-        addPermissions("android.permission.WRITE_EXTERNAL_STORAGE")
-        addPermissions("android.permission.READ_EXTERNAL_STORAGE")
-        requestPermissions()
+    when {
+        Build.VERSION.SDK_INT > Build.VERSION_CODES.M && Build.VERSION.SDK_INT <= Build.VERSION_CODES.P -> {
+            with(PermissionRequester()) {
+                addPermissions("android.permission.WRITE_EXTERNAL_STORAGE")
+                addPermissions("android.permission.READ_EXTERNAL_STORAGE")
+                requestPermissions()
+            }
+        }
+        Build.VERSION.SDK_INT == Build.VERSION_CODES.Q -> {
+            uiDevice?.let {
+                it.executeShellCommand("appops set --uid ${it.currentPackageName} LEGACY_STORAGE allow")
+            }
+        }
+        Build.VERSION.SDK_INT == Build.VERSION_CODES.R -> {
+            uiDevice?.let {
+                it.executeShellCommand("appops set --uid ${it.currentPackageName} MANAGE_EXTERNAL_STORAGE allow")
+            }
+        }
+        else -> return
     }
 }
 

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -15,8 +15,8 @@ object Versions {
     object Android {
         const val gradlePlugin = "4.0.1"
 
-        const val compileSdk = 28
-        const val targetSdk = 28
+        const val compileSdk = 30
+        const val targetSdk = 30
         const val minSdk = 18
 
         const val androidXappcompat = "1.2.0"