Reformat kotlin code using updated ktfmt plugin

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

10 files changed, 27 insertions, 37 deletions

diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index cdaddec614..5bfae14383 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -12,7 +12,7 @@ object MullvadDaemon {
         rpcSocketPath: String,
         filesDirectory: String,
         cacheDirectory: String,
-        apiEndpoint: ApiEndpoint?
+        apiEndpoint: ApiEndpoint?,
     )
 
     external fun shutdown()
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 6d17b85b6a..5603392376 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -161,7 +161,7 @@ class MullvadVpnService : TalpidVpnService() {
             rpcSocketPath = rpcSocketFile.absolutePath,
             filesDirectory = filesDir.absolutePath,
             cacheDirectory = cacheDir.absolutePath,
-            apiEndpoint = apiEndpointConfiguration.apiEndpoint()
+            apiEndpoint = apiEndpointConfiguration.apiEndpoint(),
         )
         Logger.i("MullvadVpnService: Daemon initialized")
     }
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt
index e037039675..e229e0ed24 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt
@@ -29,25 +29,21 @@ val vpnServiceModule = module {
             get(),
             get(),
             get<NotificationChannel.TunnelUpdates>().id,
-            MainScope()
+            MainScope(),
         )
     } bind NotificationProvider::class
     single {
         AccountExpiryNotificationProvider(
             get<NotificationChannel.AccountUpdates>().id,
             get(),
-            get()
+            get(),
         )
     } bind NotificationProvider::class
 
-    single {
-        NotificationManager(
-            get(),
-            getAll(),
-            get(),
-            MainScope(),
-        )
-    } withOptions { createdAtStart() }
+    single { NotificationManager(get(), getAll(), get(), MainScope()) } withOptions
+        {
+            createdAtStart()
+        }
 
     single { MigrateSplitTunneling(androidContext()) }
 }
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/ForegroundNotificationManager.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/ForegroundNotificationManager.kt
index e02705cb2d..5745377254 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/ForegroundNotificationManager.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/ForegroundNotificationManager.kt
@@ -52,7 +52,7 @@ class ForegroundNotificationManager(
             vpnService.startForeground(
                 tunnelStateNotificationProvider.notificationId.value,
                 androidNotification,
-                ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED
+                ServiceInfo.FOREGROUND_SERVICE_TYPE_SYSTEM_EXEMPTED,
             )
         } else {
             vpnService.startForeground(
@@ -67,6 +67,6 @@ class ForegroundNotificationManager(
             NotificationChannel.TunnelUpdates.id,
             NotificationTunnelState.Disconnected(true),
             emptyList(),
-            false
+            false,
         )
 }
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannelFactory.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannelFactory.kt
index c7c9a67b43..72539e8e94 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannelFactory.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannelFactory.kt
@@ -11,7 +11,7 @@ import net.mullvad.mullvadvpn.lib.model.NotificationChannelId
 class NotificationChannelFactory(
     private val notificationManagerCompat: NotificationManagerCompat,
     private val resources: Resources,
-    channels: List<NotificationChannel>
+    channels: List<NotificationChannel>,
 ) {
     init {
         channels.forEach { create(it) }
@@ -30,10 +30,7 @@ class NotificationChannelFactory(
         }
 
     private fun NotificationChannel.TunnelUpdates.toChannel(): NotificationChannelCompat =
-        NotificationChannelCompat.Builder(
-                id.value,
-                NotificationManager.IMPORTANCE_LOW,
-            )
+        NotificationChannelCompat.Builder(id.value, NotificationManager.IMPORTANCE_LOW)
             .setName(resources.getString(R.string.foreground_notification_channel_name))
             .setDescription(
                 resources.getString(R.string.foreground_notification_channel_description)
@@ -43,10 +40,7 @@ class NotificationChannelFactory(
             .build()
 
     private fun NotificationChannel.AccountUpdates.toChannel(): NotificationChannelCompat =
-        NotificationChannelCompat.Builder(
-                id.value,
-                NotificationManager.IMPORTANCE_HIGH,
-            )
+        NotificationChannelCompat.Builder(id.value, NotificationManager.IMPORTANCE_HIGH)
             .setName(resources.getString(R.string.account_time_notification_channel_name))
             .setDescription(
                 resources.getString(R.string.account_time_notification_channel_description)
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationManager.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationManager.kt
index 74aff9cca0..3d58e571fd 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationManager.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationManager.kt
@@ -37,12 +37,12 @@ class NotificationManager(
                             if (
                                 ActivityCompat.checkSelfPermission(
                                     context,
-                                    Manifest.permission.POST_NOTIFICATIONS
+                                    Manifest.permission.POST_NOTIFICATIONS,
                                 ) == PackageManager.PERMISSION_GRANTED
                             ) {
                                 notificationManagerCompat.notify(
                                     notificationUpdate.notificationId.value,
-                                    androidNotification
+                                    androidNotification,
                                 )
                             }
                         }
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryAndroidNotification.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryAndroidNotification.kt
index 5b5570470d..0e8a1a528f 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryAndroidNotification.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryAndroidNotification.kt
@@ -45,13 +45,13 @@ private fun Resources.contentTitle(remainingTime: Duration): String =
         remainingTime.standardDays >= 1 -> {
             getRemainingText(
                 R.plurals.account_credit_expires_in_days,
-                remainingTime.standardDays.toInt()
+                remainingTime.standardDays.toInt(),
             )
         }
         remainingTime.standardHours >= 1 -> {
             getRemainingText(
                 R.plurals.account_credit_expires_in_hours,
-                remainingTime.standardHours.toInt()
+                remainingTime.standardHours.toInt(),
             )
         }
         else -> getString(R.string.account_credit_expires_in_a_few_minutes)
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt
index b1f1613890..e6980b9706 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/accountexpiry/AccountExpiryNotificationProvider.kt
@@ -26,7 +26,7 @@ class AccountExpiryNotificationProvider(
         combine(
                 deviceRepository.deviceState,
                 accountRepository.accountData.filterNotNull(),
-                accountRepository.isNewAccount
+                accountRepository.isNewAccount,
             ) { deviceState, accountData, isNewAccount ->
                 if (deviceState !is DeviceState.LoggedIn) {
                     return@combine NotificationUpdate.Cancel(notificationId)
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationAction.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationAction.kt
index 74027ac940..3e0f3f7e3b 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationAction.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationAction.kt
@@ -77,7 +77,7 @@ internal fun NotificationAction.Tunnel.toCompatAction(context: Context): Notific
     return NotificationCompat.Action(
         toIconResource(),
         context.getString(titleResource()),
-        pendingIntent
+        pendingIntent,
     )
 }
 
diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationProvider.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationProvider.kt
index dada16ace3..3ff3b07e66 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationProvider.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/tunnelstate/TunnelStateNotificationProvider.kt
@@ -30,7 +30,7 @@ class TunnelStateNotificationProvider(
     vpnPermissionRepository: VpnPermissionRepository,
     deviceRepository: DeviceRepository,
     channelId: NotificationChannelId,
-    scope: CoroutineScope
+    scope: CoroutineScope,
 ) : NotificationProvider<Notification.Tunnel> {
     internal val notificationId = NotificationId(2)
 
@@ -38,7 +38,7 @@ class TunnelStateNotificationProvider(
         combine(
                 connectionProxy.tunnelState,
                 connectionProxy.tunnelState.actionAfterDisconnect().distinctUntilChanged(),
-                deviceRepository.deviceState
+                deviceRepository.deviceState,
             ) { tunnelState: TunnelState, actionAfterDisconnect: ActionAfterDisconnect?, deviceState
                 ->
                 if (
@@ -51,7 +51,7 @@ class TunnelStateNotificationProvider(
                         tunnelState,
                         actionAfterDisconnect,
                         vpnPermissionRepository.hasVpnPermission(),
-                        vpnPermissionRepository.getAlwaysOnVpnAppName()
+                        vpnPermissionRepository.getAlwaysOnVpnAppName(),
                     )
 
                 return@combine NotificationUpdate.Notify(
@@ -60,8 +60,8 @@ class TunnelStateNotificationProvider(
                         channelId = channelId,
                         state = notificationTunnelState,
                         actions = listOfNotNull(notificationTunnelState.toAction()),
-                        ongoing = notificationTunnelState is NotificationTunnelState.Connected
-                    )
+                        ongoing = notificationTunnelState is NotificationTunnelState.Connected,
+                    ),
                 )
             }
             .stateIn(scope, SharingStarted.Eagerly, NotificationUpdate.Cancel(notificationId))
@@ -70,12 +70,12 @@ class TunnelStateNotificationProvider(
         tunnelState: TunnelState,
         actionAfterDisconnect: ActionAfterDisconnect?,
         hasVpnPermission: Boolean,
-        alwaysOnVpnPermissionName: String?
+        alwaysOnVpnPermissionName: String?,
     ): NotificationTunnelState =
         tunnelState.toNotificationTunnelState(
             actionAfterDisconnect,
             hasVpnPermission,
-            alwaysOnVpnPermissionName
+            alwaysOnVpnPermissionName,
         )
 
     private fun Flow<TunnelState>.actionAfterDisconnect(): Flow<ActionAfterDisconnect?> =
@@ -86,7 +86,7 @@ class TunnelStateNotificationProvider(
     private fun TunnelState.toNotificationTunnelState(
         actionAfterDisconnect: ActionAfterDisconnect?,
         hasVpnPermission: Boolean,
-        alwaysOnVpnPermissionName: String?
+        alwaysOnVpnPermissionName: String?,
     ) =
         when (this) {
             is TunnelState.Disconnected -> NotificationTunnelState.Disconnected(hasVpnPermission)