summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-20 20:49:26 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-22 20:18:36 +0000
commitfa7f499abcd9d2ee34b9b4c111ae74c7a4052697 (patch)
treea093f701e35e7923fff1300429fe258f2fde4a12 /android
parentab67bac8bced245de652dfaabfe825cc1090d564 (diff)
downloadmullvadvpn-fa7f499abcd9d2ee34b9b4c111ae74c7a4052697.tar.xz
mullvadvpn-fa7f499abcd9d2ee34b9b4c111ae74c7a4052697.zip
Refactor `requestVpnPermission` to obtain `Intent`
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt13
1 files changed, 8 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index 26131d9f39..ee1b9c2195 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -6,6 +6,7 @@ import android.content.ComponentName
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.os.IBinder
@@ -194,15 +195,17 @@ open class MainActivity : FragmentActivity() {
}
}
- @Suppress("DEPRECATION")
- fun requestVpnPermission(intent: Intent) {
- startActivityForResult(intent, 0)
- }
-
private fun handleNewServiceConnection(connection: ServiceConnection) {
serviceNotifier.notify(connection)
}
+ @Suppress("DEPRECATION")
+ private fun requestVpnPermission() {
+ val intent = VpnService.prepare(this)
+
+ startActivityForResult(intent, 0)
+ }
+
private fun tryToConnect() {
serviceConnection?.apply {
connectionProxy.connect()