summaryrefslogtreecommitdiffhomepage
path: root/android/lib/model/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2023-09-05 13:14:46 +0200
committerLinus Färnstrand <linus@mullvad.net>2023-09-05 13:14:46 +0200
commit3b7ddae6fb8fccc0aecb2da5deb326cb0ba89fc3 (patch)
treec70a414441718115a5506332fcfd858bb83f4ab2 /android/lib/model/src
parent7444ac28c93fbdc6cfbbae648fa19eec70e57077 (diff)
parent057c2e9c9cf1561fb9db3c7c560ef0144b545a0c (diff)
downloadmullvadvpn-3b7ddae6fb8fccc0aecb2da5deb326cb0ba89fc3.tar.xz
mullvadvpn-3b7ddae6fb8fccc0aecb2da5deb326cb0ba89fc3.zip
Merge branch 'remove-forwarded-ports-code'
Diffstat (limited to 'android/lib/model/src')
-rw-r--r--android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt11
1 files changed, 2 insertions, 9 deletions
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 a9ad4ec874..92f0621e6e 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
@@ -4,13 +4,8 @@ import android.os.Parcelable
import kotlinx.parcelize.Parcelize
@Parcelize
-data class Device(
- val id: String,
- val name: String,
- val pubkey: ByteArray,
- val ports: ArrayList<DevicePort>,
- val created: String
-) : Parcelable {
+data class Device(val id: String, val name: String, val pubkey: ByteArray, val created: String) :
+ Parcelable {
// Generated by Android Studio
override fun equals(other: Any?): Boolean {
if (this === other) return true
@@ -21,7 +16,6 @@ data class Device(
if (id != other.id) return false
if (name != other.name) return false
if (!pubkey.contentEquals(other.pubkey)) return false
- if (ports != other.ports) return false
return true
}
@@ -31,7 +25,6 @@ data class Device(
var result = id.hashCode()
result = 31 * result + name.hashCode()
result = 31 * result + pubkey.contentHashCode()
- result = 31 * result + ports.hashCode()
return result
}
}