Added ObfuscatedAccountId

mysteriumnetwork · May 29, 2022 · 6147514 · 6147514
1 parent d9c7dda
commit 6147514
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/android/app/src/main/java/updated/mysterium/vpn/core/NodeRepository.kt b/android/app/src/main/java/updated/mysterium/vpn/core/NodeRepository.kt
@@ -137,7 +137,9 @@ class NodeRepository(var deferredNode: DeferredNode) {
     suspend fun createPaymentGatewayOrder(req: CreatePaymentGatewayOrderReq) =
         withContext(Dispatchers.IO) {
             try {
-                deferredNode.await().createPaymentGatewayOrder(req)
+                val order = deferredNode.await().createPaymentGatewayOrder(req).decodeToString()
+                Log.d(TAG, "createPaymentOrder response: $order")
+                Order.fromJSON(order) ?: error("Could not parse JSON: $order")
             } catch (e: Exception) {
                 if (isBalanceLimitExceeded()) {
                     throw TopupPreconditionFailedException(

diff --git a/android/app/src/main/java/updated/mysterium/vpn/model/payment/Order.kt b/android/app/src/main/java/updated/mysterium/vpn/model/payment/Order.kt
@@ -6,7 +6,7 @@ import com.google.gson.reflect.TypeToken
 
 data class Order constructor(
     @SerializedName("id")
-    val id: Long,
+    val id: String,
     @SerializedName("identity_address")
     val identity: String,
     @SerializedName("status")

diff --git a/android/app/src/main/java/updated/mysterium/vpn/model/top/up/TopUpPriceCardItem.kt b/android/app/src/main/java/updated/mysterium/vpn/model/top/up/TopUpPriceCardItem.kt
@@ -5,6 +5,7 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class TopUpPriceCardItem(
+    val id: String,
     val sku: String,
     val price: Double,
     var isSelected: Boolean = false

diff --git a/android/app/src/main/java/updated/mysterium/vpn/network/usecase/PaymentUseCase.kt b/android/app/src/main/java/updated/mysterium/vpn/network/usecase/PaymentUseCase.kt
@@ -31,15 +31,15 @@ class PaymentUseCase(private val nodeRepository: NodeRepository) {
     suspend fun createPaymentGatewayOrder(
         identityAddress: String,
         amountUSD: Double
-    ) {
+    ): Order {
         val req = CreatePaymentGatewayOrderReq().apply {
             this.payCurrency = currency
             this.identityAddress = identityAddress
             this.mystAmount = "0"
             this.amountUSD = amountUSD.toString()
             this.gateway = Gateway.GOOGLE.gateway
         }
-        nodeRepository.createPaymentGatewayOrder(req)
+        return nodeRepository.createPaymentGatewayOrder(req)
     }
 
     suspend fun paymentOrderCallback(

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/TopUpPaymentViewModel.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/TopUpPaymentViewModel.kt
@@ -85,6 +85,7 @@ class TopUpPaymentViewModel(
         return list.map { skuDetails ->
             val price = skuDetails.description.filter { it in filterRange }.toDouble()
             TopUpPriceCardItem(
+                id = "",
                 sku = skuDetails.sku,
                 price = price,
                 isSelected = list.indexOf(skuDetails) == 0

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/summary/BillingDataSource.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/summary/BillingDataSource.kt
@@ -8,6 +8,7 @@ import android.os.SystemClock
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import com.android.billingclient.api.*
+import com.android.billingclient.api.Purchase
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
@@ -304,11 +305,13 @@ class BillingDataSource(application: Application) : PurchasesUpdatedListener,
         }
     }
 
-    fun launchBillingFlow(activity: Activity, sku: String) {
+    fun launchBillingFlow(activity: Activity, sku: String, id: String) {
         val skuDetails = skuDetailsMap[sku]?.value
         if (null != skuDetails) {
             val billingFlowParamsBuilder = BillingFlowParams.newBuilder()
-            billingFlowParamsBuilder.setSkuDetails(skuDetails)
+            billingFlowParamsBuilder
+                .setObfuscatedAccountId(id)
+                .setSkuDetails(skuDetails)
             defaultScope.launch {
                 val br = billingClient.launchBillingFlow(
                     activity,

diff --git a/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/summary/PaymentSummaryActivity.kt b/android/app/src/main/java/updated/mysterium/vpn/ui/top/up/summary/PaymentSummaryActivity.kt
@@ -79,6 +79,7 @@ class PaymentSummaryActivity : BaseActivity() {
 
         paymentStatusViewModel.getPayment(price).observe(this) {
             it.onSuccess {
+                topUpPriceCardItem = topUpPriceCardItem?.copy(id = it.id)
                 inflateOrderData(price)
             }
             it.onFailure { error ->
@@ -113,7 +114,8 @@ class PaymentSummaryActivity : BaseActivity() {
         topUpPriceCardItem?.let {
             paymentViewModel.billingDataSource.launchBillingFlow(
                 this@PaymentSummaryActivity,
-                it.sku
+                it.sku,
+                it.id
             )
         }
     }