Merge pull request #176 from OneSignal/release_2.2.1

Updated for release for 2.3.0

Author: mikechoch

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.onesignal.flutter'
-version '2.2.0'
+version '2.3.0'
 
 buildscript {
     repositories {
@@ -34,7 +34,7 @@ android {
 }
 
 dependencies {
-    api 'com.onesignal:OneSignal:3.12.2'
+    api 'com.onesignal:OneSignal:3.12.3'
 }
 
 // Adds required manifestPlaceholders keys to allow mainifest merge gradle step to complete

example/lib/main.dart

@@ -275,22 +275,19 @@ class _MyAppState extends State<MyApp> {
     // Send a normal outcome and get a reply with the name of the outcome
     OneSignal.shared.sendOutcome("normal_1");
     OneSignal.shared.sendOutcome("normal_2").then((outcomeEvent) {
-        var json = outcomeEvent.jsonRepresentation();
-        print("Successfully sent outcome event: $json");
+      print(outcomeEvent.jsonRepresentation());
     });
 
     // Send a unique outcome and get a reply with the name of the outcome
     OneSignal.shared.sendUniqueOutcome("unique_1");
     OneSignal.shared.sendUniqueOutcome("unique_2").then((outcomeEvent) {
-        var json = outcomeEvent.jsonRepresentation();
-        print("Successfully sent unique outcome event: $json");
+      print(outcomeEvent.jsonRepresentation());
     });
 
     // Send an outcome with a value and get a reply with the name of the outcome
     OneSignal.shared.sendOutcomeWithValue("value_1", 3.2);
     OneSignal.shared.sendOutcomeWithValue("value_2", 3.9).then((outcomeEvent) {
-        var json = outcomeEvent.jsonRepresentation();
-        print("Successfully sent outcome event with value: $json");
+      print(outcomeEvent.jsonRepresentation());
     });
   }
 

ios/Classes/OneSignalPlugin.m

@@ -26,10 +26,10 @@
  */
 
 #import "OneSignalPlugin.h"
-#import "OneSignalCategories.h"
-#import "OneSignalTagsController.h"
-#import "OneSignalInAppMessagesController.h"
-#import "OneSignalOutcomeEventsController.h"
+#import "OSFlutterCategories.h"
+#import "OSFlutterTagsController.h"
+#import "OSFlutterInAppMessagesController.h"
+#import "OSFlutterOutcomeEventsController.h"
 
 @interface OneSignalPlugin ()
 
@@ -94,9 +94,9 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 
     [registrar addMethodCallDelegate:OneSignalPlugin.sharedInstance channel:OneSignalPlugin.sharedInstance.channel];
 
-    [OneSignalTagsController registerWithRegistrar:registrar];
-    [OneSignalInAppMessagesController registerWithRegistrar:registrar];
-    [OneSignalOutcomeEventsController registerWithRegistrar:registrar];
+    [OSFlutterTagsController registerWithRegistrar:registrar];
+    [OSFlutterInAppMessagesController registerWithRegistrar:registrar];
+    [OSFlutterOutcomeEventsController registerWithRegistrar:registrar];
 }
 
 - (void)addObservers {

ios/onesignal_flutter.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'onesignal_flutter'
-  s.version          = '2.2.0'
+  s.version          = '2.3.0'
   s.summary          = 'The OneSignal Flutter SDK'
   s.description      = 'Allows you to easily add OneSignal to your flutter projects, to make sending and handling push notifications easy'
   s.homepage         = 'https://www.onesignal.com'
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
   s.source_files = 'Classes/**/*'
   s.public_header_files = 'Classes/**/*.h'
   s.dependency 'Flutter'
-  s.dependency 'OneSignal', '2.11.2'
+  s.dependency 'OneSignal', '2.12.1'
   s.ios.deployment_target = '8.0'
   s.static_framework = true
 end

lib/onesignal_flutter.dart

@@ -321,22 +321,34 @@ class OneSignal {
   /// Send a normal outcome event for the current session and notifications with the attribution window
   /// Counted each time sent successfully, failed ones will be cached and reattempted in future
   Future<OSOutcomeEvent> sendOutcome(String name) async {
-      Map<dynamic, dynamic> json = await _outcomesChannel.invokeMethod("OneSignal#sendOutcome", name);
-      return new OSOutcomeEvent(json.cast<String, dynamic>());
+    var json = await _outcomesChannel.invokeMethod("OneSignal#sendOutcome", name);
+
+    if (json == null)
+      return new OSOutcomeEvent();
+
+    return new OSOutcomeEvent.fromMap(json.cast<String, dynamic>());
   }
 
   /// Send a unique outcome event for the current session and notifications with the attribution window
   /// Counted once per notification when sent successfully, failed ones will be cached and reattempted in future
   Future<OSOutcomeEvent> sendUniqueOutcome(String name) async {
-      Map<dynamic, dynamic> json = await _outcomesChannel.invokeMethod("OneSignal#sendUniqueOutcome", name);
-      return new OSOutcomeEvent(json.cast<String, dynamic>());
+    var json = await _outcomesChannel.invokeMethod("OneSignal#sendUniqueOutcome", name);
+
+    if (json == null)
+      return new OSOutcomeEvent();
+
+    return new OSOutcomeEvent.fromMap(json.cast<String, dynamic>());
   }
 
   /// Send an outcome event with a value for the current session and notifications with the attribution window
   /// Counted each time sent successfully, failed ones will be cached and reattempted in future
   Future<OSOutcomeEvent> sendOutcomeWithValue(String name, double value) async {
-      Map<dynamic, dynamic> json = await _outcomesChannel.invokeMethod("OneSignal#sendOutcomeWithValue", {"outcome_name" : name, "outcome_value" : value});
-      return new OSOutcomeEvent(json.cast<String, dynamic>());
+    var json = await _outcomesChannel.invokeMethod("OneSignal#sendOutcomeWithValue", {"outcome_name" : name, "outcome_value" : value});
+
+    if (json == null)
+      return new OSOutcomeEvent();
+
+    return new OSOutcomeEvent.fromMap(json.cast<String, dynamic>());
   }
 
   // Private function that gets called by ObjC/Java

pubspec.yaml

@@ -1,6 +1,6 @@
 name: onesignal_flutter
 description: OneSignal is a free push notification service for mobile apps. This plugin makes it easy to integrate your flutter app with OneSignal
-version: 2.2.0
+version: 2.3.0
 author: Brad Hesse <brad@onesignal.com>, Josh Kasten <josh@onesignal.com>
 homepage: https://github.com/OneSignal/OneSignal-Flutter-SDK