Merge branch 'notification-permission-api-check-droid-386'

1 files changed, 2 insertions, 9 deletions

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 e0ee6cdd21..c5d7c84a19 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
@@ -1,6 +1,5 @@
 package net.mullvad.mullvadvpn.ui
 
-import android.Manifest
 import android.app.Activity
 import android.content.Intent
 import android.net.VpnService
@@ -13,7 +12,7 @@ import androidx.core.view.WindowCompat
 import net.mullvad.mullvadvpn.compose.screen.MullvadApp
 import net.mullvad.mullvadvpn.di.paymentModule
 import net.mullvad.mullvadvpn.di.uiModule
-import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.isNotificationPermissionGranted
+import net.mullvad.mullvadvpn.lib.common.util.SdkUtils.requestNotificationPermissionIfMissing
 import net.mullvad.mullvadvpn.lib.endpoint.getApiEndpointConfigurationExtras
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.repository.AccountRepository
@@ -61,7 +60,7 @@ class MainActivity : ComponentActivity() {
     }
 
     fun initializeStateHandlerAndServiceConnection() {
-        checkForNotificationPermission()
+        requestNotificationPermissionIfMissing(requestNotificationPermissionLauncher)
         serviceConnectionManager.bind(
             vpnPermissionRequestHandler = ::requestVpnPermission,
             apiEndpointConfiguration = intent?.getApiEndpointConfigurationExtras()
@@ -101,10 +100,4 @@ class MainActivity : ComponentActivity() {
 
         startActivityForResult(intent, 0)
     }
-
-    private fun checkForNotificationPermission() {
-        if (isNotificationPermissionGranted().not()) {
-            requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
-        }
-    }
 }