Merge pull request #62 from icerockdev/develop

Release 0.13.0
icerockdev · Oct 28, 2022 · 89c5350 · 89c5350
2 parents 2e09c9e + 9992b03
commit 89c5350
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -38,8 +38,8 @@ allprojects {
 project **build.gradle**
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:permissions:0.12.0")
-    commonTestImplementation("dev.icerock.moko:permissions-test:0.12.0")
+    commonMainApi("dev.icerock.moko:permissions:0.13.0")
+    commonTestImplementation("dev.icerock.moko:permissions-test:0.13.0")
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -9,8 +9,8 @@ kotlin.mpp.enableCompatibilityMetadataVariant=true
 
 android.useAndroidX=true
 
-moko.android.targetSdk=31
-moko.android.compileSdk=31
+moko.android.targetSdk=33
+moko.android.compileSdk=33
 moko.android.minSdk=16
 
 moko.publish.name=MOKO permissions

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ androidLifecycleVersion = "2.1.0"
 androidCoreTestingVersion = "2.1.0"
 coroutinesVersion = "1.6.0-native-mt"
 mokoMvvmVersion = "0.12.0"
-mokoPermissionsVersion = "0.12.0"
+mokoPermissionsVersion = "0.13.0"
 
 [libraries]
 appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" }

diff --git a/permissions/src/androidMain/kotlin/dev/icerock/moko/permissions/PermissionsControllerImpl.kt b/permissions/src/androidMain/kotlin/dev/icerock/moko/permissions/PermissionsControllerImpl.kt
@@ -58,7 +58,9 @@ class PermissionsControllerImpl(
     }
 
     override fun isPermissionGranted(permission: Permission): Boolean {
-        if (permission == Permission.REMOTE_NOTIFICATION && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        if (permission == Permission.REMOTE_NOTIFICATION &&
+            Build.VERSION.SDK_INT in VERSIONS_WITHOUT_NOTIFICATION_PERMISSION
+        ) {
             return NotificationManagerCompat.from(applicationContext).areNotificationsEnabled()
         }
         return permission.toPlatformPermission().all {
@@ -69,7 +71,9 @@ class PermissionsControllerImpl(
 
     @Suppress("ReturnCount")
     override suspend fun getPermissionState(permission: Permission): PermissionState {
-        if (permission == Permission.REMOTE_NOTIFICATION && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+        if (permission == Permission.REMOTE_NOTIFICATION &&
+            Build.VERSION.SDK_INT in VERSIONS_WITHOUT_NOTIFICATION_PERMISSION
+        ) {
             val isNotificationsEnabled = NotificationManagerCompat.from(applicationContext)
                 .areNotificationsEnabled()
             return if (isNotificationsEnabled) {
@@ -133,7 +137,14 @@ class PermissionsControllerImpl(
             Permission.WRITE_STORAGE -> listOf(Manifest.permission.WRITE_EXTERNAL_STORAGE)
             Permission.LOCATION -> listOf(Manifest.permission.ACCESS_FINE_LOCATION)
             Permission.COARSE_LOCATION -> listOf(Manifest.permission.ACCESS_COARSE_LOCATION)
-            Permission.REMOTE_NOTIFICATION -> emptyList()
+            Permission.REMOTE_NOTIFICATION -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                    listOf(Manifest.permission.POST_NOTIFICATIONS)
+                } else {
+                    emptyList()
+                }
+            }
+
             Permission.RECORD_AUDIO -> listOf(Manifest.permission.RECORD_AUDIO)
             Permission.BLUETOOTH_LE -> allBluetoothPermissions()
             Permission.BLUETOOTH_SCAN -> bluetoothScanCompat()
@@ -180,4 +191,9 @@ class PermissionsControllerImpl(
         } else {
             listOf(Manifest.permission.BLUETOOTH)
         }
+
+    private companion object {
+        val VERSIONS_WITHOUT_NOTIFICATION_PERMISSION =
+            Build.VERSION_CODES.KITKAT until Build.VERSION_CODES.TIRAMISU
+    }
 }
diff --git a/sample/android-app/src/main/AndroidManifest.xml b/sample/android-app/src/main/AndroidManifest.xml
@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:label="moko-permissions test app"