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/lib/model/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/lib/model/src')
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/PrepareError.kt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/PrepareError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/PrepareError.kt index 2fea9a9211..f26a480417 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/PrepareError.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/PrepareError.kt @@ -8,9 +8,10 @@ sealed interface PrepareError : PrepareResult { // Legacy VPN profile is active as Always-on data object OtherLegacyAlwaysOnVpn : PrepareError - // Another VPN app is active as Always-on + // Another VPN app is active as Always-on (Only works up to Android 11 or debug builds) data class OtherAlwaysOnApp(val appName: String) : PrepareError + // VPN profile can be created or Always-on VPN is active but not detected data class NotPrepared(val prepareIntent: Intent) : PrepareError } |