diff --git a/android/src/main/java/com/onesignal/flutter/FlutterRegistrarResponder.java b/android/src/main/java/com/onesignal/flutter/FlutterMessengerResponder.java similarity index 95% rename from android/src/main/java/com/onesignal/flutter/FlutterRegistrarResponder.java rename to android/src/main/java/com/onesignal/flutter/FlutterMessengerResponder.java index 808ac3f8..1b38377c 100644 --- a/android/src/main/java/com/onesignal/flutter/FlutterRegistrarResponder.java +++ b/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; diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalDebug.java b/android/src/main/java/com/onesignal/flutter/OneSignalDebug.java index a13158b9..e4e446e5 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalDebug.java +++ b/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(); diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalInAppMessages.java b/android/src/main/java/com/onesignal/flutter/OneSignalInAppMessages.java index 92467a33..7b5aeeb7 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalInAppMessages.java +++ b/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) { diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalLocation.java b/android/src/main/java/com/onesignal/flutter/OneSignalLocation.java index dc4637ef..2433f384 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalLocation.java +++ b/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(); diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java b/android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java index 0ced47e4..49bcbdfd 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java @@ -8,35 +8,23 @@ 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; -public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver { +public class OneSignalNotifications extends FlutterMessengerResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver { private final HashMap notificationOnWillDisplayEventCache = new HashMap<>(); private final HashMap preventedDefaultCache = new HashMap<>(); diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java b/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java index 91af79db..cd6f5e18 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java @@ -1,22 +1,13 @@ 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; @@ -24,12 +15,9 @@ 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() { } @@ -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")) diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java b/android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java index 1830fa33..dd308b0f 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java @@ -2,29 +2,19 @@ import com.onesignal.OneSignal; -import com.onesignal.user.subscriptions.IPushSubscription; -import com.onesignal.user.subscriptions.ISubscription; import com.onesignal.user.subscriptions.IPushSubscriptionObserver; import com.onesignal.user.subscriptions.PushSubscriptionChangedState; -import com.onesignal.user.subscriptions.PushSubscriptionState; import com.onesignal.debug.internal.logging.Logging; 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 OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, IPushSubscriptionObserver { +public class OneSignalPushSubscription extends FlutterMessengerResponder implements MethodCallHandler, IPushSubscriptionObserver { static void registerWith(BinaryMessenger messenger) { OneSignalPushSubscription controller = new OneSignalPushSubscription(); diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java b/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java index 69831527..7adffb3d 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java @@ -1,11 +1,7 @@ package com.onesignal.flutter; -import android.util.Log; - import com.onesignal.user.state.UserChangedState; import com.onesignal.user.state.UserState; -import com.onesignal.user.subscriptions.ISubscription; -import com.onesignal.user.subscriptions.IPushSubscription; import com.onesignal.user.subscriptions.PushSubscriptionChangedState; import com.onesignal.user.subscriptions.PushSubscriptionState; import com.onesignal.inAppMessages.IInAppMessage; diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalSession.java b/android/src/main/java/com/onesignal/flutter/OneSignalSession.java index 26937224..b0e0a909 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalSession.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalSession.java @@ -2,18 +2,13 @@ import com.onesignal.OneSignal; -import java.util.HashMap; -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 OneSignalSession extends FlutterRegistrarResponder implements MethodCallHandler { +public class OneSignalSession extends FlutterMessengerResponder implements MethodCallHandler { static void registerWith(BinaryMessenger messenger) { OneSignalSession controller = new OneSignalSession(); diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalUser.java b/android/src/main/java/com/onesignal/flutter/OneSignalUser.java index b14c0087..de70f165 100644 --- a/android/src/main/java/com/onesignal/flutter/OneSignalUser.java +++ b/android/src/main/java/com/onesignal/flutter/OneSignalUser.java @@ -1,27 +1,22 @@ package com.onesignal.flutter; import com.onesignal.OneSignal; -import com.onesignal.debug.LogLevel; import com.onesignal.debug.internal.logging.Logging; import com.onesignal.user.state.IUserStateObserver; import com.onesignal.user.state.UserChangedState; 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 OneSignalUser extends FlutterRegistrarResponder implements MethodCallHandler, IUserStateObserver { +public class OneSignalUser extends FlutterMessengerResponder implements MethodCallHandler, IUserStateObserver { static void registerWith(BinaryMessenger messenger) { OneSignalUser controller = new OneSignalUser();