summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2022-06-20 11:39:29 +0200
committerAlbin <albin@mullvad.net>2022-06-22 11:57:30 +0200
commit974facc7794cb4631f446acd36f28436ce1e0d45 (patch)
tree7a7d57c73ffbd1c50c763164d3e5e8b3ddb60783
parente508a91977d4ccf1390f0e002da4e1fd688fa30c (diff)
downloadmullvadvpn-974facc7794cb4631f446acd36f28436ce1e0d45.tar.xz
mullvadvpn-974facc7794cb4631f446acd36f28436ce1e0d45.zip
Add missing device port model
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt2
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DevicePort.kt7
-rw-r--r--mullvad-jni/src/classes.rs1
3 files changed, 9 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt
index 21341dca54..ee34bc968f 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt
@@ -8,7 +8,7 @@ data class Device(
val id: String,
val name: String,
val pubkey: ByteArray,
- val ports: ArrayList<String>
+ val ports: ArrayList<DevicePort>
) : Parcelable {
// Generated by Android Studio
override fun equals(other: Any?): Boolean {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DevicePort.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DevicePort.kt
new file mode 100644
index 0000000000..1159fa1a47
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/DevicePort.kt
@@ -0,0 +1,7 @@
+package net.mullvad.mullvadvpn.model
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class DevicePort(val id: String) : Parcelable
diff --git a/mullvad-jni/src/classes.rs b/mullvad-jni/src/classes.rs
index 2668c6a213..026d7462c5 100644
--- a/mullvad-jni/src/classes.rs
+++ b/mullvad-jni/src/classes.rs
@@ -12,6 +12,7 @@ pub const CLASSES: &[&str] = &[
"net/mullvad/mullvadvpn/model/Device",
"net/mullvad/mullvadvpn/model/DeviceEvent",
"net/mullvad/mullvadvpn/model/DeviceEventCause",
+ "net/mullvad/mullvadvpn/model/DevicePort",
"net/mullvad/mullvadvpn/model/DeviceState$LoggedIn",
"net/mullvad/mullvadvpn/model/DeviceState$LoggedOut",
"net/mullvad/mullvadvpn/model/DeviceState$Revoked",