Skip to content

Commit 2cfde0f

Browse files
nan-linan-li
authored
Merge pull request #1005 from OneSignal/android_remove_deprecated_v1_embedding
[breaking] Remove deprecated Android v1 embedding references
2 parents a222579 + df09f09 commit 2cfde0f

10 files changed

+10
-100
lines changed

‎android/src/main/java/com/onesignal/flutter/FlutterRegistrarResponder.java renamed to ‎android/src/main/java/com/onesignal/flutter/FlutterMessengerResponder.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
import android.os.Handler;
55
import android.os.Looper;
66

7-
import com.onesignal.OneSignal;
8-
97
import java.util.HashMap;
108

119
import io.flutter.plugin.common.BinaryMessenger;
1210
import io.flutter.plugin.common.MethodChannel;
13-
import io.flutter.plugin.common.PluginRegistry;
1411

15-
abstract class FlutterRegistrarResponder {
12+
abstract class FlutterMessengerResponder {
1613
Context context;
1714
protected MethodChannel channel;
1815
BinaryMessenger messenger;

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

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,13 @@
33
import com.onesignal.OneSignal;
44
import com.onesignal.debug.LogLevel;
55

6-
import org.json.JSONException;
7-
import org.json.JSONObject;
8-
9-
import java.util.List;
10-
import java.util.Map;
11-
import java.util.concurrent.atomic.AtomicBoolean;
12-
136
import io.flutter.plugin.common.BinaryMessenger;
147
import io.flutter.plugin.common.MethodCall;
158
import io.flutter.plugin.common.MethodChannel;
169
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1710
import io.flutter.plugin.common.MethodChannel.Result;
18-
import io.flutter.plugin.common.PluginRegistry;
19-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2011

21-
public class OneSignalDebug extends FlutterRegistrarResponder implements MethodCallHandler {
12+
public class OneSignalDebug extends FlutterMessengerResponder implements MethodCallHandler {
2213

2314
static void registerWith(BinaryMessenger messenger) {
2415
OneSignalDebug controller = new OneSignalDebug();

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
import com.onesignal.OneSignal;
44
import com.onesignal.debug.internal.logging.Logging;
55
import org.json.JSONException;
6-
import org.json.JSONObject;
7-
import com.onesignal.inAppMessages.IInAppMessage;
6+
87
import com.onesignal.inAppMessages.IInAppMessageClickListener;
98
import com.onesignal.inAppMessages.IInAppMessageClickEvent;
10-
import com.onesignal.inAppMessages.IInAppMessageClickResult;
119
import com.onesignal.inAppMessages.IInAppMessageLifecycleListener;
1210
import com.onesignal.inAppMessages.IInAppMessageWillDisplayEvent;
1311
import com.onesignal.inAppMessages.IInAppMessageDidDisplayEvent;
@@ -21,9 +19,8 @@
2119
import io.flutter.plugin.common.MethodChannel;
2220
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2321
import io.flutter.plugin.common.MethodChannel.Result;
24-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2522

26-
public class OneSignalInAppMessages extends FlutterRegistrarResponder implements MethodCallHandler,
23+
public class OneSignalInAppMessages extends FlutterMessengerResponder implements MethodCallHandler,
2724
IInAppMessageClickListener, IInAppMessageLifecycleListener{
2825

2926
static void registerWith(BinaryMessenger messenger) {

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

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,13 @@
33
import com.onesignal.OneSignal;
44
import com.onesignal.Continue;
55

6-
import org.json.JSONException;
7-
import org.json.JSONObject;
8-
9-
import java.util.List;
10-
import java.util.Map;
11-
import java.util.concurrent.atomic.AtomicBoolean;
12-
136
import io.flutter.plugin.common.BinaryMessenger;
147
import io.flutter.plugin.common.MethodCall;
158
import io.flutter.plugin.common.MethodChannel;
169
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1710
import io.flutter.plugin.common.MethodChannel.Result;
18-
import io.flutter.plugin.common.PluginRegistry;
19-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2011

21-
public class OneSignalLocation extends FlutterRegistrarResponder implements MethodCallHandler {
12+
public class OneSignalLocation extends FlutterMessengerResponder implements MethodCallHandler {
2213

2314
static void registerWith(BinaryMessenger messenger) {
2415
OneSignalLocation controller = new OneSignalLocation();

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

+1-13
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,23 @@
88
import com.onesignal.notifications.INotification;
99
import com.onesignal.notifications.INotificationClickEvent;
1010
import com.onesignal.notifications.INotificationWillDisplayEvent;
11-
import com.onesignal.notifications.INotificationClickResult;
12-
import com.onesignal.notifications.INotificationReceivedEvent;
1311
import com.onesignal.notifications.INotificationClickListener;
1412
import com.onesignal.notifications.INotificationLifecycleListener;
1513
import com.onesignal.notifications.IPermissionObserver;
1614

17-
import com.onesignal.user.subscriptions.ISubscription;
18-
import com.onesignal.user.subscriptions.IPushSubscription;
19-
2015
import org.json.JSONException;
2116
import org.json.JSONObject;
2217

2318
import java.util.HashMap;
2419
import java.util.Map;
25-
import java.util.concurrent.atomic.AtomicBoolean;
26-
27-
import java.util.List;
28-
import java.util.Map;
29-
import java.util.concurrent.atomic.AtomicBoolean;
3020

3121
import io.flutter.plugin.common.BinaryMessenger;
3222
import io.flutter.plugin.common.MethodCall;
3323
import io.flutter.plugin.common.MethodChannel;
3424
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
3525
import io.flutter.plugin.common.MethodChannel.Result;
36-
import io.flutter.plugin.common.PluginRegistry;
37-
import io.flutter.plugin.common.PluginRegistry.Registrar;
3826

39-
public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
27+
public class OneSignalNotifications extends FlutterMessengerResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
4028
private final HashMap<String, INotificationWillDisplayEvent> notificationOnWillDisplayEventCache = new HashMap<>();
4129
private final HashMap<String, INotificationWillDisplayEvent> preventedDefaultCache = new HashMap<>();
4230

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

+1-31
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,23 @@
11
package com.onesignal.flutter;
22

3-
import android.annotation.SuppressLint;
43
import android.content.Context;
54

65
import io.flutter.embedding.engine.plugins.activity.ActivityAware;
76
import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding;
87

98
import com.onesignal.OneSignal;
10-
import com.onesignal.Continue;
119
import com.onesignal.common.OneSignalWrapper;
1210

13-
import org.json.JSONException;
14-
import org.json.JSONObject;
15-
16-
import java.util.HashMap;
17-
import java.util.Map;
18-
import java.util.concurrent.atomic.AtomicBoolean;
19-
2011
import androidx.annotation.NonNull;
2112
import io.flutter.embedding.engine.plugins.FlutterPlugin;
2213
import io.flutter.plugin.common.BinaryMessenger;
2314
import io.flutter.plugin.common.MethodCall;
2415
import io.flutter.plugin.common.MethodChannel;
2516
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2617
import io.flutter.plugin.common.MethodChannel.Result;
27-
import io.flutter.plugin.common.PluginRegistry;
28-
import io.flutter.plugin.common.PluginRegistry.Registrar;
29-
import io.flutter.view.FlutterNativeView;
3018

3119
/** OnesignalPlugin */
32-
public class OneSignalPlugin extends FlutterRegistrarResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
20+
public class OneSignalPlugin extends FlutterMessengerResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
3321

3422
public OneSignalPlugin() {
3523
}
@@ -87,24 +75,6 @@ public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBindin
8775
public void onDetachedFromActivityForConfigChanges() {
8876
}
8977

90-
// This static method is only to remain compatible with apps that don’t use the v2 Android embedding.
91-
@Deprecated()
92-
@SuppressLint("Registrar")
93-
public static void registerWith(Registrar registrar) {
94-
final OneSignalPlugin plugin = new OneSignalPlugin();
95-
plugin.init(registrar.activeContext(), registrar.messenger());
96-
97-
// Create a callback for the flutterRegistrar to connect the applications onDestroy
98-
registrar.addViewDestroyListener(new PluginRegistry.ViewDestroyListener() {
99-
@Override
100-
public boolean onViewDestroy(FlutterNativeView flutterNativeView) {
101-
// Remove all handlers so they aren't triggered with wrong context
102-
plugin.onDetachedFromEngine();
103-
return false;
104-
}
105-
});
106-
}
107-
10878
@Override
10979
public void onMethodCall(MethodCall call, Result result) {
11080
if (call.method.contentEquals("OneSignal#initialize"))

‎android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java

+1-11
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,19 @@
22

33
import com.onesignal.OneSignal;
44

5-
import com.onesignal.user.subscriptions.IPushSubscription;
6-
import com.onesignal.user.subscriptions.ISubscription;
75
import com.onesignal.user.subscriptions.IPushSubscriptionObserver;
86
import com.onesignal.user.subscriptions.PushSubscriptionChangedState;
9-
import com.onesignal.user.subscriptions.PushSubscriptionState;
107
import com.onesignal.debug.internal.logging.Logging;
118

129
import org.json.JSONException;
13-
import org.json.JSONObject;
14-
15-
import java.util.List;
16-
import java.util.Map;
17-
import java.util.concurrent.atomic.AtomicBoolean;
1810

1911
import io.flutter.plugin.common.BinaryMessenger;
2012
import io.flutter.plugin.common.MethodCall;
2113
import io.flutter.plugin.common.MethodChannel;
2214
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2315
import io.flutter.plugin.common.MethodChannel.Result;
24-
import io.flutter.plugin.common.PluginRegistry;
25-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2616

27-
public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, IPushSubscriptionObserver {
17+
public class OneSignalPushSubscription extends FlutterMessengerResponder implements MethodCallHandler, IPushSubscriptionObserver {
2818

2919
static void registerWith(BinaryMessenger messenger) {
3020
OneSignalPushSubscription controller = new OneSignalPushSubscription();

‎android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java

-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package com.onesignal.flutter;
22

3-
import android.util.Log;
4-
53
import com.onesignal.user.state.UserChangedState;
64
import com.onesignal.user.state.UserState;
7-
import com.onesignal.user.subscriptions.ISubscription;
8-
import com.onesignal.user.subscriptions.IPushSubscription;
95
import com.onesignal.user.subscriptions.PushSubscriptionChangedState;
106
import com.onesignal.user.subscriptions.PushSubscriptionState;
117
import com.onesignal.inAppMessages.IInAppMessage;

‎android/src/main/java/com/onesignal/flutter/OneSignalSession.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,13 @@
22

33
import com.onesignal.OneSignal;
44

5-
import java.util.HashMap;
6-
import java.util.concurrent.atomic.AtomicBoolean;
7-
85
import io.flutter.plugin.common.BinaryMessenger;
96
import io.flutter.plugin.common.MethodCall;
107
import io.flutter.plugin.common.MethodChannel;
118
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
129
import io.flutter.plugin.common.MethodChannel.Result;
13-
import io.flutter.plugin.common.PluginRegistry;
14-
import io.flutter.plugin.common.PluginRegistry.Registrar;
1510

16-
public class OneSignalSession extends FlutterRegistrarResponder implements MethodCallHandler {
11+
public class OneSignalSession extends FlutterMessengerResponder implements MethodCallHandler {
1712

1813
static void registerWith(BinaryMessenger messenger) {
1914
OneSignalSession controller = new OneSignalSession();

‎android/src/main/java/com/onesignal/flutter/OneSignalUser.java

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
package com.onesignal.flutter;
22

33
import com.onesignal.OneSignal;
4-
import com.onesignal.debug.LogLevel;
54
import com.onesignal.debug.internal.logging.Logging;
65
import com.onesignal.user.state.IUserStateObserver;
76
import com.onesignal.user.state.UserChangedState;
87

98
import org.json.JSONException;
10-
import org.json.JSONObject;
119

1210
import java.util.List;
1311
import java.util.Map;
14-
import java.util.concurrent.atomic.AtomicBoolean;
1512

1613
import io.flutter.plugin.common.BinaryMessenger;
1714
import io.flutter.plugin.common.MethodCall;
1815
import io.flutter.plugin.common.MethodChannel;
1916
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2017
import io.flutter.plugin.common.MethodChannel.Result;
21-
import io.flutter.plugin.common.PluginRegistry;
22-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2318

24-
public class OneSignalUser extends FlutterRegistrarResponder implements MethodCallHandler, IUserStateObserver {
19+
public class OneSignalUser extends FlutterMessengerResponder implements MethodCallHandler, IUserStateObserver {
2520

2621
static void registerWith(BinaryMessenger messenger) {
2722
OneSignalUser controller = new OneSignalUser();

0 commit comments

Comments
 (0)