Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit c88209c

Browse files
committed
Deprecate old API
1 parent cad571f commit c88209c

File tree

4 files changed

+47
-3
lines changed

4 files changed

+47
-3
lines changed

shell/platform/android/io/flutter/app/FlutterActivityDelegate.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@
2929
import android.widget.FrameLayout;
3030
import io.flutter.plugin.common.BinaryMessenger;
3131
import io.flutter.plugin.common.PluginRegistry;
32-
import io.flutter.plugin.common.PluginRegistry.ActivityResultListener;
3332
import io.flutter.plugin.common.PluginRegistry.Registrar;
34-
import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener;
3533
import io.flutter.plugin.platform.PlatformPlugin;
3634
import io.flutter.util.Preconditions;
3735
import io.flutter.view.FlutterMain;
@@ -127,6 +125,13 @@ public boolean onRequestPermissionsResult(
127125
return flutterView.getPluginRegistry().onRequestPermissionsResult(requestCode, permissions, grantResults);
128126
}
129127

128+
@Override
129+
@Deprecated
130+
public boolean onRequestPermissionResult(
131+
int requestCode, String[] permissions, int[] grantResults) {
132+
return flutterView.getPluginRegistry().onRequestPermissionsResult(requestCode, permissions, grantResults);
133+
}
134+
130135
@Override
131136
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
132137
return flutterView.getPluginRegistry().onActivityResult(requestCode, resultCode, data);

shell/platform/android/io/flutter/app/FlutterActivityEvents.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.content.Intent;
99
import android.os.Bundle;
1010
import io.flutter.plugin.common.PluginRegistry.ActivityResultListener;
11+
import io.flutter.plugin.common.PluginRegistry.RequestPermissionResultListener;
1112
import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener;
1213

1314
/**
@@ -21,7 +22,10 @@
2122
* {@code FlutterActivity}.</p>
2223
*/
2324
public interface FlutterActivityEvents
24-
extends ComponentCallbacks2, ActivityResultListener, RequestPermissionsResultListener {
25+
extends ComponentCallbacks2,
26+
ActivityResultListener,
27+
RequestPermissionResultListener,
28+
RequestPermissionsResultListener {
2529
/**
2630
* @see android.app.Activity#onCreate(android.os.Bundle)
2731
*/

shell/platform/android/io/flutter/app/FlutterPluginRegistry.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
public class FlutterPluginRegistry
2222
implements PluginRegistry,
23+
PluginRegistry.RequestPermissionResultListener,
2324
PluginRegistry.RequestPermissionsResultListener,
2425
PluginRegistry.ActivityResultListener,
2526
PluginRegistry.NewIntentListener,
@@ -112,6 +113,18 @@ public Registrar publish(Object value) {
112113
return this;
113114
}
114115

116+
@Override
117+
@Deprecated
118+
public Registrar addRequestPermissionResultListener(
119+
final RequestPermissionResultListener listener) {
120+
return addRequestPermissionsResultListener(new RequestPermissionsResultListener() {
121+
@Override
122+
public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
123+
return listener.onRequestPermissionResult(requestCode, permissions, grantResults);
124+
}
125+
});
126+
}
127+
115128
@Override
116129
public Registrar addRequestPermissionsResultListener(
117130
RequestPermissionsResultListener listener) {
@@ -154,6 +167,12 @@ public boolean onRequestPermissionsResult(int requestCode, String[] permissions,
154167
return false;
155168
}
156169

170+
@Deprecated
171+
@Override
172+
public boolean onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
173+
return onRequestPermissionsResult(requestCode, permissions, grantResults);
174+
}
175+
157176
@Override
158177
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
159178
for (ActivityResultListener listener : mActivityResultListeners) {

shell/platform/android/io/flutter/plugin/common/PluginRegistry.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,13 @@ interface Registrar {
125125
*/
126126
Registrar addRequestPermissionsResultListener(RequestPermissionsResultListener listener);
127127

128+
/**
129+
* @deprecated This method will be removed. Use
130+
* {@link #addRequestPermissionsResultListener(RequestPermissionsResultListener)} instead.
131+
*/
132+
@Deprecated
133+
Registrar addRequestPermissionResultListener(RequestPermissionResultListener listener);
134+
128135
/**
129136
* Adds a callback allowing the plugin to take part in handling incoming
130137
* calls to {@link Activity#onActivityResult(int, int, Intent)}.
@@ -173,6 +180,15 @@ interface RequestPermissionsResultListener {
173180
boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults);
174181
}
175182

183+
/**
184+
* This interface is deprecated, and will be removed.
185+
* Use {@link RequestPermissionsResultListener} instead.
186+
*/
187+
interface RequestPermissionResultListener {
188+
@Deprecated
189+
boolean onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults);
190+
}
191+
176192
/**
177193
* Delegate interface for handling activity results on behalf of the main
178194
* {@link Activity}.

0 commit comments

Comments
 (0)