From d36ce0668762f2bf7fc02e556c3de2b94ca6e79f Mon Sep 17 00:00:00 2001
From: saber safavi <saber.safavi@codic.se>
Date: Mon, 2 Oct 2023 17:53:13 +0200
Subject: [PATCH] Fix InlinedApi lint issue

---
 android/app/lint-baseline.xml                         | 11 -----------
 .../kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt  |  7 +++++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/android/app/lint-baseline.xml b/android/app/lint-baseline.xml
index 8d45af32728b..6253a5a3362b 100644
--- 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
index 3d30d2884576..9d5340b5b62e 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.net.VpnService
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.WindowManager
@@ -351,8 +352,10 @@ open class MainActivity : FragmentActivity() {
     }
 
     private fun checkForNotificationPermission() {
-        if (isNotificationPermissionGranted().not()) {
-            requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+        if (!isNotificationPermissionGranted().not()) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
+            }
         }
     }