diff options
| author | Kalle Lindström <karl.lindstrom@mullvad.net> | 2024-10-04 12:03:06 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-07 08:34:52 +0200 |
| commit | cd084f800055a344262e5100d24ebeb500860e83 (patch) | |
| tree | 5b5d00686dd2e4241d99aefb1d80ab2035b8ff81 /android/service/src | |
| parent | 2912d6f8c9b535711a98a52e0c1285f4db6d6a48 (diff) | |
| download | mullvadvpn-cd084f800055a344262e5100d24ebeb500860e83.tar.xz mullvadvpn-cd084f800055a344262e5100d24ebeb500860e83.zip | |
Use Duration instead of Period
Diffstat (limited to 'android/service/src')
| -rw-r--r-- | android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryTickerFlow.kt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryTickerFlow.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryTickerFlow.kt index 90370cfea2..c3a444f5ed 100644 --- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryTickerFlow.kt +++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryTickerFlow.kt @@ -5,17 +5,16 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flow import org.joda.time.DateTime import org.joda.time.Duration -import org.joda.time.Period fun expiryTickerFlow( expiry: DateTime, tickStart: Duration, updateInterval: (expiry: DateTime) -> Duration, -): Flow<Period> = flow { +): Flow<Duration> = flow { expiry.millisFromNow().let { expiryMillis -> if (expiryMillis <= 0) { // Has expired. - emit(Period.ZERO) + emit(Duration.ZERO) return@flow } if (expiryMillis > tickStart.millis) { @@ -27,7 +26,7 @@ fun expiryTickerFlow( var currentUpdateInterval = updateInterval(expiry).millis do { - emit(Period(DateTime.now(), expiry)) + emit(Duration(DateTime.now(), expiry)) delay(millisUntilNextUpdate(expiry.millisFromNow(), currentUpdateInterval)) currentUpdateInterval = updateInterval(expiry).millis } while (hasAnotherEmission(expiry.millisFromNow(), currentUpdateInterval)) @@ -36,7 +35,7 @@ fun expiryTickerFlow( delay(expiry.millisFromNow()) // We have now expired. - emit(Period.ZERO) + emit(Duration.ZERO) } private fun millisUntilNextUpdate( |