diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-25 20:21:33 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-26 12:37:25 +0000 |
| commit | 92a710d7de2e6edb591478f2b18deec8825a1f09 (patch) | |
| tree | c5fe63c49c0947b376b463cf541e4b753bded60e /android/src/main | |
| parent | 6a35e78bb82652dc6dea486d49886ea51aeed600 (diff) | |
| download | mullvadvpn-92a710d7de2e6edb591478f2b18deec8825a1f09.tar.xz mullvadvpn-92a710d7de2e6edb591478f2b18deec8825a1f09.zip | |
Handle a `null` WWW auth token
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt index 1b122564bc..e28b63d40c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt @@ -55,7 +55,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) { } fun getWwwAuthToken(): String { - return getWwwAuthToken(daemonInterfaceAddress) + return getWwwAuthToken(daemonInterfaceAddress) ?: "" } fun getCurrentLocation(): GeoIpLocation? { @@ -142,7 +142,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) { accountToken: String ): GetAccountDataResult private external fun getAccountHistory(daemonInterfaceAddress: Long): ArrayList<String>? - private external fun getWwwAuthToken(daemonInterfaceAddress: Long): String + private external fun getWwwAuthToken(daemonInterfaceAddress: Long): String? private external fun getCurrentLocation(daemonInterfaceAddress: Long): GeoIpLocation? private external fun getCurrentVersion(daemonInterfaceAddress: Long): String private external fun getRelayLocations(daemonInterfaceAddress: Long): RelayList? |