summaryrefslogtreecommitdiffhomepage
path: root/android/lib/shared
diff options
context:
space:
mode:
authorAlbin <albin@mullvad.net>2024-08-28 20:33:46 +0200
committerAlbin <albin@mullvad.net>2024-08-28 20:44:14 +0200
commitb52c423d777213d5bb92430bccec880c6367a70b (patch)
tree6ce254a809c1555fbde9a1c5692725042803854c /android/lib/shared
parenta71f1e7a6888bc6af5a9df355afd26d3f56d0e5c (diff)
downloadmullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.tar.xz
mullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.zip
Reformat kotlin code using updated ktfmt plugin
This commit mostly adds trailing commas throughout the project, but also includes a few other formatting changes.
Diffstat (limited to 'android/lib/shared')
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt4
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt2
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt6
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/RelayLocationTranslationRepository.kt2
-rw-r--r--android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VoucherRepository.kt2
-rw-r--r--android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt2
6 files changed, 9 insertions, 9 deletions
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
index 82f70e8140..b605bf7ac0 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/AccountRepository.kt
@@ -25,7 +25,7 @@ import org.joda.time.DateTime
class AccountRepository(
private val managementService: ManagementService,
private val deviceRepository: DeviceRepository,
- val scope: CoroutineScope
+ val scope: CoroutineScope,
) {
private val _mutableAccountDataCache: MutableSharedFlow<AccountData> = MutableSharedFlow()
@@ -43,7 +43,7 @@ class AccountRepository(
DeviceState.Revoked -> null
}
},
- _mutableAccountDataCache
+ _mutableAccountDataCache,
)
.distinctUntilChanged()
.stateIn(scope = scope, SharingStarted.Eagerly, null)
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt
index 13d668b65b..2dbd15ec03 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxy.kt
@@ -12,7 +12,7 @@ import net.mullvad.mullvadvpn.lib.model.TunnelState
class ConnectionProxy(
private val managementService: ManagementService,
translationRepository: RelayLocationTranslationRepository,
- private val vpnPermissionRepository: VpnPermissionRepository
+ private val vpnPermissionRepository: VpnPermissionRepository,
) {
val tunnelState =
combine(managementService.tunnelState, translationRepository.translations) {
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
index 29f91b43f1..258f918788 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
@@ -18,18 +18,18 @@ import net.mullvad.mullvadvpn.lib.model.GetDeviceListError
class DeviceRepository(
private val managementService: ManagementService,
- dispatcher: CoroutineDispatcher = Dispatchers.IO
+ dispatcher: CoroutineDispatcher = Dispatchers.IO,
) {
val deviceState: StateFlow<DeviceState?> =
managementService.deviceState.stateIn(
CoroutineScope(dispatcher),
SharingStarted.Eagerly,
- null
+ null,
)
suspend fun removeDevice(
accountNumber: AccountNumber,
- deviceId: DeviceId
+ deviceId: DeviceId,
): Either<DeleteDeviceError, Unit> = managementService.removeDevice(accountNumber, deviceId)
suspend fun deviceList(accountNumber: AccountNumber): Either<GetDeviceListError, List<Device>> =
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/RelayLocationTranslationRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/RelayLocationTranslationRepository.kt
index edaa0c1ebc..b2685abaf2 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/RelayLocationTranslationRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/RelayLocationTranslationRepository.kt
@@ -23,7 +23,7 @@ class RelayLocationTranslationRepository(
val context: Context,
val localeRepository: LocaleRepository,
externalScope: CoroutineScope = MainScope(),
- val dispatcher: CoroutineDispatcher = Dispatchers.IO
+ val dispatcher: CoroutineDispatcher = Dispatchers.IO,
) {
val translations: StateFlow<Translations> =
localeRepository.currentLocale
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VoucherRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VoucherRepository.kt
index 3ea55ccd9d..9b08181ee3 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VoucherRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/VoucherRepository.kt
@@ -5,7 +5,7 @@ import net.mullvad.mullvadvpn.lib.model.VoucherCode
class VoucherRepository(
private val managementService: ManagementService,
- private val accountRepository: AccountRepository
+ private val accountRepository: AccountRepository,
) {
suspend fun submitVoucher(voucher: VoucherCode) =
managementService.submitVoucher(voucher).onRight {
diff --git a/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt b/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
index 138d0f5a41..0652867105 100644
--- a/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
+++ b/android/lib/shared/src/test/kotlin/net/mullvad/mullvadvpn/lib/shared/ConnectionProxyTest.kt
@@ -20,7 +20,7 @@ class ConnectionProxyTest {
ConnectionProxy(
managementService = mockManagementService,
vpnPermissionRepository = mockVpnPermissionRepository,
- translationRepository = mockTranslationRepository
+ translationRepository = mockTranslationRepository,
)
@Test