Reformat kotlin code using updated ktfmt plugin

This commit mostly adds trailing commas throughout the project,
but also includes a few other formatting changes.

22 files changed, 27 insertions, 32 deletions

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 60395721d8..8a4182b2e5 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
@@ -2,7 +2,4 @@ package net.mullvad.mullvadvpn.lib.model
 
 import org.joda.time.DateTime
 
-data class AccountData(
-    val id: AccountId,
-    val expiryDate: DateTime,
-)
+data class AccountData(val id: AccountId, val expiryDate: DateTime)
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ActionAfterDisconnect.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ActionAfterDisconnect.kt
index 531fc1c073..d18d887b50 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ActionAfterDisconnect.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ActionAfterDisconnect.kt
@@ -3,5 +3,5 @@ package net.mullvad.mullvadvpn.lib.model
 enum class ActionAfterDisconnect {
     Nothing,
     Block,
-    Reconnect
+    Reconnect,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethod.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethod.kt
index d8762af391..3fdcf8c730 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethod.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethod.kt
@@ -17,7 +17,7 @@ sealed interface ApiAccessMethod : Parcelable {
             val ip: String,
             val port: Port,
             val password: String?,
-            val cipher: Cipher
+            val cipher: Cipher,
         ) : CustomProxy
     }
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethodSetting.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethodSetting.kt
index 07e1c185df..ff1fa8a771 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethodSetting.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ApiAccessMethodSetting.kt
@@ -4,5 +4,5 @@ data class ApiAccessMethodSetting(
     val id: ApiAccessMethodId,
     val name: ApiAccessMethodName,
     val enabled: Boolean,
-    val apiAccessMethod: ApiAccessMethod
+    val apiAccessMethod: ApiAccessMethod,
 )
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/CustomList.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/CustomList.kt
index ed43ac1097..12468aaecd 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/CustomList.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/CustomList.kt
@@ -6,7 +6,7 @@ import arrow.optics.optics
 data class CustomList(
     val id: CustomListId,
     val name: CustomListName,
-    val locations: List<GeoLocationId>
+    val locations: List<GeoLocationId>,
 ) {
     companion object
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsOptions.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsOptions.kt
index ae27e47457..0aee2239d2 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsOptions.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsOptions.kt
@@ -6,7 +6,7 @@ import arrow.optics.optics
 data class DnsOptions(
     val state: DnsState,
     val defaultOptions: DefaultDnsOptions,
-    val customOptions: CustomDnsOptions
+    val customOptions: CustomDnsOptions,
 ) {
     companion object
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsState.kt
index 4bf053eef1..7529b54864 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsState.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/DnsState.kt
@@ -2,5 +2,5 @@ package net.mullvad.mullvadvpn.lib.model
 
 enum class DnsState {
     Default,
-    Custom
+    Custom,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/NewAccessMethodSetting.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/NewAccessMethodSetting.kt
index 990dc300bc..b7a1016b8f 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/NewAccessMethodSetting.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/NewAccessMethodSetting.kt
@@ -7,5 +7,5 @@ import kotlinx.parcelize.Parcelize
 data class NewAccessMethodSetting(
     val name: ApiAccessMethodName,
     val enabled: Boolean,
-    val apiAccessMethod: ApiAccessMethod.CustomProxy
+    val apiAccessMethod: ApiAccessMethod.CustomProxy,
 ) : Parcelable
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 5dda03aa9d..acb8d74907 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
@@ -18,7 +18,7 @@ sealed interface Notification {
         override val channelId: NotificationChannelId,
         override val actions: List<NotificationAction.AccountExpiry>,
         val websiteAuthToken: WebsiteAuthToken?,
-        val durationUntilExpiry: Duration
+        val durationUntilExpiry: Duration,
     ) : Notification {
         override val ongoing: Boolean = false
     }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationSettings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationSettings.kt
index b8a26973a2..1bf12b2f9b 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationSettings.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationSettings.kt
@@ -5,7 +5,7 @@ import arrow.optics.optics
 @optics
 data class ObfuscationSettings(
     val selectedObfuscation: SelectedObfuscation,
-    val udp2tcp: Udp2TcpObfuscationSettings
+    val udp2tcp: Udp2TcpObfuscationSettings,
 ) {
     companion object
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationType.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationType.kt
index 4e7cb1f5a8..80c2f70e13 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationType.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ObfuscationType.kt
@@ -2,5 +2,5 @@ package net.mullvad.mullvadvpn.lib.model
 
 enum class ObfuscationType {
     Udp2Tcp,
-    Shadowsocks
+    Shadowsocks,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Ownership.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Ownership.kt
index 5257f944d3..682419c19b 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Ownership.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Ownership.kt
@@ -2,5 +2,5 @@ package net.mullvad.mullvadvpn.lib.model
 
 enum class Ownership {
     MullvadOwned,
-    Rented
+    Rented,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
index 476aed1407..0aadc19094 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/ParameterGenerationError.kt
@@ -4,5 +4,5 @@ enum class ParameterGenerationError {
     NoMatchingRelay,
     NoMatchingBridgeRelay,
     NoWireguardKey,
-    CustomTunnelHostResultionError
+    CustomTunnelHostResultionError,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/QuantumResistantState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/QuantumResistantState.kt
index c77dab72d3..26179c25c3 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/QuantumResistantState.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/QuantumResistantState.kt
@@ -3,5 +3,5 @@ package net.mullvad.mullvadvpn.lib.model
 enum class QuantumResistantState {
     Auto,
     On,
-    Off
+    Off,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt
index 17bc563a8d..edf00d4cb4 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt
@@ -13,10 +13,8 @@ sealed interface RelayItem {
     val hasChildren: Boolean
 
     @optics
-    data class CustomList(
-        val customList: DomainCustomList,
-        val locations: List<Location>,
-    ) : RelayItem {
+    data class CustomList(val customList: DomainCustomList, val locations: List<Location>) :
+        RelayItem {
         override val name: String = customList.name.value
         override val id = customList.id
 
@@ -34,7 +32,7 @@ sealed interface RelayItem {
         data class Country(
             override val id: GeoLocationId.Country,
             override val name: String,
-            val cities: List<City>
+            val cities: List<City>,
         ) : Location {
             val relays = cities.flatMap { city -> city.relays }
             override val active = cities.any { it.active }
@@ -47,7 +45,7 @@ sealed interface RelayItem {
         data class City(
             override val id: GeoLocationId.City,
             override val name: String,
-            val relays: List<Relay>
+            val relays: List<Relay>,
         ) : Location {
             override val active = relays.any { it.active }
             override val hasChildren: Boolean = relays.isNotEmpty()
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayList.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayList.kt
index 39e43a713e..197849b2f1 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayList.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayList.kt
@@ -2,5 +2,5 @@ package net.mullvad.mullvadvpn.lib.model
 
 data class RelayList(
     val countries: List<RelayItem.Location.Country>,
-    val wireguardEndpointData: WireguardEndpointData
+    val wireguardEndpointData: WireguardEndpointData,
 )
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayOverride.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayOverride.kt
index 3bd0a2f0a1..522031a332 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayOverride.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayOverride.kt
@@ -7,7 +7,7 @@ import java.net.InetAddress
 data class RelayOverride(
     val hostname: String,
     val ipv4AddressIn: InetAddress?,
-    val ipv6AddressIn: InetAddress?
+    val ipv6AddressIn: InetAddress?,
 ) {
     companion object
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SelectedObfuscation.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SelectedObfuscation.kt
index 1651d61db7..03de12079e 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SelectedObfuscation.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/SelectedObfuscation.kt
@@ -3,5 +3,5 @@ package net.mullvad.mullvadvpn.lib.model
 enum class SelectedObfuscation {
     Auto,
     Off,
-    Udp2Tcp
+    Udp2Tcp,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
index e801397b27..0c15202bee 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Settings.kt
@@ -13,7 +13,7 @@ data class Settings(
     val relayOverrides: List<RelayOverride>,
     val showBetaReleases: Boolean,
     val splitTunnelSettings: SplitTunnelSettings,
-    val apiAccessMethodSettings: List<ApiAccessMethodSetting>
+    val apiAccessMethodSettings: List<ApiAccessMethodSetting>,
 ) {
     companion object
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TransportProtocol.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TransportProtocol.kt
index b25e3061be..4a36c3ce3c 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TransportProtocol.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TransportProtocol.kt
@@ -6,5 +6,5 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 enum class TransportProtocol : Parcelable {
     Tcp,
-    Udp
+    Udp,
 }
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelEndpoint.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelEndpoint.kt
index d715f16766..1465997cc5 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelEndpoint.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelEndpoint.kt
@@ -3,5 +3,5 @@ package net.mullvad.mullvadvpn.lib.model
 data class TunnelEndpoint(
     val endpoint: Endpoint,
     val quantumResistant: Boolean,
-    val obfuscation: ObfuscationEndpoint?
+    val obfuscation: ObfuscationEndpoint?,
 )
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt
index 8ed43bd294..53d468c01e 100644
--- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt
+++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt
@@ -6,13 +6,13 @@ sealed class TunnelState {
     data class Connecting(
         val endpoint: TunnelEndpoint?,
         val location: GeoIpLocation?,
-        val featureIndicators: List<FeatureIndicator>
+        val featureIndicators: List<FeatureIndicator>,
     ) : TunnelState()
 
     data class Connected(
         val endpoint: TunnelEndpoint,
         val location: GeoIpLocation?,
-        val featureIndicators: List<FeatureIndicator>
+        val featureIndicators: List<FeatureIndicator>,
     ) : TunnelState()
 
     data class Disconnecting(val actionAfterDisconnect: ActionAfterDisconnect) : TunnelState()
@@ -33,7 +33,7 @@ sealed class TunnelState {
         return when (this) {
             is Connected,
             is Connecting,
-            is Disconnecting, -> true
+            is Disconnecting -> true
             is Disconnected -> false
             is Error -> this.errorState.isBlocking
         }