Merge pull request #272 from apivideo/refactor/android_use_activity_c…

…ompat refactor(java): for android examples, use ActivityCompat
apivideo · Sep 26, 2023 · eb98523 · eb98523
2 parents 3c977a9 + 0ed96c6
commit eb98523
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 36 deletions.
diff --git a/...es/service/src/main/java/video/api/uploader/service/example/ReadStorePermissionManager.kt b/...es/service/src/main/java/video/api/uploader/service/example/ReadStorePermissionManager.kt
@@ -4,6 +4,8 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 
 class ReadStorePermissionManager(
     private val activity: ComponentActivity,
@@ -18,20 +20,16 @@ class ReadStorePermissionManager(
     }
 
     private val hasPermission: Boolean
-        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
-        } else {
-            true
-        }
+        get() = ContextCompat.checkSelfPermission(
+            activity,
+            requiredPermission
+        ) == PackageManager.PERMISSION_GRANTED
 
     fun requestPermission() {
         if (hasPermission) {
             onGranted()
         } else {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                throw IllegalStateException("Permission should be granted")
-            }
-            if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(activity, requiredPermission)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
                 }

diff --git a/...s/workmanager/src/main/java/video/api/uploader/work/example/ReadStorePermissionManager.kt b/...s/workmanager/src/main/java/video/api/uploader/work/example/ReadStorePermissionManager.kt
@@ -4,6 +4,8 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 
 class ReadStorePermissionManager(
     private val activity: ComponentActivity,
@@ -18,20 +20,16 @@ class ReadStorePermissionManager(
     }
 
     private val hasPermission: Boolean
-        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
-        } else {
-            true
-        }
+        get() = ContextCompat.checkSelfPermission(
+            activity,
+            requiredPermission
+        ) == PackageManager.PERMISSION_GRANTED
 
     fun requestPermission() {
         if (hasPermission) {
             onGranted()
         } else {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                throw IllegalStateException("Permission should be granted")
-            }
-            if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(activity, requiredPermission)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
                 }

diff --git a/...ples/service/src/main/java/video/api/client/service/example/ReadStorePermissionManager.kt b/...ples/service/src/main/java/video/api/client/service/example/ReadStorePermissionManager.kt
@@ -4,6 +4,8 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 
 class ReadStorePermissionManager(
     private val activity: ComponentActivity,
@@ -18,20 +20,16 @@ class ReadStorePermissionManager(
     }
 
     private val hasPermission: Boolean
-        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
-        } else {
-            true
-        }
+        get() = ContextCompat.checkSelfPermission(
+            activity,
+            requiredPermission
+        ) == PackageManager.PERMISSION_GRANTED
 
     fun requestPermission() {
         if (hasPermission) {
             onGranted()
         } else {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                throw IllegalStateException("Permission should be granted")
-            }
-            if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(activity, requiredPermission)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
                 }

diff --git a/...les/workmanager/src/main/java/video/api/client/work/example/ReadStorePermissionManager.kt b/...les/workmanager/src/main/java/video/api/client/work/example/ReadStorePermissionManager.kt
@@ -4,6 +4,8 @@ import android.content.pm.PackageManager
 import android.os.Build
 import androidx.activity.ComponentActivity
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 
 class ReadStorePermissionManager(
     private val activity: ComponentActivity,
@@ -18,20 +20,16 @@ class ReadStorePermissionManager(
     }
 
     private val hasPermission: Boolean
-        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
-        } else {
-            true
-        }
+        get() = ContextCompat.checkSelfPermission(
+            activity,
+            requiredPermission
+        ) == PackageManager.PERMISSION_GRANTED
 
     fun requestPermission() {
         if (hasPermission) {
             onGranted()
         } else {
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
-                throw IllegalStateException("Permission should be granted")
-            }
-            if (activity.shouldShowRequestPermissionRationale(requiredPermission)) {
+            if (ActivityCompat.shouldShowRequestPermissionRationale(activity, requiredPermission)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
                 }