Merge pull request #183 from crazecoder/master
handle choose file callback in android
This commit is contained in:
commit
f80bf8879d
|
@ -1,5 +1,7 @@
|
|||
package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.content.ActivityNotFoundException;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
|
@ -33,7 +35,10 @@ import java.util.Map;
|
|||
import io.flutter.plugin.common.MethodChannel;
|
||||
import io.flutter.plugin.common.PluginRegistry;
|
||||
|
||||
public class InAppWebChromeClient extends WebChromeClient {
|
||||
import static android.app.Activity.RESULT_CANCELED;
|
||||
import static android.app.Activity.RESULT_OK;
|
||||
|
||||
public class InAppWebChromeClient extends WebChromeClient implements PluginRegistry.ActivityResultListener {
|
||||
|
||||
protected static final String LOG_TAG = "IABWebChromeClient";
|
||||
private PluginRegistry.Registrar registrar;
|
||||
|
@ -56,18 +61,18 @@ public class InAppWebChromeClient extends WebChromeClient {
|
|||
this.inAppBrowserActivity = (InAppBrowserActivity) obj;
|
||||
else if (obj instanceof FlutterWebView)
|
||||
this.flutterWebView = (FlutterWebView) obj;
|
||||
|
||||
registrar.addActivityResultListener(this);
|
||||
}
|
||||
|
||||
public Bitmap getDefaultVideoPoster()
|
||||
{
|
||||
public Bitmap getDefaultVideoPoster() {
|
||||
if (mCustomView == null) {
|
||||
return null;
|
||||
}
|
||||
return BitmapFactory.decodeResource(this.registrar.activeContext().getResources(), 2130837573);
|
||||
}
|
||||
|
||||
public void onHideCustomView()
|
||||
{
|
||||
public void onHideCustomView() {
|
||||
View decorView = this.registrar.activity().getWindow().getDecorView();
|
||||
((FrameLayout) decorView).removeView(this.mCustomView);
|
||||
this.mCustomView = null;
|
||||
|
@ -77,10 +82,8 @@ public class InAppWebChromeClient extends WebChromeClient {
|
|||
this.mCustomViewCallback = null;
|
||||
}
|
||||
|
||||
public void onShowCustomView(View paramView, WebChromeClient.CustomViewCallback paramCustomViewCallback)
|
||||
{
|
||||
if (this.mCustomView != null)
|
||||
{
|
||||
public void onShowCustomView(View paramView, WebChromeClient.CustomViewCallback paramCustomViewCallback) {
|
||||
if (this.mCustomView != null) {
|
||||
onHideCustomView();
|
||||
return;
|
||||
}
|
||||
|
@ -392,8 +395,7 @@ public class InAppWebChromeClient extends WebChromeClient {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture, android.os.Message resultMsg)
|
||||
{
|
||||
public boolean onCreateWindow(WebView view, boolean dialog, boolean userGesture, android.os.Message resultMsg) {
|
||||
WebView.HitTestResult result = view.getHitTestResult();
|
||||
String data = result.getExtra();
|
||||
Map<String, Object> obj = new HashMap<>();
|
||||
|
@ -518,11 +520,8 @@ public class InAppWebChromeClient extends WebChromeClient {
|
|||
public boolean onShowFileChooser(
|
||||
WebView webView, ValueCallback<Uri[]> filePathCallback,
|
||||
FileChooserParams fileChooserParams) {
|
||||
if (mUploadMessageArray != null) {
|
||||
mUploadMessageArray.onReceiveValue(null);
|
||||
}
|
||||
mUploadMessageArray = filePathCallback;
|
||||
|
||||
try {
|
||||
Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
|
||||
contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
|
||||
contentSelectionIntent.setType("*/*");
|
||||
|
@ -534,9 +533,22 @@ public class InAppWebChromeClient extends WebChromeClient {
|
|||
chooserIntent.putExtra(Intent.EXTRA_TITLE, "Image Chooser");
|
||||
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
|
||||
((inAppBrowserActivity != null) ? inAppBrowserActivity : flutterWebView.activity).startActivityForResult(chooserIntent, FILECHOOSER_RESULTCODE);
|
||||
} catch (ActivityNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
|
||||
@Override
|
||||
public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||
if (requestCode == FILECHOOSER_RESULTCODE && (resultCode == RESULT_OK || resultCode == RESULT_CANCELED)) {
|
||||
mUploadMessageArray.onReceiveValue(WebChromeClient.FileChooserParams.parseResult(resultCode, data));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private MethodChannel getChannel() {
|
||||
return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue