feat(java): add support from Android 21 (instead of 24)

apivideo · Sep 26, 2023 · 119f853 · 119f853
1 parent b4a37f9
commit 119f853
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 14 deletions.
diff --git a/config/android-uploader.yaml b/config/android-uploader.yaml
@@ -1,4 +1,6 @@
 changelog:
+  - 1.3.2 (2023-09-26):
+    - Extend Android minSdkVersion to 21
   - 1.3.1 (2023-08-22):
     - Fix cancellation of upload workers for the WorkManager API
   - 1.3.0 (2023-08-21):

diff --git a/config/android.yaml b/config/android.yaml
@@ -1,4 +1,6 @@
 changelog:
+  - 1.5.2 (2023-09-26):
+    - Extend Android minSdkVersion to 21
   - 1.5.1 (2023-08-22):
     - Fix cancellation of upload workers for the WorkManager API
   - 1.5.0 (2023-08-21):

diff --git a/templates/java/android/notifications/NotificationExtensions.mustache b/templates/java/android/notifications/NotificationExtensions.mustache
@@ -4,12 +4,13 @@ import android.content.Context
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.app.NotificationCompat
+import androidx.core.content.ContextCompat
 
 fun NotificationCompat.Builder.setStyle(
     context: Context,
     @DrawableRes notificationIconResourceId: Int,
     @ColorRes notificationColorResourceId: Int
 ): NotificationCompat.Builder = apply {
     setSmallIcon(notificationIconResourceId)
-    color = context.getColor(notificationColorResourceId)
+    color = ContextCompat.getColor(context, notificationColorResourceId)
 }
diff --git a/templates/java/libraries/okhttp-gson/build.gradle.mustache b/templates/java/libraries/okhttp-gson/build.gradle.mustache
@@ -40,7 +40,7 @@ if(hasProperty('target') && target == 'android') {
         compileSdkVersion 33
         buildToolsVersion '30.0.3'
         defaultConfig {
-            minSdkVersion 24
+            minSdkVersion 21
             targetSdkVersion 33
             multiDexEnabled true
 

diff --git a/templates/java/statics/android-uploader/examples/service/build.gradle b/templates/java/statics/android-uploader/examples/service/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "video.api.uploader.service.example"
-        minSdk 24
+        minSdk 21
         targetSdk 33
         versionCode 1
         versionName "1.0"

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
@@ -16,13 +16,21 @@ class ReadStorePermissionManager(
     } else {
         android.Manifest.permission.READ_EXTERNAL_STORAGE
     }
+
     private val hasPermission: Boolean
-        get() = activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        } else {
+            true
+        }
 
     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)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
@@ -41,4 +49,4 @@ class ReadStorePermissionManager(
                 onDenied()
             }
         }
-}
+}
diff --git a/templates/java/statics/android-uploader/examples/workmanager/build.gradle b/templates/java/statics/android-uploader/examples/workmanager/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "video.api.uploader.work.example"
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

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
@@ -16,13 +16,21 @@ class ReadStorePermissionManager(
     } else {
         android.Manifest.permission.READ_EXTERNAL_STORAGE
     }
+
     private val hasPermission: Boolean
-        get() = activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        } else {
+            true
+        }
 
     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)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
@@ -41,4 +49,4 @@ class ReadStorePermissionManager(
                 onDenied()
             }
         }
-}
+}
diff --git a/templates/java/statics/android/examples/service/build.gradle b/templates/java/statics/android/examples/service/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "video.api.client.service.example"
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

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
@@ -16,13 +16,21 @@ class ReadStorePermissionManager(
     } else {
         android.Manifest.permission.READ_EXTERNAL_STORAGE
     }
+
     private val hasPermission: Boolean
-        get() = activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        } else {
+            true
+        }
 
     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)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
@@ -41,4 +49,4 @@ class ReadStorePermissionManager(
                 onDenied()
             }
         }
-}
+}
diff --git a/templates/java/statics/android/examples/workmanager/build.gradle b/templates/java/statics/android/examples/workmanager/build.gradle
@@ -8,7 +8,7 @@ android {
 
     defaultConfig {
         applicationId "video.api.client.work.example"
-        minSdkVersion 24
+        minSdkVersion 21
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"

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
@@ -16,13 +16,21 @@ class ReadStorePermissionManager(
     } else {
         android.Manifest.permission.READ_EXTERNAL_STORAGE
     }
+
     private val hasPermission: Boolean
-        get() = activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        get() = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            activity.checkSelfPermission(requiredPermission) == PackageManager.PERMISSION_GRANTED
+        } else {
+            true
+        }
 
     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)) {
                 onShowPermissionRationale(requiredPermission) {
                     requestPermission.launch(requiredPermission)
@@ -41,4 +49,4 @@ class ReadStorePermissionManager(
                 onDenied()
             }
         }
-}
+}