diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-26 14:58:25 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-02-26 14:58:25 +0100 |
| commit | 5ba686d1ac45509cba636d717bb6729865105cf3 (patch) | |
| tree | e21ad8d6ca30a8ca6a02313c9b4cc786370dc91e /android/lib/model | |
| parent | 5025db74b34cfb3536c43f89f3407ffc0d97ae73 (diff) | |
| parent | 38c4791b414538962f6a8ab958aecd09414f33f6 (diff) | |
| download | mullvadvpn-5ba686d1ac45509cba636d717bb6729865105cf3.tar.xz mullvadvpn-5ba686d1ac45509cba636d717bb6729865105cf3.zip | |
Merge branch 'remove-jodatime-droid-898'
Diffstat (limited to 'android/lib/model')
5 files changed, 7 insertions, 8 deletions
diff --git a/android/lib/model/build.gradle.kts b/android/lib/model/build.gradle.kts index c961dcc32f..f83ff3d5d4 100644 --- a/android/lib/model/build.gradle.kts +++ b/android/lib/model/build.gradle.kts @@ -35,7 +35,6 @@ android { } dependencies { - implementation(libs.jodatime) implementation(libs.kotlin.stdlib) implementation(libs.kotlinx.coroutines.android) implementation(libs.arrow) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountData.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountData.kt index 8a4182b2e5..b1746e1bcc 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountData.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/AccountData.kt @@ -1,5 +1,5 @@ package net.mullvad.mullvadvpn.lib.model -import org.joda.time.DateTime +import java.time.ZonedDateTime -data class AccountData(val id: AccountId, val expiryDate: DateTime) +data class AccountData(val id: AccountId, val expiryDate: ZonedDateTime) diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Device.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Device.kt index e8303f0eca..3eb92f2f8f 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Device.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Device.kt @@ -1,12 +1,12 @@ package net.mullvad.mullvadvpn.lib.model import android.os.Parcelable +import java.time.ZonedDateTime import kotlinx.parcelize.Parcelize import net.mullvad.mullvadvpn.lib.model.extensions.startCase -import org.joda.time.DateTime @Parcelize -data class Device(val id: DeviceId, private val name: String, val creationDate: DateTime) : +data class Device(val id: DeviceId, private val name: String, val creationDate: ZonedDateTime) : Parcelable { fun displayName(): String = name.startCase() } diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Notification.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Notification.kt index acb8d74907..6b073988a3 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Notification.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Notification.kt @@ -1,6 +1,6 @@ package net.mullvad.mullvadvpn.lib.model -import org.joda.time.Duration +import java.time.Duration sealed interface Notification { val actions: List<NotificationAction> diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RedeemVoucherSuccess.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RedeemVoucherSuccess.kt index 9c81042b8c..53fa414047 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RedeemVoucherSuccess.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RedeemVoucherSuccess.kt @@ -1,5 +1,5 @@ package net.mullvad.mullvadvpn.lib.model -import org.joda.time.DateTime +import java.time.ZonedDateTime -data class RedeemVoucherSuccess(val timeAdded: Long, val newExpiryDate: DateTime) +data class RedeemVoucherSuccess(val timeAdded: Long, val newExpiryDate: ZonedDateTime) |