firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix API typo (flutter/engine#4487)

Browse Source
This commit is contained in:
Mikkel Nygaard Ravn
2018-01-02 15:32:53 +01:00
committed by GitHub
parent 1f5a2ea055
commit 7ec61ad743
6 changed files with 76 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivity.java
View File

@@ -114,7 +114,7 @@ public class FlutterActivity extends Activity implements FlutterView.Provider, P
// @Override - added in API level 23
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
eventDelegate.onRequestPermissionResult(requestCode, permissions, grantResults);
eventDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override

11
engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivityDelegate.java
View File

@@ -29,9 +29,7 @@ import android.view.WindowManager.LayoutParams;
import android.widget.FrameLayout;
import io.flutter.plugin.common.BinaryMessenger;
import io.flutter.plugin.common.PluginRegistry;
import io.flutter.plugin.common.PluginRegistry.ActivityResultListener;
import io.flutter.plugin.common.PluginRegistry.Registrar;
import io.flutter.plugin.common.PluginRegistry.RequestPermissionResultListener;
import io.flutter.plugin.platform.PlatformPlugin;
import io.flutter.util.Preconditions;
import io.flutter.view.FlutterMain;
@@ -122,9 +120,16 @@ public final class FlutterActivityDelegate
}
@Override
public boolean onRequestPermissionsResult(
int requestCode, String[] permissions, int[] grantResults) {
return flutterView.getPluginRegistry().onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override
@Deprecated
public boolean onRequestPermissionResult(
int requestCode, String[] permissions, int[] grantResults) {
return flutterView.getPluginRegistry().onRequestPermissionResult(requestCode, permissions, grantResults);
return onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override

6
engine/src/flutter/shell/platform/android/io/flutter/app/FlutterActivityEvents.java
View File

@@ -9,6 +9,7 @@ import android.content.Intent;
import android.os.Bundle;
import io.flutter.plugin.common.PluginRegistry.ActivityResultListener;
import io.flutter.plugin.common.PluginRegistry.RequestPermissionResultListener;
import io.flutter.plugin.common.PluginRegistry.RequestPermissionsResultListener;
/**
* A collection of Android {@code Activity} methods that are relevant to the
@@ -21,7 +22,10 @@ import io.flutter.plugin.common.PluginRegistry.RequestPermissionResultListener;
* {@code FlutterActivity}.</p>
*/
public interface FlutterActivityEvents
extends ComponentCallbacks2, ActivityResultListener, RequestPermissionResultListener {
extends ComponentCallbacks2,
ActivityResultListener,
RequestPermissionResultListener,
RequestPermissionsResultListener {
/**
* @see android.app.Activity#onCreate(android.os.Bundle)
*/

2
engine/src/flutter/shell/platform/android/io/flutter/app/FlutterFragmentActivity.java
View File

@@ -113,7 +113,7 @@ public class FlutterFragmentActivity
// @Override - added in API level 23
public void onRequestPermissionsResult(
int requestCode, String[] permissions, int[] grantResults) {
eventDelegate.onRequestPermissionResult(requestCode, permissions, grantResults);
eventDelegate.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override

31
engine/src/flutter/shell/platform/android/io/flutter/app/FlutterPluginRegistry.java
View File

@@ -21,6 +21,7 @@ import java.util.Map;
public class FlutterPluginRegistry
implements PluginRegistry,
PluginRegistry.RequestPermissionResultListener,
PluginRegistry.RequestPermissionsResultListener,
PluginRegistry.ActivityResultListener,
PluginRegistry.NewIntentListener,
PluginRegistry.UserLeaveHintListener,
@@ -33,7 +34,7 @@ public class FlutterPluginRegistry
private FlutterView mFlutterView;
private final Map<String, Object> mPluginMap = new LinkedHashMap<>(0);
private final List<RequestPermissionResultListener> mRequestPermissionResultListeners = new ArrayList<>(0);
private final List<RequestPermissionsResultListener> mRequestPermissionsResultListeners = new ArrayList<>(0);
private final List<ActivityResultListener> mActivityResultListeners = new ArrayList<>(0);
private final List<NewIntentListener> mNewIntentListeners = new ArrayList<>(0);
private final List<UserLeaveHintListener> mUserLeaveHintListeners = new ArrayList<>(0);
@@ -113,9 +114,21 @@ public class FlutterPluginRegistry
}
@Override
@Deprecated
public Registrar addRequestPermissionResultListener(
RequestPermissionResultListener listener) {
mRequestPermissionResultListeners.add(listener);
final RequestPermissionResultListener listener) {
return addRequestPermissionsResultListener(new RequestPermissionsResultListener() {
@Override
public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
return listener.onRequestPermissionResult(requestCode, permissions, grantResults);
}
});
}
@Override
public Registrar addRequestPermissionsResultListener(
RequestPermissionsResultListener listener) {
mRequestPermissionsResultListeners.add(listener);
return this;
}
@@ -145,15 +158,21 @@ public class FlutterPluginRegistry
}
@Override
public boolean onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
for (RequestPermissionResultListener listener : mRequestPermissionResultListeners) {
if (listener.onRequestPermissionResult(requestCode, permissions, grantResults)) {
public boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
for (RequestPermissionsResultListener listener : mRequestPermissionsResultListeners) {
if (listener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
return true;
}
}
return false;
}
@Deprecated
@Override
public boolean onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults) {
return onRequestPermissionsResult(requestCode, permissions, grantResults);
}
@Override
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
for (ActivityResultListener listener : mActivityResultListeners) {

38
engine/src/flutter/shell/platform/android/io/flutter/plugin/common/PluginRegistry.java
View File

@@ -120,9 +120,24 @@ public interface PluginRegistry {
* calls to {@link Activity#onRequestPermissionsResult(int, String[], int[])}
* or {android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int, String[], int[])}.
*
* @param listener a {@link RequestPermissionResultListener} callback.
* @param listener a {@link RequestPermissionsResultListener} callback.
* @return this {@link Registrar}.
*/
Registrar addRequestPermissionsResultListener(RequestPermissionsResultListener listener);
/**
* Adds a callback allowing the plugin to take part in handling incoming
* calls to {@link Activity#onRequestPermissionsResult(int, String[], int[])}
* or {android.support.v4.app.ActivityCompat.OnRequestPermissionsResultCallback#onRequestPermissionsResult(int, String[], int[])}.
*
* @param listener a {@link RequestPermissionResultListener} callback.
* @return this {@link Registrar}.
* @deprecated on 2018-01-02 because of misspelling. This method will be made unavailable
* on 2018-02-06 (or at least four weeks after the deprecation is released). Use
* {@link #addRequestPermissionsResultListener(RequestPermissionsResultListener)} instead.
*/
@Deprecated
Registrar addRequestPermissionResultListener(RequestPermissionResultListener listener);
/**
@@ -163,13 +178,32 @@ public interface PluginRegistry {
}
/**
* Delegate interface for handling results of permission requests on
* Delegate interface for handling result of permissions requests on
* behalf of the main {@link Activity}.
*/
interface RequestPermissionsResultListener {
/**
* @return true if the result has been handled.
*/
boolean onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults);
}
/**
* Delegate interface for handling result of permissions requests on
* behalf of the main {@link Activity}.
*
* Deprecated on 2018-01-02 because of misspelling. This interface will be made
* unavailable on 2018-02-06 (or at least four weeks after the deprecation is released).
* Use {@link RequestPermissionsResultListener} instead.
*/
interface RequestPermissionResultListener {
/**
* @return true if the result has been handled.
* @deprecated on 2018-01-02 because of misspelling. This method will be made
* unavailable on 2018-02-06 (or at least four weeks after the deprecation is released).
* Use {@link RequestPermissionsResultListener} instead.
*/
@Deprecated
boolean onRequestPermissionResult(int requestCode, String[] permissions, int[] grantResults);
}