diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-15 09:41:44 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-15 09:41:44 -0300 |
| commit | 1cea60f95c613e007cf734ed9be43b2a0b28fde4 (patch) | |
| tree | cc0b0130c775c5212838ada76a134d75b131ca70 | |
| parent | a708c01f13b9b45fd56a2504b4568868b0196ebb (diff) | |
| parent | b7a41929abe64c7b626796491209820121bd670b (diff) | |
| download | mullvadvpn-1cea60f95c613e007cf734ed9be43b2a0b28fde4.tar.xz mullvadvpn-1cea60f95c613e007cf734ed9be43b2a0b28fde4.zip | |
Merge branch 'fix-account-cache-actor-crashing'
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt index 74cdc3f11f..50f0f5940c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/AccountCache.kt @@ -163,12 +163,12 @@ class AccountCache(private val endpoint: ServiceEndpoint) { private fun spawnActor() = GlobalScope.actor<Command>(Dispatchers.Default, Channel.UNLIMITED) { try { - val command = channel.receive() - - when (command) { - is Command.CreateAccount -> doCreateAccount() - is Command.Login -> doLogin(command.account) - is Command.Logout -> doLogout() + for (command in channel) { + when (command) { + is Command.CreateAccount -> doCreateAccount() + is Command.Login -> doLogin(command.account) + is Command.Logout -> doLogout() + } } } catch (exception: ClosedReceiveChannelException) { // Command channel was closed, stop the actor |