Skip to content

Commit 60dcfc4

Browse files
committed
[breaking] remove deprecated v1 embedding references
* Remove references to the now deprecated v1 Android embedding. `PluginRegistry.Registrar` and `io.flutter.view.FlutterNativeView` classes so that the SDK can be used on newer Flutter versions. * Most imports were unused and leftover from when v2 support was added. * However, we now need to completely drop v1 support.
1 parent a222579 commit 60dcfc4

9 files changed

+0
-35
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import io.flutter.plugin.common.BinaryMessenger;
1212
import io.flutter.plugin.common.MethodChannel;
13-
import io.flutter.plugin.common.PluginRegistry;
1413

1514
abstract class FlutterRegistrarResponder {
1615
Context context;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import io.flutter.plugin.common.MethodChannel;
1616
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1717
import io.flutter.plugin.common.MethodChannel.Result;
18-
import io.flutter.plugin.common.PluginRegistry;
19-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2018

2119
public class OneSignalDebug extends FlutterRegistrarResponder implements MethodCallHandler {
2220

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import io.flutter.plugin.common.MethodChannel;
2222
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2323
import io.flutter.plugin.common.MethodChannel.Result;
24-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2524

2625
public class OneSignalInAppMessages extends FlutterRegistrarResponder implements MethodCallHandler,
2726
IInAppMessageClickListener, IInAppMessageLifecycleListener{

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import io.flutter.plugin.common.MethodChannel;
1616
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1717
import io.flutter.plugin.common.MethodChannel.Result;
18-
import io.flutter.plugin.common.PluginRegistry;
19-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2018

2119
public class OneSignalLocation extends FlutterRegistrarResponder implements MethodCallHandler {
2220

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import io.flutter.plugin.common.MethodChannel;
3434
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
3535
import io.flutter.plugin.common.MethodChannel.Result;
36-
import io.flutter.plugin.common.PluginRegistry;
37-
import io.flutter.plugin.common.PluginRegistry.Registrar;
3836

3937
public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickListener, INotificationLifecycleListener, IPermissionObserver {
4038
private final HashMap<String, INotificationWillDisplayEvent> notificationOnWillDisplayEventCache = new HashMap<>();

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

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
import io.flutter.plugin.common.MethodChannel;
2525
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2626
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;
3027

3128
/** OnesignalPlugin */
3229
public class OneSignalPlugin extends FlutterRegistrarResponder implements FlutterPlugin, MethodCallHandler, ActivityAware {
@@ -87,24 +84,6 @@ public void onReattachedToActivityForConfigChanges(@NonNull ActivityPluginBindin
8784
public void onDetachedFromActivityForConfigChanges() {
8885
}
8986

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-
10887
@Override
10988
public void onMethodCall(MethodCall call, Result result) {
11089
if (call.method.contentEquals("OneSignal#initialize"))

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import io.flutter.plugin.common.MethodChannel;
2222
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2323
import io.flutter.plugin.common.MethodChannel.Result;
24-
import io.flutter.plugin.common.PluginRegistry;
25-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2624

2725
public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, IPushSubscriptionObserver {
2826

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
import io.flutter.plugin.common.MethodChannel;
1111
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
1212
import io.flutter.plugin.common.MethodChannel.Result;
13-
import io.flutter.plugin.common.PluginRegistry;
14-
import io.flutter.plugin.common.PluginRegistry.Registrar;
1513

1614
public class OneSignalSession extends FlutterRegistrarResponder implements MethodCallHandler {
1715

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import io.flutter.plugin.common.MethodChannel;
1919
import io.flutter.plugin.common.MethodChannel.MethodCallHandler;
2020
import io.flutter.plugin.common.MethodChannel.Result;
21-
import io.flutter.plugin.common.PluginRegistry;
22-
import io.flutter.plugin.common.PluginRegistry.Registrar;
2321

2422
public class OneSignalUser extends FlutterRegistrarResponder implements MethodCallHandler, IUserStateObserver {
2523

0 commit comments

Comments
 (0)