Merge branch 'master' of github.com:OneSignal/OneSignal-Flutter-SDK

Author: mikechoch

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.onesignal.flutter'
-version '2.0.2'
+version '2.1.0'
 
 buildscript {
     repositories {
@@ -34,7 +34,7 @@ android {
 }
 
 dependencies {
-    compile('com.onesignal:OneSignal:3.11.2')
+    compile('com.onesignal:OneSignal:3.11.4')
 }
 
 // Adds required manifestPlaceholders keys to allow mainifest merge gradle step to complete

android/src/main/java/com/onesignal/flutter/FlutterRegistrarResponder.java

@@ -8,15 +8,15 @@
 import io.flutter.plugin.common.PluginRegistry;
 
 abstract class FlutterRegistrarResponder {
-   protected MethodChannel channel;
-   protected PluginRegistry.Registrar flutterRegistrar;
+   MethodChannel channel;
+   PluginRegistry.Registrar flutterRegistrar;
 
    /**
     * MethodChannel class is home to success() method used by Result class
     * It has the @UiThread annotation and must be run on UI thread, otherwise a RuntimeException will be thrown
     * This will communicate success back to Dart
     */
-   protected void replySuccess(final MethodChannel.Result reply, final Object response) {
+   void replySuccess(final MethodChannel.Result reply, final Object response) {
       runOnMainThread(new Runnable() {
          @Override
          public void run() {
@@ -30,7 +30,7 @@ public void run() {
     * It has the @UiThread annotation and must be run on UI thread, otherwise a RuntimeException will be thrown
     * This will communicate error back to Dart
     */
-   protected void replyError(final MethodChannel.Result reply, final String tag, final String message, final Object response) {
+   void replyError(final MethodChannel.Result reply, final String tag, final String message, final Object response) {
       runOnMainThread(new Runnable() {
          @Override
          public void run() {
@@ -44,7 +44,7 @@ public void run() {
     * It has the @UiThread annotation and must be run on UI thread, otherwise a RuntimeException will be thrown
     * This will communicate not implemented back to Dart
     */
-   protected void replyNotImplemented(final MethodChannel.Result reply) {
+   void replyNotImplemented(final MethodChannel.Result reply) {
       runOnMainThread(new Runnable() {
          @Override
          public void run() {
@@ -53,11 +53,11 @@ public void run() {
       });
    }
 
-   protected void runOnMainThread(final Runnable runnable) {
-      ((Activity)flutterRegistrar.activeContext()).runOnUiThread(runnable);
+   private void runOnMainThread(final Runnable runnable) {
+      ((Activity) flutterRegistrar.activeContext()).runOnUiThread(runnable);
    }
 
-   protected void invokeMethodOnUiThread(final String methodName, final HashMap map) {
+   void invokeMethodOnUiThread(final String methodName, final HashMap map) {
       final MethodChannel channel = this.channel;
       runOnMainThread(new Runnable() {
          @Override

android/src/main/java/com/onesignal/flutter/OneSignalInAppMessagingController.java

@@ -0,0 +1,73 @@
+package com.onesignal.flutter;
+
+import com.onesignal.OneSignal;
+
+import java.util.Collection;
+import java.util.Map;
+
+import io.flutter.plugin.common.MethodCall;
+import io.flutter.plugin.common.MethodChannel;
+import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
+import io.flutter.plugin.common.MethodChannel.Result;
+import io.flutter.plugin.common.PluginRegistry.Registrar;
+
+public class OneSignalInAppMessagingController extends FlutterRegistrarResponder implements MethodCallHandler {
+    private MethodChannel channel;
+
+    static void registerWith(Registrar registrar) {
+        OneSignalInAppMessagingController controller = new OneSignalInAppMessagingController();
+        controller.channel = new MethodChannel(registrar.messenger(), "OneSignal#inAppMessages");
+        controller.channel.setMethodCallHandler(controller);
+        controller.flutterRegistrar = registrar;
+    }
+
+    @Override
+    public void onMethodCall(MethodCall call, Result result) {
+        if (call.method.contentEquals("OneSignal#addTrigger"))
+            this.addTriggers(call, result);
+        else if (call.method.contentEquals("OneSignal#addTriggers"))
+            this.addTriggers(call, result);
+        else if (call.method.contentEquals("OneSignal#removeTriggerForKey"))
+            this.removeTriggerForKey(call, result);
+        else if (call.method.contentEquals("OneSignal#removeTriggersForKeys"))
+            this.removeTriggersForKeys(call, result);
+        else if (call.method.contentEquals("OneSignal#getTriggerValueForKey"))
+            replySuccess(result, OneSignal.getTriggerValueForKey((String) call.arguments));
+        else if (call.method.contentEquals("OneSignal#pauseInAppMessages"))
+            this.pauseInAppMessages(call, result);
+        else
+            replyNotImplemented(result);
+    }
+
+    private void addTriggers(MethodCall call, Result result) {
+        // call.arguments is being casted to a Map<String, Object> so a try-catch with
+        //  a ClassCastException will be thrown
+        try {
+            OneSignal.addTriggers((Map<String, Object>) call.arguments);
+            replySuccess(result, null);
+        } catch (ClassCastException e) {
+            replyError(result, "OneSignal", "Add triggers failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
+        }
+    }
+
+    private void removeTriggerForKey(MethodCall call, Result result) {
+        OneSignal.removeTriggerForKey((String) call.arguments);
+        replySuccess(result, null);
+    }
+
+    private void removeTriggersForKeys(MethodCall call, Result result) {
+        // call.arguments is being casted to a Collection<String> a try-catch with
+        //  a ClassCastException will be thrown
+        try {
+            OneSignal.removeTriggersForKeys((Collection<String>) call.arguments);
+            replySuccess(result, null);
+        } catch (ClassCastException e) {
+            replyError(result, "OneSignal", "Remove triggers for keys failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
+        }
+    }
+
+    private void pauseInAppMessages(MethodCall call, Result result) {
+        OneSignal.pauseInAppMessages((boolean) call.arguments);
+        replySuccess(result, null);
+    }
+}