Android plugin API updated to support v2 Embedding while remaining compatible with apps that don’t use the v2 Android embedding.

Author: luis901101

.gitignore

@@ -6,5 +6,12 @@
 pubspec.lock
 
 build/
-.idea/
-android/.idea
+android/.idea
+.flutter-plugins-dependencies
+flutter_export_environment.sh
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/

.idea/libraries/Dart_SDK.xml

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 

.idea/libraries/Flutter_for_Android.xml

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

.idea/modules.xml

@@ -1,18 +1,21 @@
 package com.onesignal.flutter;
 
+import android.content.Context;
 import android.os.Handler;
 import android.os.Looper;
 
 import com.onesignal.OneSignal;
 
 import java.util.HashMap;
 
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry;
 
 abstract class FlutterRegistrarResponder {
+   Context context;
    MethodChannel channel;
-   PluginRegistry.Registrar flutterRegistrar;
+   BinaryMessenger messenger;
 
    /**
     * MethodChannel class is home to success() method used by Result class

.idea/runConfigurations/example_lib_main_dart.xml

@@ -5,6 +5,7 @@
 import java.util.Collection;
 import java.util.Map;
 
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -14,11 +15,11 @@
 public class OneSignalInAppMessagingController extends FlutterRegistrarResponder implements MethodCallHandler {
     private MethodChannel channel;
 
-    static void registerWith(Registrar registrar) {
+    static void registerWith(BinaryMessenger messenger) {
         OneSignalInAppMessagingController controller = new OneSignalInAppMessagingController();
-        controller.channel = new MethodChannel(registrar.messenger(), "OneSignal#inAppMessages");
+        controller.messenger = messenger;
+        controller.channel = new MethodChannel(messenger, "OneSignal#inAppMessages");
         controller.channel.setMethodCallHandler(controller);
-        controller.flutterRegistrar = registrar;
     }
 
     @Override

.idea/workspace.xml

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
@@ -21,8 +22,8 @@ class OSFlutterOutcomeEventsHandler extends FlutterRegistrarResponder implements
     // this property guarantees the callback will never be called more than once.
     private AtomicBoolean replySubmitted = new AtomicBoolean(false);
 
-    OSFlutterOutcomeEventsHandler(PluginRegistry.Registrar flutterRegistrar, MethodChannel channel, Result result) {
-        this.flutterRegistrar = flutterRegistrar;
+    OSFlutterOutcomeEventsHandler(BinaryMessenger messenger, MethodChannel channel, Result result) {
+        this.messenger = messenger;
         this.channel = channel;
         this.result = result;
     }
@@ -42,14 +43,12 @@ public void onSuccess(OSOutcomeEvent outcomeEvent) {
 
 public class OneSignalOutcomeEventsController extends FlutterRegistrarResponder implements MethodCallHandler {
     private MethodChannel channel;
-    private Registrar registrar;
 
-    static void registerWith(Registrar registrar) {
+    static void registerWith(BinaryMessenger messenger) {
         OneSignalOutcomeEventsController controller = new OneSignalOutcomeEventsController();
-        controller.registrar = registrar;
-        controller.channel = new MethodChannel(registrar.messenger(), "OneSignal#outcomes");
+        controller.messenger = messenger;
+        controller.channel = new MethodChannel(messenger, "OneSignal#outcomes");
         controller.channel.setMethodCallHandler(controller);
-        controller.flutterRegistrar = registrar;
     }
 
     @Override
@@ -72,7 +71,7 @@ private void sendOutcome(MethodCall call, Result result) {
             return;
         }
 
-        OneSignal.sendOutcome(name, new OSFlutterOutcomeEventsHandler(registrar, channel, result));
+        OneSignal.sendOutcome(name, new OSFlutterOutcomeEventsHandler(messenger, channel, result));
     }
 
     private void sendUniqueOutcome(MethodCall call, Result result) {
@@ -83,7 +82,7 @@ private void sendUniqueOutcome(MethodCall call, Result result) {
             return;
         }
 
-        OneSignal.sendUniqueOutcome(name, new OSFlutterOutcomeEventsHandler(registrar, channel, result));
+        OneSignal.sendUniqueOutcome(name, new OSFlutterOutcomeEventsHandler(messenger, channel, result));
     }
 
     private void sendOutcomeWithValue(MethodCall call, Result result) {
@@ -100,7 +99,7 @@ private void sendOutcomeWithValue(MethodCall call, Result result) {
             return;
         }
 
-        OneSignal.sendOutcomeWithValue(name, value.floatValue(), new OSFlutterOutcomeEventsHandler(registrar, channel, result));
+        OneSignal.sendOutcomeWithValue(name, value.floatValue(), new OSFlutterOutcomeEventsHandler(messenger, channel, result));
     }
 
 }