diff options
| author | Albin <albin@mullvad.net> | 2024-08-29 10:38:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-29 10:38:56 +0200 |
| commit | 1ee762f4a7999886455cba0270769de16457a527 (patch) | |
| tree | 683b4405b07a4cb9e85cb21bdb682451945de3a9 /android/lib/common/src/main | |
| parent | 3286d40960d59f7f99109130042d72dc87f4aad1 (diff) | |
| parent | 981e97d254e180362d9e9a6407708a333e5e4f44 (diff) | |
| download | mullvadvpn-1ee762f4a7999886455cba0270769de16457a527.tar.xz mullvadvpn-1ee762f4a7999886455cba0270769de16457a527.zip | |
Merge branch 'deterministically-use-trailing-commas-in-kotlin-code-droid-89'
Diffstat (limited to 'android/lib/common/src/main')
2 files changed, 4 insertions, 4 deletions
diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorNotificationMessage.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorNotificationMessage.kt index bbdd2a56a5..4a5c902d96 100644 --- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorNotificationMessage.kt +++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorNotificationMessage.kt @@ -3,5 +3,5 @@ package net.mullvad.mullvadvpn.lib.common.util data class ErrorNotificationMessage( val titleResourceId: Int, val messageResourceId: Int, - val optionalMessageArgument: String? = null + val optionalMessageArgument: String? = null, ) diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorStateExtension.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorStateExtension.kt index 2c9554a842..5d30a01b2f 100644 --- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorStateExtension.kt +++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/util/ErrorStateExtension.kt @@ -15,7 +15,7 @@ fun ErrorState.getErrorNotificationResources(context: Context): ErrorNotificatio cause.errorMessageId(), (cause as ErrorStateCause.InvalidDnsServers).addresses.joinToString { address -> address.addressString() - } + }, ) } cause is ErrorStateCause.VpnPermissionDenied -> { @@ -33,12 +33,12 @@ private fun resolveAlwaysOnVpnErrorNotificationMessage( ErrorNotificationMessage( R.string.always_on_vpn_error_notification_title, R.string.always_on_vpn_error_notification_content, - alwaysOnVpnAppName + alwaysOnVpnAppName, ) } else { ErrorNotificationMessage( R.string.vpn_permission_error_notification_title, - R.string.vpn_permission_error_notification_message + R.string.vpn_permission_error_notification_message, ) } } |
