Fix InlinedApi lint issue

mullvad · Oct 9, 2023 · 90333f4 · 90333f4
1 parent c1f9e78
commit 90333f4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml
@@ -100,17 +100,6 @@
             column="74"/>
     </issue>
 
-    <issue
-        id="InlinedApi"
-        message="Field requires API level 33 (current min is 26): `android.Manifest.permission#POST_NOTIFICATIONS`"
-        errorLine1="            requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt"
-            line="359"
-            column="58"/>
-    </issue>
-
     <issue
         id="RedundantLabel"
         message="Redundant label can be removed"

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.ui
 
-import android.Manifest
 import android.app.Activity
 import android.app.UiModeManager
 import android.content.Intent
@@ -32,6 +31,7 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.dialog.ChangelogDialog
 import net.mullvad.mullvadvpn.di.uiModule
 import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.isNotificationPermissionGranted
+import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.requestNotificationPermission
 import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointConfiguration
 import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
@@ -351,8 +351,8 @@ open class MainActivity : FragmentActivity() {
     }
 
     private fun checkForNotificationPermission() {
-        if (isNotificationPermissionGranted().not()) {
-            requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+        if (!isNotificationPermissionGranted().not()) {
+            requestNotificationPermission { requestNotificationPermissionLauncher.launch(it) }
         }
     }
 

diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/SdkUtils.kt
@@ -24,6 +24,16 @@ object SdkUtils {
                 PackageManager.PERMISSION_GRANTED
     }
 
+    fun Context.requestNotificationPermission(requestPermission: (String) -> Unit) {
+        if (
+            (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) &&
+                checkSelfPermission(Manifest.permission.POST_NOTIFICATIONS) ==
+                    PackageManager.PERMISSION_GRANTED
+        ) {
+            requestPermission(Manifest.permission.POST_NOTIFICATIONS)
+        }
+    }
+
     fun Tile.setSubtitleIfSupported(subtitleText: CharSequence) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             this.subtitle = subtitleText