Skip to content
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

Jump to bottom

android: request camera permission for inputs #2033

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

android: request camera permission for inputs #2033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
106 changes: 72 additions & 34 deletions ...lorenzo/flutter_inappwebview_android/webview/in_app_webview/InAppWebViewChromeClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

import static android.app.Activity.RESULT_OK;

public class InAppWebViewChromeClient extends WebChromeClient implements PluginRegistry.ActivityResultListener, ActivityResultListener {
public class InAppWebViewChromeClient extends WebChromeClient implements PluginRegistry.ActivityResultListener, ActivityResultListener, PluginRegistry.RequestPermissionsResultListener {

protected static final String LOG_TAG = "IABWebChromeClient";
private InAppBrowserDelegate inAppBrowserDelegate;
Expand Down Expand Up @@ -126,12 +126,35 @@ public InAppWebViewChromeClient(@NonNull final InAppWebViewFlutterPlugin plugin,
this.inAppBrowserDelegate.getActivityResultListeners().add(this);
}

if (plugin.registrar != null)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplication of line

if (plugin.registrar != null) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check the brackets

plugin.registrar.addActivityResultListener(this);
else if (plugin.activityPluginBinding != null)
plugin.registrar.addRequestPermissionsResultListener(this);
} else if (plugin.activityPluginBinding != null)
plugin.activityPluginBinding.addActivityResultListener(this);
plugin.activityPluginBinding.addRequestPermissionsResultListener(this);
}

private static final int CAMERA_PICKER = 11;

@Nullable
private FilePickerRequest filePickerRequest;

@Override
public boolean onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
if (requestCode == CAMERA_PICKER && filePickerRequest != null) {
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
Log.w(LOG_TAG, "onRequestPermissionsResult: camera granted");
}

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
customStartPickerIntent(filePickerRequest);
}
return true;
}
return false;
}


@Nullable
@Override
public Bitmap getDefaultVideoPoster() {
Expand Down Expand Up @@ -988,45 +1011,46 @@ public boolean startPickerIntent(final ValueCallback<Uri[]> callback, final Stri
final boolean allowMultiple, final boolean captureEnabled) {
filePathCallback = callback;

boolean images = acceptsImages(acceptTypes);
boolean video = acceptsVideo(acceptTypes);
filePickerRequest = new FilePickerRequest(callback, acceptTypes, allowMultiple, captureEnabled);

// Request camera permission first. The picker intent will be started once the
// permission is either granted or denied.
if (captureEnabled && needsCameraPermission() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
getActivity().requestPermissions(new String[]{Manifest.permission.CAMERA}, CAMERA_PICKER);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add permission for gallery and local files.

return true;
}

// If capture is not enabled, we can start the picker intent right away
return customStartPickerIntent(filePickerRequest);
}

private boolean customStartPickerIntent(FilePickerRequest request) {
Log.w(LOG_TAG, "customStartPickerIntent");
filePathCallback = request.callback;

boolean images = acceptsImages(request.acceptTypes);
boolean video = acceptsVideo(request.acceptTypes);

Intent pickerIntent = null;

if (captureEnabled) {
if (!needsCameraPermission()) {
if (images) {
pickerIntent = getPhotoIntent();
}
else if (video) {
pickerIntent = getVideoIntent();
}
ArrayList<Parcelable> extraIntents = new ArrayList<>();
if (!needsCameraPermission()) {
if (images) {
extraIntents.add(getPhotoIntent());
}
}
if (pickerIntent == null) {
ArrayList<Parcelable> extraIntents = new ArrayList<>();
if (!needsCameraPermission()) {
if (images) {
extraIntents.add(getPhotoIntent());
}
if (video) {
extraIntents.add(getVideoIntent());
}
if (video) {
extraIntents.add(getVideoIntent());
}
}

Intent fileSelectionIntent = getFileChooserIntent(acceptTypes, allowMultiple);
Intent fileSelectionIntent = getFileChooserIntent(request.acceptTypes, request.allowMultiple);

pickerIntent = new Intent(Intent.ACTION_CHOOSER);
pickerIntent.putExtra(Intent.EXTRA_INTENT, fileSelectionIntent);
pickerIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, extraIntents.toArray(new Parcelable[]{}));
}
pickerIntent = new Intent(Intent.ACTION_CHOOSER);
pickerIntent.putExtra(Intent.EXTRA_INTENT, fileSelectionIntent);
pickerIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, extraIntents.toArray(new Parcelable[]{}));

Activity activity = getActivity();
if (activity != null && pickerIntent.resolveActivity(activity.getPackageManager()) != null) {
activity.startActivityForResult(pickerIntent, PICKER);
} else {
Log.d(LOG_TAG, "there is no Activity to handle this Intent");
}
activity.startActivityForResult(pickerIntent, PICKER);

return true;
}
Expand Down Expand Up @@ -1273,7 +1297,7 @@ public void error(String errorCode, @Nullable String errorMessage, @Nullable Obj
defaultBehaviour(null);
}
};

if(inAppWebView != null && inAppWebView.channelDelegate != null) {
inAppWebView.channelDelegate.onPermissionRequest(request.getOrigin().toString(),
Arrays.asList(request.getResources()), null, callback);
Expand Down Expand Up @@ -1330,3 +1354,17 @@ public void dispose() {
plugin = null;
}
}

class FilePickerRequest {
public FilePickerRequest(ValueCallback<Uri[]> callback, String[] acceptTypes, boolean allowMultiple, boolean captureEnabled) {
this.callback = callback;
this.acceptTypes = acceptTypes;
this.allowMultiple = allowMultiple;
this.captureEnabled = captureEnabled;
}

public ValueCallback<Uri[]> callback;
public String[] acceptTypes;
public boolean allowMultiple;
public boolean captureEnabled;
}