Add play checkout page

getlantern · Nov 17, 2023 · c73de2c · c73de2c
1 parent 2526084
commit c73de2c
Show file tree

Hide file tree

Showing 6 changed files with 1,056 additions and 1,010 deletions.
diff --git a/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt b/android/app/src/main/kotlin/io/lantern/model/SessionModel.kt
@@ -153,6 +153,7 @@ class SessionModel(
             )
 
             "submitGooglePlayPayment" -> paymentsUtil.submitGooglePlayPayment(
+                call.argument("email")!!,
                 call.argument("planID")!!,
                 result,
             )

diff --git a/android/app/src/main/kotlin/org/getlantern/lantern/util/PaymentsUtil.kt b/android/app/src/main/kotlin/org/getlantern/lantern/util/PaymentsUtil.kt
@@ -130,7 +130,7 @@ class PaymentsUtil(private val activity: Activity) {
     }
 
     // Handles Google Play transactions
-    fun submitGooglePlayPayment(planID: String, methodCallResult: MethodChannel.Result) {
+    fun submitGooglePlayPayment(email: String, planID: String, methodCallResult: MethodChannel.Result) {
         val inAppBilling = LanternApp.getInAppBilling()
 
         if (inAppBilling == null) {
@@ -179,7 +179,7 @@ class PaymentsUtil(private val activity: Activity) {
 
                     sendPurchaseRequest(
                         planID,
-                        "",
+                        email,
                         tokens[0],
                         PaymentProvider.GooglePlay,
                         methodCallResult,

diff --git a/lib/common/session_model.dart b/lib/common/session_model.dart
@@ -370,9 +370,13 @@ class SessionModel extends Model {
     }).then((value) => value as String);
   }
 
-  Future<void> submitGooglePlay(String planID) async {
+  Future<void> submitPlayPayment(
+    String planID,
+    String email,
+  ) async {
     return methodChannel
         .invokeMethod('submitGooglePlayPayment', <String, dynamic>{
+      'email': email,
       'planID': planID,
     }).then((value) => value as String);
   }

diff --git a/lib/core/router/router.dart b/lib/core/router/router.dart
@@ -133,6 +133,12 @@ class AppRouter extends $AppRouter {
         transitionsBuilder: defaultTransition,
         durationInMilliseconds: defaultTransitionMillis,
         reverseDurationInMilliseconds: defaultTransitionMillis),
+    CustomRoute(
+        page: PlayCheckout.page,
+        path: '/playcheckout',
+        transitionsBuilder: defaultTransition,
+        durationInMilliseconds: defaultTransitionMillis,
+        reverseDurationInMilliseconds: defaultTransitionMillis),
     CustomRoute(
         page: Checkout.page,
         path: '/checkout',
-Original file line number
+Diff line change
@@ Expand Up / @@ -153,6 +153,7 @@ class SessionModel( @@
                 )
                 "submitGooglePlayPayment" -> paymentsUtil.submitGooglePlayPayment(
+                    call.argument("email")!!,
                     call.argument("planID")!!,
                     result,
                 )
@@ Expand Down @@