From c6dd40c14319298948f3694a67935a59c832b39e Mon Sep 17 00:00:00 2001
From: Arsentiy Milchakov <milcars@mapswithme.com>
Date: Tue, 14 Jul 2020 19:13:56 +0300
Subject: [PATCH] [purchase] trial validation flag dummy. review fixes

---
 android/jni/com/mapswithme/maps/Framework.cpp       | 10 +++++-----
 .../maps/PurchaseOperationObservable.java           | 13 ++++++++++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index c02645d7d0..fe8ed49a42 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -941,18 +941,18 @@ void CallSetRoutingLoadPointsListener(shared_ptr<jobject> listener, bool success
 RoutingManager::LoadRouteHandler g_loadRouteHandler;
 
 void CallPurchaseValidationListener(shared_ptr<jobject> listener, Purchase::ValidationCode code,
-                                    Purchase::ValidationResponse const & validationResponce)
+                                    Purchase::ValidationResponse const & validationResponse)
 {
   JNIEnv * env = jni::GetEnv();
   jmethodID const methodId = jni::GetMethodID(env, *listener, "onValidatePurchase",
     "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Z)V");
 
-  jni::TScopedLocalRef const serverId(env, jni::ToJavaString(env, validationResponce.m_info.m_serverId));
-  jni::TScopedLocalRef const vendorId(env, jni::ToJavaString(env, validationResponce.m_info.m_vendorId));
-  jni::TScopedLocalRef const receiptData(env, jni::ToJavaString(env, validationResponce.m_info.m_receiptData));
+  jni::TScopedLocalRef const serverId(env, jni::ToJavaString(env, validationResponse.m_info.m_serverId));
+  jni::TScopedLocalRef const vendorId(env, jni::ToJavaString(env, validationResponse.m_info.m_vendorId));
+  jni::TScopedLocalRef const receiptData(env, jni::ToJavaString(env, validationResponse.m_info.m_receiptData));
 
   env->CallVoidMethod(*listener, methodId, static_cast<jint>(code), serverId.get(), vendorId.get(),
-                      receiptData.get(), static_cast<jboolean>(validationResponce.m_isTrial));
+                      receiptData.get(), static_cast<jboolean>(validationResponse.m_isTrial));
 }
 
 void CallStartPurchaseTransactionListener(shared_ptr<jobject> listener, bool success,
diff --git a/android/src/com/mapswithme/maps/PurchaseOperationObservable.java b/android/src/com/mapswithme/maps/PurchaseOperationObservable.java
index c6c1f26d6b..816f3b2be6 100644
--- a/android/src/com/mapswithme/maps/PurchaseOperationObservable.java
+++ b/android/src/com/mapswithme/maps/PurchaseOperationObservable.java
@@ -71,7 +71,7 @@ public class PurchaseOperationObservable implements Framework.PurchaseValidation
     ValidationStatus status = ValidationStatus.values()[code];
     if (observer == null)
     {
-      PendingResult result = new PendingResult(status, serverId, vendorId, purchaseData);
+      PendingResult result = new PendingResult(status, serverId, vendorId, purchaseData, isTrial);
       mValidationPendingResults.put(orderId, result);
       return;
     }
@@ -98,7 +98,7 @@ public class PurchaseOperationObservable implements Framework.PurchaseValidation
       mLogger.d(TAG, "Post pending validation result to '" + observer + "' for '"
                      + orderId + "'");
       observer.onValidatePurchase(result.getStatus(), result.getServerId(), result.getVendorId(),
-                                  result.getPurchaseData(), true /* Dummy */);
+                                  result.getPurchaseData(), result.isTrial());
     }
   }
 
@@ -130,14 +130,16 @@ public class PurchaseOperationObservable implements Framework.PurchaseValidation
     private final String mVendorId;
     @NonNull
     private final String mPurchaseData;
+    private final boolean mIsTrial;
 
     private PendingResult(@NonNull ValidationStatus status, @NonNull String serverId,
-                          @NonNull String vendorId, @NonNull String purchaseData)
+                          @NonNull String vendorId, @NonNull String purchaseData, boolean isTrial)
     {
       mStatus = status;
       mServerId = serverId;
       mVendorId = vendorId;
       mPurchaseData = purchaseData;
+      mIsTrial = isTrial;
     }
 
     @NonNull
@@ -163,5 +165,10 @@ public class PurchaseOperationObservable implements Framework.PurchaseValidation
     {
       return mPurchaseData;
     }
+
+    boolean isTrial()
+    {
+      return mIsTrial;
+    }
   }
 }