Skip to content

[breaking] Remove deprecated Android v1 embedding references #1005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 24, 2025
Merged

[breaking] Remove deprecated Android v1 embedding references #1005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60dcfc4
[breaking] remove deprecated v1 embedding references
nan-li Feb 19, 2025
b02dc92
[nit] rename `FlutterRegistrarResponder` class
nan-li Feb 19, 2025
df09f09
[nit] clean up unused imports
nan-li Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ...al/flutter/FlutterRegistrarResponder.java → ...al/flutter/FlutterMessengerResponder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 1 addition & 10 deletions android/src/main/java/com/onesignal/flutter/OneSignalDebug.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 2 additions & 5 deletions android/src/main/java/com/onesignal/flutter/OneSignalInAppMessages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down
11 changes: 1 addition & 10 deletions android/src/main/java/com/onesignal/flutter/OneSignalLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 1 addition & 13 deletions android/src/main/java/com/onesignal/flutter/OneSignalNotifications.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, INotificationWillDisplayEvent> notificationOnWillDisplayEventCache = new HashMap<>();
private final HashMap<String, INotificationWillDisplayEvent> preventedDefaultCache = new HashMap<>();

Expand Down
32 changes: 1 addition & 31 deletions android/src/main/java/com/onesignal/flutter/OneSignalPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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() {
}
Expand Down Expand Up @@ -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"))
Expand Down
12 changes: 1 addition & 11 deletions android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 0 additions & 4 deletions android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
7 changes: 1 addition & 6 deletions android/src/main/java/com/onesignal/flutter/OneSignalSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 1 addition & 6 deletions android/src/main/java/com/onesignal/flutter/OneSignalUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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();
Expand Down
Loading