removes call to close in onDetachedToEngine and creates new close fun… (

#268)
RevenueCat · Oct 28, 2021 · e737eaf · e737eaf
1 parent 255ef75
commit e737eaf
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java b/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java
@@ -88,11 +88,6 @@ private void onAttachedToEngine(BinaryMessenger messenger, Context applicationCo
 
     @Override
     public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
-        try {
-            Purchases.getSharedInstance().close();
-        } catch (UninitializedPropertyAccessException e) {
-            // there's no instance so all good
-        }
         if (channel != null) {
             channel.setMethodCallHandler(null);
         }
@@ -299,6 +294,9 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                 List<Integer> features = call.argument("features");
                 canMakePayments(features, result);
                 break;
+            case "close":
+                close(result);
+                break;
             default:
                 result.notImplemented();
                 break;
@@ -576,6 +574,15 @@ public void onError(@Nullable ErrorContainer errorContainer) {
                 });
     }
 
+    private void close(final Result result) {
+        try {
+            Purchases.getSharedInstance().close();
+        } catch (UninitializedPropertyAccessException e) {
+            // there's no instance so all good
+        }
+        result.success(null);
+    }
+
     @NotNull
     private OnResult getOnResult(final Result result) {
         return new OnResult() {

diff --git a/ios/Classes/PurchasesFlutterPlugin.m b/ios/Classes/PurchasesFlutterPlugin.m
@@ -165,6 +165,8 @@ - (void)handleMethodCall:(FlutterMethodCall *)call
         [self paymentDiscountForProductIdentifier:productIdentifier
                                discountIdentifier:discountIdentifier
                                            result:result];
+    } else if ([@"close" isEqualToString:call.method]) {
+        [self closeWithResult:result];
     } else {
         result(FlutterMethodNotImplemented);
     }
@@ -455,6 +457,10 @@ - (void)paymentDiscountForProductIdentifier:(NSString *)productIdentifier
                                                }];
 }
 
+- (void)closeWithResult:(FlutterResult)result {
+    result(nil);
+}
+
 #pragma mark -
 #pragma mark Delegate Methods
 

diff --git a/lib/purchases_flutter.dart b/lib/purchases_flutter.dart
@@ -589,6 +589,12 @@ class Purchases {
     });
     return PaymentDiscount.fromJson(result);
   }
+
+  /// Android only. Call close when you are done with this instance of Purchases to disconnect
+  /// from the billing services and clean up resources
+  static Future<void> close() async {
+    await _channel.invokeMethod('close');
+  }
 }
 
 /// This class holds the information used when upgrading from another sku.