From 39cb1d343e362e0bfd51ab001ce4b2facc6c3191 Mon Sep 17 00:00:00 2001
From: Toni Rico <antonio.rico.diez@revenuecat.com>
Date: Tue, 13 Aug 2024 10:55:47 +0200
Subject: [PATCH] Remove embedding v1 support

---
 .../PurchasesFlutterPlugin.java               | 50 +++----------------
 1 file changed, 8 insertions(+), 42 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
index 270e29b94..57cdb468e 100644
--- a/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java
+++ b/android/src/main/java/com/revenuecat/purchases_flutter/PurchasesFlutterPlugin.java
@@ -11,7 +11,6 @@
 
 import com.revenuecat.purchases.DangerousSettings;
 import com.revenuecat.purchases.Purchases;
-import com.revenuecat.purchases.PurchasesAreCompletedBy;
 import com.revenuecat.purchases.PurchasesErrorCode;
 import com.revenuecat.purchases.Store;
 import com.revenuecat.purchases.common.PlatformInfo;
@@ -51,11 +50,6 @@ public class PurchasesFlutterPlugin implements FlutterPlugin, MethodCallHandler,
     private static final String CUSTOMER_INFO_UPDATED = "Purchases-CustomerInfoUpdated";
     protected static final String LOG_HANDLER_EVENT = "Purchases-LogHandlerEvent";
 
-    // Only set registrar for v1 embedder.
-    @SuppressWarnings("deprecation")
-    private io.flutter.plugin.common.PluginRegistry.Registrar registrar;
-    // Only set activity for v2 embedder. Always access activity from getActivity()
-    // method.
     @Nullable
     private Context applicationContext;
     @Nullable
@@ -68,27 +62,6 @@ public class PurchasesFlutterPlugin implements FlutterPlugin, MethodCallHandler,
     private static final String PLATFORM_NAME = "flutter";
     private static final String PLUGIN_VERSION = "7.0.2";
 
-    /**
-     * Plugin registration.
-     */
-    @SuppressWarnings("deprecation")
-    public static void registerWith(io.flutter.plugin.common.PluginRegistry.Registrar registrar) {
-        PurchasesFlutterPlugin instance = new PurchasesFlutterPlugin();
-        instance.onAttachedToEngine(registrar.messenger(), registrar.context());
-        instance.registrar = registrar;
-        registrar.addViewDestroyListener(new io.flutter.plugin.common.PluginRegistry.ViewDestroyListener() {
-            @Override
-            public boolean onViewDestroy(io.flutter.view.FlutterNativeView flutterNativeView) {
-                try {
-                    Purchases.getSharedInstance().close();
-                } catch (UninitializedPropertyAccessException e) {
-                    // there's no instance so all good
-                }
-                return false;
-            }
-        });
-    }
-
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
         onAttachedToEngine(binding.getBinaryMessenger(), binding.getApplicationContext());
@@ -129,10 +102,6 @@ public void onDetachedFromActivityForConfigChanges() {
         onDetachedFromActivity();
     }
 
-    public Activity getActivity() {
-        return registrar != null ? registrar.activity() : activity;
-    }
-
     @Override
     public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
         switch (call.method) {
@@ -219,7 +188,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
                 setDebugLogsEnabled(enabled, result);
                 break;
             case "setLogLevel":
-                String level = (String) call.argument("level");
+                String level = call.argument("level");
                 setLogLevel(level, result);
                 break;
             case "setProxyURLString":
@@ -232,10 +201,6 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
             case "syncPurchases":
                 syncPurchases(result);
                 break;
-            case "enableAdServicesAttributionTokenCollection":
-                // NOOP
-                result.success(null);
-                break;
             case "isAnonymous":
                 isAnonymous(result);
                 break;
@@ -256,6 +221,7 @@ public void onMethodCall(@NonNull MethodCall call, @NonNull Result result) {
             case "beginRefundRequestForProduct":
             case "beginRefundRequestForEntitlement":
             case "recordPurchaseForProductID":
+            case "enableAdServicesAttributionTokenCollection":
                 // NOOP
                 result.success(null);
                 break;
@@ -457,7 +423,7 @@ private void purchaseProduct(final String productIdentifier,
             @Nullable final Map<String, Object> presentedOfferingContext,
             final Result result) {
         CommonKt.purchaseProduct(
-                getActivity(),
+                activity,
                 productIdentifier,
                 type,
                 null,
@@ -475,7 +441,7 @@ private void purchasePackage(final String packageIdentifier,
             @Nullable final Boolean googleIsPersonalizedPrice,
             final Result result) {
         CommonKt.purchasePackage(
-                getActivity(),
+                activity,
                 packageIdentifier,
                 presentedOfferingContext,
                 googleOldProductId,
@@ -492,7 +458,7 @@ private void purchaseSubscriptionOption(final String productIdentifier,
             @Nullable final Map<String, Object> presentedOfferingContext,
             final Result result) {
         CommonKt.purchaseSubscriptionOption(
-                getActivity(),
+                activity,
                 productIdentifier,
                 optionIdentifier,
                 googleOldProductId,
@@ -744,12 +710,12 @@ private void runOnUiThread(Runnable runnable) {
     private OnResult getOnResult(final Result result) {
         return new OnResult() {
             @Override
-            public void onReceived(Map<String, ?> map) {
+            public void onReceived(@NotNull Map<String, ?> map) {
                 result.success(map);
             }
 
             @Override
-            public void onError(ErrorContainer errorContainer) {
+            public void onError(@NotNull ErrorContainer errorContainer) {
                 reject(errorContainer, result);
             }
         };
@@ -764,7 +730,7 @@ public void onReceived(@Nullable Map<String, ?> map) {
             }
 
             @Override
-            public void onError(ErrorContainer errorContainer) {
+            public void onError(@NotNull ErrorContainer errorContainer) {
                 reject(errorContainer, result);
             }
         };