diff options
| author | Albin <albin@mullvad.net> | 2022-08-31 14:42:29 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2022-08-31 14:42:29 +0200 |
| commit | af06f424d3dbd843f4201af4e652b8322ce9e9e9 (patch) | |
| tree | 4db036bfcfee770496e934a4c0a982208fe439f5 | |
| parent | b05f9c588f5c88e98a9d36af84765bbd1254be43 (diff) | |
| parent | 8690eb44035462934d5045bf7d5324efffb5eda2 (diff) | |
| download | mullvadvpn-af06f424d3dbd843f4201af4e652b8322ce9e9e9.tar.xz mullvadvpn-af06f424d3dbd843f4201af4e652b8322ce9e9e9.zip | |
Merge branch 'fix-android-unsafe-cast'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c704c1f89..ad361332b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,6 +64,9 @@ Line wrap the file at 100 chars. Th - Only use the most recent list of apps to split when resuming from hibernation/sleep if applying it was successful. +#### Android +- Fix crash sometimes occurring during account creation. + ## [2022.4] - 2022-08-19 ### Added diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt index 6a58739aec..a402d985f9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/AccountRepository.kt @@ -32,7 +32,7 @@ class AccountRepository( state.container.accountDataSource.accountCreationResult } .onEach { - _cachedCreatedAccount.value = (it as AccountCreationResult.Success).accountToken + _cachedCreatedAccount.value = (it as? AccountCreationResult.Success)?.accountToken } .shareIn( CoroutineScope(dispatcher), |