diff options
Diffstat (limited to 'android/lib/model/src')
3 files changed, 4 insertions, 8 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt index c6dc2bb091..d9ca22b164 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Constraint.kt @@ -3,10 +3,8 @@ package net.mullvad.mullvadvpn.model import android.os.Parcelable import kotlinx.parcelize.Parcelize -sealed class Constraint<T>() : Parcelable { - @Parcelize - @Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY") - class Any<T>() : Constraint<T>() +sealed class Constraint<T> : Parcelable { + @Parcelize @Suppress("PARCELABLE_PRIMARY_CONSTRUCTOR_IS_EMPTY") class Any<T> : Constraint<T>() @Parcelize data class Only<T : Parcelable>(val value: T) : Constraint<T>() } diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt index 05dd38a80b..72276c65e4 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomTunnelEndpoint.kt @@ -1,3 +1,3 @@ package net.mullvad.mullvadvpn.model -class CustomTunnelEndpoint() +class CustomTunnelEndpoint diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt index 92f0621e6e..4918ee0832 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt @@ -15,9 +15,7 @@ data class Device(val id: String, val name: String, val pubkey: ByteArray, val c if (id != other.id) return false if (name != other.name) return false - if (!pubkey.contentEquals(other.pubkey)) return false - - return true + return pubkey.contentEquals(other.pubkey) } // Generated by Android Studio |