Added external user id callback and updated native SDK usage versions

* Android native now updated to 3.13.0
* iOS native now updated to 2.13.1
* Added external user id callback bridge for Dart and Java/Obj-C code

Author: mikechoch

Diff for: android/build.gradle

@@ -34,7 +34,7 @@ android {
 }
 
 dependencies {
-    api 'com.onesignal:OneSignal:3.12.7'
+    api 'com.onesignal:OneSignal:3.13.0'
 }
 
 // Adds required manifestPlaceholders keys to allow mainifest merge gradle step to complete

Diff for: android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java

@@ -298,14 +298,33 @@ public void onFailure(EmailUpdateError error) {
     });
   }
 
-  private void setExternalUserId(MethodCall call, Result result) {
-    OneSignal.setExternalUserId((String)call.argument("externalUserId"));
-    replySuccess(result, null);
+  private void setExternalUserId(MethodCall call, final Result result) {
+    String externalUserId = call.argument("externalUserId");
+    OneSignal.setExternalUserId(externalUserId, new OneSignal.OSExternalUserIdUpdateCompletionHandler() {
+      @Override
+      public void onComplete(JSONObject results) {
+        try {
+          replySuccess(result, OneSignalSerializer.convertJSONObjectToHashMap(results));
+        } catch (JSONException e) {
+          OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR,
+                  "Encountered an error attempting to deserialize server response for setExternalUserId: " + e.getMessage());
+        }
+      }
+    });
   }
 
-  private void removeExternalUserId(Result result) {
-    OneSignal.removeExternalUserId();
-    replySuccess(result, null);
+  private void removeExternalUserId(final Result result) {
+    OneSignal.removeExternalUserId(new OneSignal.OSExternalUserIdUpdateCompletionHandler() {
+      @Override
+      public void onComplete(JSONObject results) {
+        try {
+          replySuccess(result, OneSignalSerializer.convertJSONObjectToHashMap(results));
+        } catch (JSONException e) {
+          OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR,
+                  "Encountered an error attempting to deserialize server response for removeExternalUserId: " + e.getMessage());
+        }
+      }
+    });
   }
 
   private void initNotificationOpenedHandlerParams() {

Diff for: example/lib/main.dart

@@ -182,16 +182,22 @@ class _MyAppState extends State<MyApp> {
 
   void _handleSetExternalUserId() {
     print("Setting external user ID");
-    OneSignal.shared.setExternalUserId(_externalUserId);
-    this.setState(() {
-      _debugLabelString = "Set External User ID";
+    OneSignal.shared.setExternalUserId(_externalUserId).then((results) {
+        if (results == null) return;
+
+        this.setState(() {
+            _debugLabelString = "External user id set: $results";
+        });
     });
   }
 
   void _handleRemoveExternalUserId() {
-    OneSignal.shared.removeExternalUserId();
-    this.setState(() {
-      _debugLabelString = "Removed external user ID";
+    OneSignal.shared.removeExternalUserId().then((results) {
+        if (results == null) return;
+
+        this.setState(() {
+           _debugLabelString = "External user id removed: $results";
+        });
     });
   }
 

Diff for: ios/Classes/OneSignalPlugin.m

@@ -263,13 +263,16 @@ - (void)setExternalUserId:(FlutterMethodCall *)call withResult:(FlutterResult)re
     id externalId = call.arguments[@"externalUserId"];
     if (externalId == [NSNull null])
         externalId = nil;
-    [OneSignal setExternalUserId:externalId];
-    result(nil);
+
+    [OneSignal setExternalUserId:externalId withCompletion:^(NSDictionary *results) {
+       result(results);
+    }];
 }
 
 - (void)removeExternalUserId:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    [OneSignal removeExternalUserId];
-    result(nil);
+    [OneSignal removeExternalUserId:^(NSDictionary *results) {
+        result(results);
+    }];
 }
 
 - (void)initNotificationOpenedHandlerParams {

Diff for: ios/onesignal_flutter.podspec

@@ -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.12.6'
+  s.dependency 'OneSignal', '2.13.1'
   s.ios.deployment_target = '8.0'
   s.static_framework = true
 end

Diff for: lib/onesignal_flutter.dart

@@ -275,13 +275,17 @@ class OneSignal {
   /// OneSignal allows you to set a custom ID for your users. This makes it so that
   /// if your app has its own user ID's, you can use your own custom user ID's with
   /// our API instead of having to save their OneSignal user ID's.
-  Future<void> setExternalUserId(String externalId) async {
-    return await _channel.invokeMethod("OneSignal#setExternalUserId", {'externalUserId' : externalId});
+  Future<Map<String, dynamic>> setExternalUserId(String externalId) async {
+    Map<dynamic, dynamic> results =
+        await _channel.invokeMethod("OneSignal#setExternalUserId", {'externalUserId' : externalId});;
+    return results.cast<String, dynamic>();
   }
 
   /// Removes the external user ID that was set for the current user.
-  Future<void> removeExternalUserId() async {
-    return await _channel.invokeMethod("OneSignal#removeExternalUserId");
+  Future<Map<String, dynamic>> removeExternalUserId() async {
+    Map<dynamic, dynamic> results =
+        await _channel.invokeMethod("OneSignal#removeExternalUserId");
+    return results.cast<String, dynamic>();
   }
 
   /// Adds a single key, value trigger, which will trigger an in app message