diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-03-07 09:06:58 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-03-07 09:06:58 +0100 |
| commit | 5e8dfc2adf9bdd3b2b886c7c927fcca2012559db (patch) | |
| tree | 6512f9cfef35eecde7500a3e0702af46af7f9e1a /android/app/src | |
| parent | 32fd95f7a81a3ab923838a29489af8336f3b6bf0 (diff) | |
| parent | 8354eb4bdcd51b6bee7fe9704e7483e9dc9c2c5f (diff) | |
| download | mullvadvpn-5e8dfc2adf9bdd3b2b886c7c927fcca2012559db.tar.xz mullvadvpn-5e8dfc2adf9bdd3b2b886c7c927fcca2012559db.zip | |
Merge branch 'improve-error-text-for-android-12-and-above-when-we-are-droid-1857'
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt index d505c44179..cd3e94bc65 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt @@ -160,6 +160,8 @@ class ConnectViewModel( if (hasVpnPermission) { connectionProxy.connect() } else { + // Either the user denied the permission or another always-on-vpn is active (if + // Android 11+ and run from Android Studio) _uiSideEffect.send(UiSideEffect.ConnectError.PermissionDenied) } } |