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

Merge branch 'vespr-wallet-fix/imm'

This commit is contained in:
Lorenzo Pichilli 2023-11-10 21:12:46 +01:00
parent e62348adc7 adcfdce7ed
commit fd96023945
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
android/src/main/java/com/pichillilorenzo/flutter_inappwebview/webview/in_app_webview/InAppWebView.java
View File

@ -660,7 +660,7 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
if (plugin == null) { if (plugin == null) {
return; return;
} }
loadUrl(Util.getUrlAsset(plugin, assetFilePath)); loadUrl(Util.getUrlAsset(plugin, assetFilePath));
} }
@ -690,7 +690,7 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
public void takeScreenshot(final @Nullable Map<String, Object> screenshotConfiguration, final MethodChannel.Result result) { public void takeScreenshot(final @Nullable Map<String, Object> screenshotConfiguration, final MethodChannel.Result result) {
final float pixelDensity = Util.getPixelDensity(getContext()); final float pixelDensity = Util.getPixelDensity(getContext());
mainLooperHandler.post(new Runnable() { mainLooperHandler.post(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -1392,9 +1392,9 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
if (printManager != null) { if (printManager != null) {
PrintAttributes.Builder builder = new PrintAttributes.Builder(); PrintAttributes.Builder builder = new PrintAttributes.Builder();
String jobName = (getTitle() != null ? getTitle() : getUrl()) + " Document"; String jobName = (getTitle() != null ? getTitle() : getUrl()) + " Document";
if (settings != null) { if (settings != null) {
if (settings.jobName != null && !settings.jobName.isEmpty()) { if (settings.jobName != null && !settings.jobName.isEmpty()) {
jobName = settings.jobName; jobName = settings.jobName;
@ -1445,7 +1445,7 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
String id = UUID.randomUUID().toString(); String id = UUID.randomUUID().toString();
PrintJobController printJobController = new PrintJobController(id, job, settings, plugin); PrintJobController printJobController = new PrintJobController(id, job, settings, plugin);
plugin.printJobManager.jobs.put(printJobController.id, printJobController); plugin.printJobManager.jobs.put(printJobController.id, printJobController);
return id; return id;
} }
} else { } else {
Log.e(LOG_TAG, "No PrintManager available"); Log.e(LOG_TAG, "No PrintManager available");
@ -1525,7 +1525,17 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
public void run() { public void run() {
InputMethodManager imm = InputMethodManager imm =
(InputMethodManager) getContext().getSystemService(INPUT_METHOD_SERVICE); (InputMethodManager) getContext().getSystemService(INPUT_METHOD_SERVICE);
if (containerView != null && imm != null && !imm.isAcceptingText()) {
boolean isAcceptingText = false;
if (imm != null) {
try {
// imm.isAcceptingText() seems to sometimes crash on some devices
isAcceptingText = imm.isAcceptingText();
} catch (Exception ignored) {
}
}
if (containerView != null && imm != null && !isAcceptingText) {
imm.hideSoftInputFromWindow( imm.hideSoftInputFromWindow(
containerView.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); containerView.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS);
} }
@ -1710,7 +1720,7 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
public void hideContextMenu() { public void hideContextMenu() {
removeView(floatingContextMenu); removeView(floatingContextMenu);
floatingContextMenu = null; floatingContextMenu = null;
if (channelDelegate != null) channelDelegate.onHideContextMenu(); if (channelDelegate != null) channelDelegate.onHideContextMenu();
} }
@ -1996,7 +2006,7 @@ final public class InAppWebView extends InputAwareWebView implements InAppWebVie
public WebViewChannelDelegate getChannelDelegate() { public WebViewChannelDelegate getChannelDelegate() {
return channelDelegate; return channelDelegate;
} }
@Override @Override
public void setChannelDelegate(@Nullable WebViewChannelDelegate channelDelegate) { public void setChannelDelegate(@Nullable WebViewChannelDelegate channelDelegate) {
this.channelDelegate = channelDelegate; this.channelDelegate = channelDelegate;