diff options
| author | Albin <albin@mullvad.net> | 2024-08-28 20:33:46 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-28 20:44:14 +0200 |
| commit | b52c423d777213d5bb92430bccec880c6367a70b (patch) | |
| tree | 6ce254a809c1555fbde9a1c5692725042803854c /android/lib/billing/src | |
| parent | a71f1e7a6888bc6af5a9df355afd26d3f56d0e5c (diff) | |
| download | mullvadvpn-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/billing/src')
5 files changed, 20 insertions, 20 deletions
diff --git a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt index 7ca3219cfb..35dedb6200 100644 --- a/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt +++ b/android/lib/billing/src/androidTest/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepositoryTest.kt @@ -158,7 +158,7 @@ class BillingRepositoryTest { billingRepository.startPurchaseFlow( mockProductDetails, transactionId, - mockActivityProvider + mockActivityProvider, ) // Assert @@ -184,7 +184,7 @@ class BillingRepositoryTest { billingRepository.startPurchaseFlow( mockProductDetails, transactionId, - mockActivityProvider + mockActivityProvider, ) // Assert @@ -252,7 +252,7 @@ class BillingRepositoryTest { // Assert assertEquals( expectedError.toBillingResult().responseCode, - result.billingResult.responseCode + result.billingResult.responseCode, ) assertEquals(expectedError.message, result.billingResult.debugMessage) } @@ -269,7 +269,7 @@ class BillingRepositoryTest { billingRepository.purchaseEvents.test { purchaseUpdatedListenerSlot.captured.onPurchasesUpdated( mockBillingResult, - mockPurchaseList + mockPurchaseList, ) val result = awaitItem() assertIs<PurchaseEvent.Completed>(result) diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt index b526a10032..540a8ad929 100644 --- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt +++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt @@ -30,7 +30,7 @@ import net.mullvad.mullvadvpn.lib.payment.model.VerificationResult class BillingPaymentRepository( private val billingRepository: BillingRepository, - private val playPurchaseRepository: PlayPurchaseRepository + private val playPurchaseRepository: PlayPurchaseRepository, ) : PaymentRepository { override fun queryPaymentAvailability(): Flow<PaymentAvailability> = flow { @@ -49,7 +49,7 @@ class BillingPaymentRepository( override fun purchaseProduct( productId: ProductId, - activityProvider: () -> Activity + activityProvider: () -> Activity, ): Flow<PurchaseResult> = flow { emit(PurchaseResult.FetchingProducts) @@ -68,7 +68,7 @@ class BillingPaymentRepository( emit( PurchaseResult.Error.FetchProductsError( productId, - productDetailsResult.toBillingException() + productDetailsResult.toBillingException(), ) ) return@flow @@ -84,14 +84,14 @@ class BillingPaymentRepository( emit(PurchaseResult.Error.TransactionIdError(productId, null)) return@flow }, - { it } + { it }, ) val result = billingRepository.startPurchaseFlow( productDetails = productDetails, obfuscatedId = obfuscatedId.value, - activityProvider = activityProvider + activityProvider = activityProvider, ) if (result.responseCode == BillingResponseCode.OK) { @@ -123,7 +123,7 @@ class BillingPaymentRepository( verifyPurchase(event.purchases.first()) .fold( { PurchaseResult.Error.VerificationError(null) }, - { PurchaseResult.Completed.Success } + { PurchaseResult.Completed.Success }, ) ) } diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt index 6b3098fad0..544c348170 100644 --- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt +++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt @@ -48,7 +48,7 @@ class BillingRepository(context: Context) { exception = BillingException( responseCode = result.responseCode, - message = result.debugMessage + message = result.debugMessage, ) ) ) @@ -110,7 +110,7 @@ class BillingRepository(context: Context) { suspend fun startPurchaseFlow( productDetails: ProductDetails, obfuscatedId: String, - activityProvider: () -> Activity + activityProvider: () -> Activity, ): BillingResult { return try { ensureConnected() @@ -172,7 +172,7 @@ class BillingRepository(context: Context) { } catch (t: Throwable) { ProductDetailsResult( BillingResult.newBuilder().setResponseCode(BillingResponseCode.ERROR).build(), - null + null, ) } } diff --git a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsToPaymentProduct.kt b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsToPaymentProduct.kt index fa9a20613f..5a0d0b42fb 100644 --- a/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsToPaymentProduct.kt +++ b/android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/extension/ProductDetailsToPaymentProduct.kt @@ -10,7 +10,7 @@ fun ProductDetails.toPaymentProduct(productIdToStatus: Map<String, PaymentStatus PaymentProduct( productId = ProductId(this.productId), price = ProductPrice(this.oneTimePurchaseOfferDetails?.formattedPrice ?: ""), - productIdToStatus[this.productId] + productIdToStatus[this.productId], ) fun List<ProductDetails>.toPaymentProducts(productIdToStatus: Map<String, PaymentStatus?>) = diff --git a/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt b/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt index ad716cd30c..48618feb2b 100644 --- a/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt +++ b/android/lib/billing/src/test/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepositoryTest.kt @@ -49,7 +49,7 @@ class BillingPaymentRepositoryTest { paymentRepository = BillingPaymentRepository( billingRepository = mockBillingRepository, - playPurchaseRepository = mockPlayPurchaseRepository + playPurchaseRepository = mockPlayPurchaseRepository, ) } @@ -203,7 +203,7 @@ class BillingPaymentRepositoryTest { mockBillingRepository.startPurchaseFlow( productDetails = any(), obfuscatedId = any(), - activityProvider = any() + activityProvider = any(), ) } returns mockBillingResult coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns @@ -238,7 +238,7 @@ class BillingPaymentRepositoryTest { mockBillingRepository.startPurchaseFlow( productDetails = any(), obfuscatedId = mockObfuscatedId, - activityProvider = any() + activityProvider = any(), ) } returns mockBillingResult coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns @@ -280,7 +280,7 @@ class BillingPaymentRepositoryTest { mockBillingRepository.startPurchaseFlow( productDetails = any(), obfuscatedId = any(), - activityProvider = any() + activityProvider = any(), ) } returns mockBillingResult coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns @@ -323,7 +323,7 @@ class BillingPaymentRepositoryTest { mockBillingRepository.startPurchaseFlow( productDetails = any(), obfuscatedId = any(), - activityProvider = any() + activityProvider = any(), ) } returns mockBillingResult coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns @@ -364,7 +364,7 @@ class BillingPaymentRepositoryTest { mockBillingRepository.startPurchaseFlow( productDetails = any(), obfuscatedId = any(), - activityProvider = any() + activityProvider = any(), ) } returns mockBillingResult coEvery { mockPlayPurchaseRepository.initializePlayPurchase() } returns |
