|
@@ -86,7 +86,7 @@ public abstract class EditorWebView extends ExternalSiteWebView {
|
|
if (this.getWebView().getVisibility() != View.VISIBLE) {
|
|
if (this.getWebView().getVisibility() != View.VISIBLE) {
|
|
Snackbar snackbar = DisplayUtils.createSnackbar(findViewById(android.R.id.content),
|
|
Snackbar snackbar = DisplayUtils.createSnackbar(findViewById(android.R.id.content),
|
|
R.string.timeout_richDocuments, Snackbar.LENGTH_INDEFINITE)
|
|
R.string.timeout_richDocuments, Snackbar.LENGTH_INDEFINITE)
|
|
- .setAction(R.string.common_back, v -> closeView());
|
|
|
|
|
|
+ .setAction(R.string.common_cancel, v -> closeView());
|
|
|
|
|
|
viewThemeUtils.material.themeSnackbar(snackbar);
|
|
viewThemeUtils.material.themeSnackbar(snackbar);
|
|
setLoadingSnackbar(snackbar);
|
|
setLoadingSnackbar(snackbar);
|
|
@@ -115,7 +115,7 @@ public abstract class EditorWebView extends ExternalSiteWebView {
|
|
super.postOnCreate();
|
|
super.postOnCreate();
|
|
|
|
|
|
getWebView().setWebChromeClient(new WebChromeClient() {
|
|
getWebView().setWebChromeClient(new WebChromeClient() {
|
|
- EditorWebView activity = EditorWebView.this;
|
|
|
|
|
|
+ final EditorWebView activity = EditorWebView.this;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback,
|
|
public boolean onShowFileChooser(WebView webView, ValueCallback<Uri[]> filePathCallback,
|
|
@@ -178,14 +178,8 @@ public abstract class EditorWebView extends ExternalSiteWebView {
|
|
}
|
|
}
|
|
|
|
|
|
protected void handleActivityResult(int requestCode, int resultCode, Intent data) {
|
|
protected void handleActivityResult(int requestCode, int resultCode, Intent data) {
|
|
- switch (requestCode) {
|
|
|
|
- case REQUEST_LOCAL_FILE:
|
|
|
|
- handleLocalFile(data, resultCode);
|
|
|
|
- break;
|
|
|
|
-
|
|
|
|
- default:
|
|
|
|
- // unexpected, do nothing
|
|
|
|
- break;
|
|
|
|
|
|
+ if (requestCode == REQUEST_LOCAL_FILE) {
|
|
|
|
+ handleLocalFile(data, resultCode);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -251,7 +245,7 @@ public abstract class EditorWebView extends ExternalSiteWebView {
|
|
}
|
|
}
|
|
|
|
|
|
if ("image/png".equalsIgnoreCase(file.getMimeType())) {
|
|
if ("image/png".equalsIgnoreCase(file.getMimeType())) {
|
|
- binding.thumbnail.setBackgroundColor(getResources().getColor(R.color.bg_default));
|
|
|
|
|
|
+ binding.thumbnail.setBackgroundColor(getResources().getColor(R.color.bg_default, getTheme()));
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
Drawable icon = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
|
|
Drawable icon = MimeTypeUtil.getFileTypeIcon(file.getMimeType(),
|
|
@@ -278,10 +272,6 @@ public abstract class EditorWebView extends ExternalSiteWebView {
|
|
downloadmanager.enqueue(request);
|
|
downloadmanager.enqueue(request);
|
|
}
|
|
}
|
|
|
|
|
|
- public Snackbar getLoadingSnackbar() {
|
|
|
|
- return this.loadingSnackbar;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
public void setLoadingSnackbar(Snackbar loadingSnackbar) {
|
|
public void setLoadingSnackbar(Snackbar loadingSnackbar) {
|
|
this.loadingSnackbar = loadingSnackbar;
|
|
this.loadingSnackbar = loadingSnackbar;
|
|
}
|
|
}
|