rogalikkkkkk
/
iosWebViewFix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #183 from crazecoder/master 

handle choose file callback in android
This commit is contained in:
Lorenzo Pichilli 2019-11-08 00:43:15 +01:00 committed by GitHub
parent 31dc73cfce e18e6910bb
commit f80bf8879d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
android/src/main/java/com/pichillilorenzo/flutter_inappbrowser/InAppWebView/InAppWebChromeClient.java
View File

@ -1,5 +1,7 @@
package com.pichillilorenzo.flutter_inappbrowser.InAppWebView; package com.pichillilorenzo.flutter_inappbrowser.InAppWebView;
import android.annotation.TargetApi;
import android.content.ActivityNotFoundException;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -33,7 +35,10 @@ import java.util.Map;
import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel;
import io.flutter.plugin.common.PluginRegistry; 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"; protected static final String LOG_TAG = "IABWebChromeClient";
private PluginRegistry.Registrar registrar; private PluginRegistry.Registrar registrar;
@ -56,18 +61,18 @@ public class InAppWebChromeClient extends WebChromeClient {
this.inAppBrowserActivity = (InAppBrowserActivity) obj; this.inAppBrowserActivity = (InAppBrowserActivity) obj;
else if (obj instanceof FlutterWebView) else if (obj instanceof FlutterWebView)
this.flutterWebView = (FlutterWebView) obj; this.flutterWebView = (FlutterWebView) obj;
registrar.addActivityResultListener(this);
} }
public Bitmap getDefaultVideoPoster() public Bitmap getDefaultVideoPoster() {
{
if (mCustomView == null) { if (mCustomView == null) {
return null; return null;
} }
return BitmapFactory.decodeResource(this.registrar.activeContext().getResources(), 2130837573); return BitmapFactory.decodeResource(this.registrar.activeContext().getResources(), 2130837573);
} }
public void onHideCustomView() public void onHideCustomView() {
{
View decorView = this.registrar.activity().getWindow().getDecorView(); View decorView = this.registrar.activity().getWindow().getDecorView();
((FrameLayout) decorView).removeView(this.mCustomView); ((FrameLayout) decorView).removeView(this.mCustomView);
this.mCustomView = null; this.mCustomView = null;
@ -77,10 +82,8 @@ public class InAppWebChromeClient extends WebChromeClient {
this.mCustomViewCallback = null; this.mCustomViewCallback = null;
} }
public void onShowCustomView(View paramView, WebChromeClient.CustomViewCallback paramCustomViewCallback) public void onShowCustomView(View paramView, WebChromeClient.CustomViewCallback paramCustomViewCallback) {
{ if (this.mCustomView != null) {
if (this.mCustomView != null)
{
onHideCustomView(); onHideCustomView();
return; return;
} }
@ -343,7 +346,7 @@ public class InAppWebChromeClient extends WebChromeClient {
LinearLayout.LayoutParams.MATCH_PARENT); LinearLayout.LayoutParams.MATCH_PARENT);
input.setLayoutParams(lp); input.setLayoutParams(lp);
layout.setPaddingRelative(45,15,45,0); layout.setPaddingRelative(45, 15, 45, 0);
layout.addView(input); layout.addView(input);
String alertMessage = (responseMessage != null && !responseMessage.isEmpty()) ? responseMessage : message; String alertMessage = (responseMessage != null && !responseMessage.isEmpty()) ? responseMessage : message;
@ -392,8 +395,7 @@ public class InAppWebChromeClient extends WebChromeClient {
} }
@Override @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(); WebView.HitTestResult result = view.getHitTestResult();
String data = result.getExtra(); String data = result.getExtra();
Map<String, Object> obj = new HashMap<>(); Map<String, Object> obj = new HashMap<>();
@ -405,7 +407,7 @@ public class InAppWebChromeClient extends WebChromeClient {
} }
@Override @Override
public void onGeolocationPermissionsShowPrompt (final String origin, final GeolocationPermissions.Callback callback) { public void onGeolocationPermissionsShowPrompt(final String origin, final GeolocationPermissions.Callback callback) {
Map<String, Object> obj = new HashMap<>(); Map<String, Object> obj = new HashMap<>();
if (inAppBrowserActivity != null) if (inAppBrowserActivity != null)
obj.put("uuid", inAppBrowserActivity.uuid); obj.put("uuid", inAppBrowserActivity.uuid);
@ -415,19 +417,19 @@ public class InAppWebChromeClient extends WebChromeClient {
public void success(Object o) { public void success(Object o) {
Map<String, Object> response = (Map<String, Object>) o; Map<String, Object> response = (Map<String, Object>) o;
if (response != null) if (response != null)
callback.invoke((String) response.get("origin"),(Boolean) response.get("allow"),(Boolean) response.get("retain")); callback.invoke((String) response.get("origin"), (Boolean) response.get("allow"), (Boolean) response.get("retain"));
else else
callback.invoke(origin,false,false); callback.invoke(origin, false, false);
} }
@Override @Override
public void error(String s, String s1, Object o) { public void error(String s, String s1, Object o) {
callback.invoke(origin,false,false); callback.invoke(origin, false, false);
} }
@Override @Override
public void notImplemented() { public void notImplemented() {
callback.invoke(origin,false,false); callback.invoke(origin, false, false);
} }
}); });
} }
@ -518,25 +520,35 @@ public class InAppWebChromeClient extends WebChromeClient {
public boolean onShowFileChooser( public boolean onShowFileChooser(
WebView webView, ValueCallback<Uri[]> filePathCallback, WebView webView, ValueCallback<Uri[]> filePathCallback,
FileChooserParams fileChooserParams) { FileChooserParams fileChooserParams) {
if (mUploadMessageArray != null) {
mUploadMessageArray.onReceiveValue(null);
}
mUploadMessageArray = filePathCallback; mUploadMessageArray = filePathCallback;
try {
Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT);
contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE);
contentSelectionIntent.setType("*/*");
Intent[] intentArray;
intentArray = new Intent[0];
Intent contentSelectionIntent = new Intent(Intent.ACTION_GET_CONTENT); Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER);
contentSelectionIntent.addCategory(Intent.CATEGORY_OPENABLE); chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent);
contentSelectionIntent.setType("*/*"); chooserIntent.putExtra(Intent.EXTRA_TITLE, "Image Chooser");
Intent[] intentArray; chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
intentArray = new Intent[0]; ((inAppBrowserActivity != null) ? inAppBrowserActivity : flutterWebView.activity).startActivityForResult(chooserIntent, FILECHOOSER_RESULTCODE);
} catch (ActivityNotFoundException e) {
Intent chooserIntent = new Intent(Intent.ACTION_CHOOSER); e.printStackTrace();
chooserIntent.putExtra(Intent.EXTRA_INTENT, contentSelectionIntent); return false;
chooserIntent.putExtra(Intent.EXTRA_TITLE, "Image Chooser"); }
chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, intentArray);
((inAppBrowserActivity != null) ? inAppBrowserActivity : flutterWebView.activity).startActivityForResult(chooserIntent, FILECHOOSER_RESULTCODE);
return true; 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() { private MethodChannel getChannel() {
return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel; return (inAppBrowserActivity != null) ? InAppBrowserFlutterPlugin.inAppBrowser.channel : flutterWebView.channel;
} }