Fix InlinedApi lint issue

mullvad · Oct 18, 2023 · 0998e0a · 0998e0a
1 parent 85bb4b1
commit 0998e0a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.2)" variant="all" version="8.0.2">
-
+<issues format="6" by="lint 8.1.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.1.0)" variant="all" version="8.1.0">
 
     <issue
         id="MissingSuperCall"
@@ -9,7 +8,7 @@
         errorLine2="                 ~~~~~~~~~~~~~~~~">
         <location
             file="src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt"
-            line="139"
+            line="134"
             column="18"/>
     </issue>
 
@@ -35,17 +34,6 @@
             column="36"/>
     </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.BuildConfig
 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.getNotificationPermissionResource
 import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.isNotificationPermissionGranted
 import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointConfiguration
 import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras
@@ -354,7 +354,9 @@ open class MainActivity : FragmentActivity() {
 
     private fun checkForNotificationPermission() {
         if (isNotificationPermissionGranted().not()) {
-            requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            getNotificationPermissionResource()?.let {
+                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,12 @@ object SdkUtils {
                 PackageManager.PERMISSION_GRANTED
     }
 
+    fun getNotificationPermissionResource(): String? {
+        return if (Build.VERSION.SDK_INT > Build.VERSION_CODES.TIRAMISU) {
+            Manifest.permission.POST_NOTIFICATIONS
+        } else null
+    }
+
     fun Tile.setSubtitleIfSupported(subtitleText: CharSequence) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             this.subtitle = subtitleText