diff options
| author | Albin <albin@mullvad.net> | 2024-08-29 10:38:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-29 10:38:56 +0200 |
| commit | 1ee762f4a7999886455cba0270769de16457a527 (patch) | |
| tree | 683b4405b07a4cb9e85cb21bdb682451945de3a9 /android/tile/src | |
| parent | 3286d40960d59f7f99109130042d72dc87f4aad1 (diff) | |
| parent | 981e97d254e180362d9e9a6407708a333e5e4f44 (diff) | |
| download | mullvadvpn-1ee762f4a7999886455cba0270769de16457a527.tar.xz mullvadvpn-1ee762f4a7999886455cba0270769de16457a527.zip | |
Merge branch 'deterministically-use-trailing-commas-in-kotlin-code-droid-89'
Diffstat (limited to 'android/tile/src')
| -rw-r--r-- | android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt b/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt index aef6f3505e..8e1d9e10ed 100644 --- a/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt +++ b/android/tile/src/main/kotlin/net/mullvad/mullvadvpn/tile/MullvadTileService.kt @@ -51,7 +51,7 @@ class MullvadTileService : TileService() { // Workaround for the reported bug: https://issuetracker.google.com/issues/236862865 suspend fun isUnlockStatusPropagatedWithinTimeout( unlockTimeoutMillis: Long, - unlockCheckDelayMillis: Long + unlockCheckDelayMillis: Long, ): Boolean { return withTimeoutOrNull(unlockTimeoutMillis) { while (isLocked) { @@ -66,7 +66,7 @@ class MullvadTileService : TileService() { val isUnlockStatusPropagated = isUnlockStatusPropagatedWithinTimeout( unlockTimeoutMillis = 1000L, - unlockCheckDelayMillis = 100L + unlockCheckDelayMillis = 100L, ) if (isUnlockStatusPropagated) { @@ -130,7 +130,7 @@ class MullvadTileService : TileService() { applicationContext, 0, intent, - SdkUtils.getSupportedPendingIntentFlags() + SdkUtils.getSupportedPendingIntentFlags(), ) startActivityAndCollapse(pendingIntent) } else { @@ -142,7 +142,7 @@ class MullvadTileService : TileService() { private suspend fun launchListenToTunnelState() { combine( connectionProxy.tunnelState.onStart { emit(TunnelState.Disconnected(null)) }, - managementService.connectionState + managementService.connectionState, ) { tunnelState, connectionState -> tunnelState to connectionState } @@ -153,7 +153,7 @@ class MullvadTileService : TileService() { private fun mapToTileState( tunnelState: TunnelState, - connectionState: GrpcConnectivityState + connectionState: GrpcConnectivityState, ): Int { return if (connectionState == GrpcConnectivityState.Ready) { when (tunnelState) { |
