.github/ISSUE_TEMPLATE/ask-question.yml

@@ -1,9 +1,8 @@
 name: 🙋‍♂️ Ask a question
 description: Tell us what's on your mind
 title: "[question]: "
-labels: ["question"]
-# assignees:
-#   - OneSignal/ios-sdk
+labels: ["Question"]
+
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,9 +1,8 @@
 name: 🪳 Bug report
 description: File a bug report
 title: "[Bug]: "
-labels: ["bug", "triage"]
-# assignees:
-#   - OneSignal/ios-sdk
+labels: ["Bug"]
+
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/general-feedback.yml

@@ -1,9 +1,8 @@
 name: 📣 General feedback
 description: Tell us what's on your mind
 title: "[Feedback]: "
-labels: ["triage"]
-# assignees:
-#   - OneSignal/ios-sdk
+labels: ["Feedback"]
+
 body:
   - type: markdown
     attributes:

.github/workflows/project.yml

@@ -0,0 +1,17 @@
+name: Add issues to project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add issue to project
+        uses: actions/add-to-project@v1.0.2
+        with:
+          # SDK Cross-Platform Project
+          project-url: https://github.com/orgs/OneSignal/projects/10
+          github-token: ${{ secrets.GH_PROJECTS_TOKEN }}

MIGRATION_GUIDE.md

@@ -1,5 +1,15 @@
 # Flutter v5.0.0 Migration Guide
 
+#### ⚠️ Migration Advisory for current OneSignal customers
+
+Our new [user-centric APIs and v5.x.x SDKs](https://onesignal.com/blog/unify-your-users-across-channels-and-devices/) offer an improved user and data management experience. However, they may not be at 1:1 feature parity with our previous versions yet.
+
+If you are migrating an existing app, we suggest using iOS and Android’s Phased Rollout capabilities to ensure that there are no unexpected issues or edge cases. Here is the documentation for each:
+
+- [iOS Phased Rollout](https://developer.apple.com/help/app-store-connect/update-your-app/release-a-version-update-in-phases/)
+- [Google Play Staged Rollouts](https://support.google.com/googleplay/android-developer/answer/6346149?hl=en)
+
+If you run into any challenges or have concerns, please contact our support team at support@onesignal.com
 
 # Intro
 
@@ -122,7 +132,7 @@ Logging out has the affect of reverting to a device-scoped user, which is the ne
 
 ## Subscriptions
 
-In previous versions of the SDK, a “player” could have up to one email address and up to one phone number for SMS. In the user-centered model, a user can own the current device’s **Push Subscription** along with the ability to have **zero or more** email subscriptions and **zero or more** SMS subscriptions. Note: If a new user logs in via the `login` method, the previous user will no longer longer own that push subscription.
+In previous versions of the SDK, a “player” could have up to one email address and up to one phone number for SMS. In the user-centered model, a user can own the current device’s **Push Subscription** along with the ability to have **zero or more** email subscriptions and **zero or more** SMS subscriptions. Note: If a new user logs in via the `login` method, the previous user will no longer own that push subscription.
 
 ### **Push Subscription**
 The current device’s push subscription can be retrieved via:
@@ -442,4 +452,4 @@ The Debug namespace is accessible via `OneSignal.Debug` and provide access to de
 
 # Known issues
 - Identity Verification
-  - We will be introducing JWT in a follow up release
+  - We will be introducing JWT in a follow up release

README.md

@@ -6,6 +6,19 @@
 
 ---
 
+#### ⚠️ Migration Advisory for current OneSignal customers
+
+Our new [user-centric APIs and v5.x.x SDKs](https://onesignal.com/blog/unify-your-users-across-channels-and-devices/) offer an improved user and data management experience. However, they may not be at 1:1 feature parity with our previous versions yet.
+
+If you are migrating an existing app, we suggest using iOS and Android’s Phased Rollout capabilities to ensure that there are no unexpected issues or edge cases. Here is the documentation for each:
+
+- [iOS Phased Rollout](https://developer.apple.com/help/app-store-connect/update-your-app/release-a-version-update-in-phases/)
+- [Google Play Staged Rollouts](https://support.google.com/googleplay/android-developer/answer/6346149?hl=en)
+
+If you run into any challenges or have concerns, please contact our support team at support@onesignal.com
+
+---
+
 [OneSignal](https://onesignal.com/) is a free email, sms, push notification, and in-app message service for mobile apps. This SDK makes it easy to integrate your Flutter iOS and/or Android apps with OneSignal.
 
 <p align="center"><img src="https://app.onesignal.com/images/android_and_ios_notification_image.gif" width="500" alt="Flutter Notification"></p>

android/build.gradle

@@ -1,5 +1,5 @@
 group 'com.onesignal.flutter'
-version '5.1.3'
+version '5.3.2'
 
 buildscript {
     repositories {
@@ -22,7 +22,7 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 34
     // Condition for namespace compatibility in AGP <4.2
     if (project.android.hasProperty("namespace")) {
         namespace 'com.onesignal.flutter'
@@ -38,5 +38,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.onesignal:OneSignal:5.1.6'
+    implementation 'com.onesignal:OneSignal:5.1.33'
 }

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

@@ -4,15 +4,12 @@
 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 {
+abstract class FlutterMessengerResponder {
    Context context;
    protected MethodChannel channel;
    BinaryMessenger messenger;

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

@@ -3,22 +3,13 @@
 import com.onesignal.OneSignal;
 import com.onesignal.debug.LogLevel;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.List;
-import java.util.Map;
-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;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
-public class OneSignalDebug extends FlutterRegistrarResponder implements MethodCallHandler {
+public class OneSignalDebug extends FlutterMessengerResponder implements MethodCallHandler {
 
    static void registerWith(BinaryMessenger messenger) {
         OneSignalDebug controller = new OneSignalDebug();

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

@@ -3,11 +3,9 @@
 import com.onesignal.OneSignal;
 import com.onesignal.debug.internal.logging.Logging;
 import org.json.JSONException;
-import org.json.JSONObject;
-import com.onesignal.inAppMessages.IInAppMessage;
+
 import com.onesignal.inAppMessages.IInAppMessageClickListener;
 import com.onesignal.inAppMessages.IInAppMessageClickEvent;
-import com.onesignal.inAppMessages.IInAppMessageClickResult;
 import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
 import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
 import com.onesignal.inAppMessages.IInAppMessageDidDisplayEvent;
@@ -21,9 +19,8 @@
 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 OneSignalInAppMessages extends FlutterRegistrarResponder implements MethodCallHandler, 
+public class OneSignalInAppMessages extends FlutterMessengerResponder implements MethodCallHandler, 
 IInAppMessageClickListener, IInAppMessageLifecycleListener{
 
     static void registerWith(BinaryMessenger messenger) {

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

@@ -3,22 +3,13 @@
 import com.onesignal.OneSignal;
 import com.onesignal.Continue;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.List;
-import java.util.Map;
-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;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
 
-public class OneSignalLocation extends FlutterRegistrarResponder implements MethodCallHandler {
+public class OneSignalLocation extends FlutterMessengerResponder implements MethodCallHandler {
 
     static void registerWith(BinaryMessenger messenger) {
         OneSignalLocation controller = new OneSignalLocation();

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

@@ -1,45 +1,65 @@
 package com.onesignal.flutter;
 
+import androidx.annotation.NonNull;
+
 import com.onesignal.debug.internal.logging.Logging;
 import com.onesignal.OneSignal;
-import com.onesignal.Continue;
-
 
 import com.onesignal.notifications.INotification;
 import com.onesignal.notifications.INotificationClickEvent;
 import com.onesignal.notifications.INotificationWillDisplayEvent;
-import com.onesignal.notifications.INotificationClickResult;
-import com.onesignal.notifications.INotificationReceivedEvent;
 import com.onesignal.notifications.INotificationClickListener;
 import com.onesignal.notifications.INotificationLifecycleListener;
 import com.onesignal.notifications.IPermissionObserver;
 
-import com.onesignal.user.subscriptions.ISubscription;
-import com.onesignal.user.subscriptions.IPushSubscription;
-
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import java.util.List;
-import java.util.Map;
-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;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
+import kotlin.coroutines.Continuation;
+import kotlin.coroutines.CoroutineContext;
+import kotlinx.coroutines.Dispatchers;
 
-public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
+public class OneSignalNotifications extends FlutterMessengerResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
     private final HashMap<String, INotificationWillDisplayEvent> notificationOnWillDisplayEventCache = new HashMap<>();
     private final HashMap<String, INotificationWillDisplayEvent> preventedDefaultCache = new HashMap<>();
 
+    /**
+     * A helper class to encapsulate invoking the suspending function [requestPermission] in Java.
+     * To support API level < 24, the SDK cannot use the OneSignal-defined [Continue.with] helper method.
+     */
+    private class RequestPermissionContinuation implements Continuation<Boolean> {
+
+        private final MethodChannel.Result result;
+
+        public RequestPermissionContinuation(MethodChannel.Result result) {
+            this.result = result;
+        }
+
+        @NonNull
+        @Override
+        public CoroutineContext getContext() {
+            return (CoroutineContext) Dispatchers.getMain();
+        }
+
+        @Override
+        public void resumeWith(@NonNull Object o) {
+            if (o instanceof kotlin.Result.Failure) {
+                Throwable e = ((kotlin.Result.Failure) o).exception;
+                replyError(result, "OneSignal", "requestPermission failed with error: " + e.getMessage() + "\n" + e.getStackTrace(), null);
+            }
+            else {
+                replySuccess(result, o);
+            }
+        }
+    }
 
     static void registerWith(BinaryMessenger messenger) {
         OneSignalNotifications controller = new OneSignalNotifications();
@@ -84,9 +104,7 @@ private void requestPermission(MethodCall call, Result result) {
             return;
         }
 
-        OneSignal.getNotifications().requestPermission(fallback, Continue.with(permissionResult -> {
-            replySuccess(result, permissionResult.getData());
-        }));
+        OneSignal.getNotifications().requestPermission(fallback, new RequestPermissionContinuation(result));
     }
 
     private void removeNotification(MethodCall call, Result result) {

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

@@ -1,35 +1,23 @@
 package com.onesignal.flutter;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 
 import io.flutter.embedding.engine.plugins.activity.ActivityAware;
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
 
 import com.onesignal.OneSignal;
-import com.onesignal.Continue;
 import com.onesignal.common.OneSignalWrapper;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import androidx.annotation.NonNull;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 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;
 import io.flutter.plugin.common.MethodChannel.Result;
-import io.flutter.plugin.common.PluginRegistry;
-import io.flutter.plugin.common.PluginRegistry.Registrar;
-import io.flutter.view.FlutterNativeView;
 
 /** OnesignalPlugin */
-public class OneSignalPlugin extends FlutterRegistrarResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
+public class OneSignalPlugin extends FlutterMessengerResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
 
   public OneSignalPlugin() {
   }
@@ -40,7 +28,7 @@ private void init(Context context, BinaryMessenger messenger)
     this.messenger = messenger;
     OneSignalWrapper.setSdkType("flutter");  
     // For 5.0.0, hard code to reflect SDK version
-    OneSignalWrapper.setSdkVersion("050103");
+    OneSignalWrapper.setSdkVersion("050302");
 
     channel = new MethodChannel(messenger, "OneSignal");
     channel.setMethodCallHandler(this);
@@ -87,24 +75,6 @@ public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBindin
   public void onDetachedFromActivityForConfigChanges() {
   }
 
-  // This static method is only to remain compatible with apps that don’t use the v2 Android embedding.
-  @Deprecated()
-  @SuppressLint("Registrar")
-  public static void registerWith(Registrar registrar) {
-    final OneSignalPlugin plugin = new OneSignalPlugin();
-    plugin.init(registrar.activeContext(), registrar.messenger());
-
-    // Create a callback for the flutterRegistrar to connect the applications onDestroy
-    registrar.addViewDestroyListener(new PluginRegistry.ViewDestroyListener() {
-      @Override
-      public boolean onViewDestroy(FlutterNativeView flutterNativeView) {
-        // Remove all handlers so they aren't triggered with wrong context
-        plugin.onDetachedFromEngine();
-        return false;
-      }
-    });
-  }
-
   @Override
   public void onMethodCall(MethodCall call, Result result) {
     if (call.method.contentEquals("OneSignal#initialize"))