Android Implementation

• Implements the external ID methods for Android
• Updates Android and iOS native SDKs

Author: Nightsd01

android/build.gradle

@@ -34,7 +34,7 @@ android {
 }
 
 dependencies {
-    compile('com.onesignal:OneSignal:3.10.3')
+    compile('com.onesignal:OneSignal:3.10.5')
 }
 
 // Adds required manifestPlaceholders keys to allow mainifest merge gradle step to complete

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

@@ -92,6 +92,10 @@ else if (call.method.contentEquals("OneSignal#promptPermission"))
       Log.e("onesignal", "promptPermission() is not applicable in Android.");
     else if (call.method.contentEquals("OneSignal#didSetNotificationOpenedHandler"))
       this.didSetNotificationOpenedHandler();
+    else if (call.method.contentEquals("OneSignal#setExternalUserId"))
+      this.setExternalUserId(call, result);
+    else if (call.method.contentEquals("OneSignal#removeExternalUserId")) 
+      this.removeExternalUserId(result);
     else
       result.notImplemented();
   }
@@ -250,6 +254,18 @@ private void didSetNotificationOpenedHandler() {
     }
   }
 
+  private void setExternalUserId(MethodCall call, Result result) {
+     OneSignal.setExternalUserId((String)call.argument("externalUserId"));
+
+     result.success(null);
+  }
+
+  private void removeExternalUserId(Result result) {
+     OneSignal.removeExternalUserId();
+
+     result.success(null);
+  }
+
   @Override
   public void onOSSubscriptionChanged(OSSubscriptionStateChanges stateChanges) {
     this.channel.invokeMethod("OneSignal#subscriptionChanged", OneSignalSerializer.convertSubscriptionStateChangesToMap(stateChanges));

example/ios/Podfile

@@ -55,7 +55,7 @@ target 'Runner' do
 end
 
 target 'OneSignalNotificationServiceExtension' do
-   pod 'OneSignal', '>= 2.9.3', '< 3.0'
+   pod 'OneSignal', '>= 2.9.4', '< 3.0'
 end
 
 post_install do |installer|

example/lib/main.dart

@@ -142,21 +142,6 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
-  void _handleSetExternalUserId() {
-    print("Setting external user ID");
-    OneSignal.shared.setExternalUserId(_externalUserId);
-    this.setState(() {
-      _debugLabelString = "Set External User ID";
-    });
-  }
-
-  void _handleRemoveExternalUserId() {
-    OneSignal.shared.removeExternalUserId();
-    this.setState(() {
-      _debugLabelString = "Removed external user ID";
-    });
-  }
-
   void _handleConsent() {
     print("Setting consent to true");
     OneSignal.shared.consentGranted(true);
@@ -181,6 +166,21 @@ class _MyAppState extends State<MyApp> {
     });
   }
 
+  void _handleSetExternalUserId() {
+    print("Setting external user ID");
+    OneSignal.shared.setExternalUserId(_externalUserId);
+    this.setState(() {
+      _debugLabelString = "Set External User ID";
+    });
+  }
+
+  void _handleRemoveExternalUserId() {
+    OneSignal.shared.removeExternalUserId();
+    this.setState(() {
+      _debugLabelString = "Removed external user ID";
+    });
+  }
+
   void _handleSendNotification() async {
     var status = await OneSignal.shared.getPermissionSubscriptionState();
 

example/pubspec.yaml

@@ -4,9 +4,6 @@ description: Demonstrates how to use the onesignal plugin.
 dependencies:
   flutter:
     sdk: flutter
-
-  flutter_test:
-    sdk: flutter
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2

ios/onesignal.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.9.3', '< 3.0'
+  s.dependency 'OneSignal', '>= 2.9.4', '< 3.0'
   s.ios.deployment_target = '8.0'
 end
 

pubspec.yaml

@@ -18,5 +18,5 @@ dev_dependencies:
     sdk: flutter
 
 environment:
-  sdk: ">=2.1.0-dev.7.1 <3.0.0"
-  flutter: ">=0.10.1-pre.45 <2.0.0"
+  sdk: ">=2.0.0-dev.28.0 <3.0.0"
+  flutter: ">=0.1.4 <2.0.0"