diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-08 11:17:02 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-02-08 11:17:02 +0100 |
| commit | ec4c473c5c08e30e16822a8a82531d3ff5a1135f (patch) | |
| tree | ad2ced90d3ece795a71a004a6006c377c04c1bf0 /android/lib/model/src | |
| parent | 1b80203504f58fab47dc6dbe53f223084acecc6a (diff) | |
| parent | af3df963648d4cc535b552f75cf3abdfe936b395 (diff) | |
| download | mullvadvpn-ec4c473c5c08e30e16822a8a82531d3ff5a1135f.tar.xz mullvadvpn-ec4c473c5c08e30e16822a8a82531d3ff5a1135f.zip | |
Merge branch 'add-support-for-custom-list-in-the-app-layer-droid-653'
Diffstat (limited to 'android/lib/model/src')
3 files changed, 18 insertions, 0 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt new file mode 100644 index 0000000000..cdfa1b9687 --- /dev/null +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomList.kt @@ -0,0 +1,11 @@ +package net.mullvad.mullvadvpn.model + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +data class CustomList( + val id: String, + val name: String, + val locations: ArrayList<GeographicLocationConstraint> +) : Parcelable diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt new file mode 100644 index 0000000000..8a8c03ef05 --- /dev/null +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/CustomListsSettings.kt @@ -0,0 +1,6 @@ +package net.mullvad.mullvadvpn.model + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize data class CustomListsSettings(val customLists: ArrayList<CustomList>) : Parcelable diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt index 0d45b38179..304edc404a 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Settings.kt @@ -7,6 +7,7 @@ import kotlinx.parcelize.Parcelize data class Settings( val relaySettings: RelaySettings, val obfuscationSettings: ObfuscationSettings, + val customLists: CustomListsSettings, val allowLan: Boolean, val autoConnect: Boolean, val tunnelOptions: TunnelOptions, |