Expose play purchase API via gRPC

Author: MarkusPettersson98

android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingPaymentRepository.kt

@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn.lib.billing
 
 import android.app.Activity
+import android.util.Log
 import com.android.billingclient.api.BillingClient.BillingResponseCode
 import com.android.billingclient.api.Purchase
 import kotlinx.coroutines.flow.Flow
@@ -22,6 +23,7 @@ import net.mullvad.mullvadvpn.lib.payment.model.ProductId
 import net.mullvad.mullvadvpn.lib.payment.model.PurchaseResult
 import net.mullvad.mullvadvpn.lib.payment.model.VerificationResult
 import net.mullvad.mullvadvpn.model.PlayPurchase
+import net.mullvad.mullvadvpn.model.PlayPurchasePaymentToken
 
 class BillingPaymentRepository(
     private val billingRepository: BillingRepository,
@@ -38,7 +40,7 @@ class BillingPaymentRepository(
         emit(
             billingRepository
                 .queryProducts(listOf(ProductIds.OneMonth))
-                .toPaymentAvailability(productIdToPaymentStatus)
+                .toPaymentAvailability(productIdToPaymentStatus),
         )
     }
 
@@ -50,6 +52,8 @@ class BillingPaymentRepository(
 
         val productDetailsResult = billingRepository.queryProducts(listOf(productId.value))
 
+        Log.d("LOLZ", "responseCode=${productDetailsResult.responseCode()}")
+        Log.d("LOLZ", "error", productDetailsResult.toBillingException())
         val productDetails =
             when (productDetailsResult.responseCode()) {
                 BillingResponseCode.OK -> {
@@ -63,8 +67,8 @@ class BillingPaymentRepository(
                     emit(
                         PurchaseResult.Error.FetchProductsError(
                             productId,
-                            productDetailsResult.toBillingException()
-                        )
+                            productDetailsResult.toBillingException(),
+                        ),
                     )
                     return@flow
                 }
@@ -79,23 +83,23 @@ class BillingPaymentRepository(
                         emit(PurchaseResult.Error.TransactionIdError(productId, null))
                         return@flow
                     },
-                    { it }
+                    { it.value },
                 )
 
         val result =
             billingRepository.startPurchaseFlow(
                 productDetails = productDetails,
                 obfuscatedId = obfuscatedId,
-                activityProvider = activityProvider
+                activityProvider = activityProvider,
             )
 
         if (result.responseCode == BillingResponseCode.OK) {
             emit(PurchaseResult.BillingFlowStarted)
         } else {
             emit(
                 PurchaseResult.Error.BillingError(
-                    BillingException(result.responseCode, result.debugMessage)
-                )
+                    BillingException(result.responseCode, result.debugMessage),
+                ),
             )
             return@flow
         }
@@ -118,8 +122,8 @@ class BillingPaymentRepository(
                         verifyPurchase(event.purchases.first())
                             .fold(
                                 { PurchaseResult.Error.VerificationError(null) },
-                                { PurchaseResult.Completed.Success }
-                            )
+                                { PurchaseResult.Completed.Success },
+                            ),
                     )
                 }
             }
@@ -140,8 +144,8 @@ class BillingPaymentRepository(
                         verifyPurchase(purchases.first())
                             .fold(
                                 { VerificationResult.Error.VerificationError(null) },
-                                { VerificationResult.Success }
-                            )
+                                { VerificationResult.Success },
+                            ),
                     )
                 } else {
                     emit(VerificationResult.NothingToVerify)
@@ -158,7 +162,7 @@ class BillingPaymentRepository(
         playPurchaseRepository.verifyPlayPurchase(
             PlayPurchase(
                 productId = purchase.products.first(),
-                purchaseToken = purchase.purchaseToken,
-            )
+                purchaseToken = PlayPurchasePaymentToken(purchase.purchaseToken),
+            ),
         )
 }

android/lib/billing/src/main/kotlin/net/mullvad/mullvadvpn/lib/billing/BillingRepository.kt

@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.lib.billing
 
 import android.app.Activity
 import android.content.Context
+import android.util.Log
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClient.BillingResponseCode
 import com.android.billingclient.api.BillingClientStateListener
@@ -155,6 +156,7 @@ class BillingRepository(context: Context) {
     private suspend fun queryProductDetails(productIds: List<String>): ProductDetailsResult {
         return try {
             ensureConnected()
+            Log.d("LOLZ", "ensureConnected")
 
             val productList =
                 productIds.map { productId ->
@@ -166,10 +168,13 @@ class BillingRepository(context: Context) {
             val params = QueryProductDetailsParams.newBuilder()
             params.setProductList(productList)
 
+            Log.d("LOLZ", "params=" + params.build())
             billingClient.queryProductDetails(params.build())
         } catch (billingException: BillingException) {
+            Log.d("LOLZ", "Exception", billingException)
             ProductDetailsResult(billingException.toBillingResult(), null)
         } catch (t: Throwable) {
+            Log.d("LOLZ", "Exception lolz", t)
             ProductDetailsResult(
                 BillingResult.newBuilder().setResponseCode(BillingResponseCode.ERROR).build(),
                 null