mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-23 22:51:02 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2019-09-20 19:39:37 +02:00
parent b2773f03b6
commit 164b98b429
3 changed files with 91 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

155
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -3909,96 +3909,40 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
boolean show_images = getArguments().getBoolean("show_images");
float textSize = getArguments().getFloat("text_size");
final View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_webview, null);
final WebView webView = dview.findViewById(R.id.webView);
final ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
boolean show_images = getArguments().getBoolean("show_images");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean inline = prefs.getBoolean("inline_images", false);
boolean autocontent = prefs.getBoolean("autocontent", false);
setupWebView(webView);
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_webview, null);
WebView webView = dview.findViewById(R.id.webView);
ContentLoadingProgressBar pbWait = dview.findViewById(R.id.pbWait);
WebSettings settings = webView.getSettings();
settings.setDefaultFontSize(Math.round(textSize));
settings.setDefaultFixedFontSize(Math.round(textSize));
settings.setLoadsImagesAutomatically(show_images || inline);
settings.setBlockNetworkLoads(!show_images && !autocontent);
settings.setBlockNetworkImage(!show_images && !autocontent);
settings.setUseWideViewPort(true);
settings.setLoadWithOverviewMode(true);
settings.setBuiltInZoomControls(true);
settings.setDisplayZoomControls(false);
Dialog dialog = new Dialog(getContext(), android.R.style.Theme_Light_NoTitleBar_Fullscreen);
dialog.setContentView(dview);
settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING);
new SimpleTask<String>() {
@Override
protected void onPreExecute(Bundle args) {
webView.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
}
if (textSize != 0) {
settings.setDefaultFontSize(Math.round(textSize));
settings.setDefaultFixedFontSize(Math.round(textSize));
}
boolean monospaced = prefs.getBoolean("monospaced", false);
if (monospaced)
settings.setStandardFontFamily("monospace");
@Override
protected void onPostExecute(Bundle args) {
pbWait.setVisibility(View.GONE);
}
settings.setAllowFileAccess(false);
settings.setLoadsImagesAutomatically(show_images || inline);
settings.setBlockNetworkLoads(!show_images && !autocontent);
settings.setBlockNetworkImage(!show_images && !autocontent);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
@Override
protected String onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityMessage message = db.message().getMessage(id);
if (message == null || !message.content)
return null;
File file = message.getFile(context);
if (!file.exists())
return null;
String html = HtmlHelper.getHtmlEmbedded(context, id, Helper.readText(file));
// Remove viewport limitations
Document doc = Jsoup.parse(html);
for (Element meta : doc.select("meta").select("[name=viewport]")) {
String content = meta.attr("content");
String[] params = content.split(";");
if (params.length > 0) {
List<String> viewport = new ArrayList<>();
for (String param : params)
if (!param.toLowerCase().contains("maximum-scale") &&
!param.toLowerCase().contains("user-scalable"))
viewport.add(param.trim());
if (viewport.size() == 0)
meta.attr("content", "");
else
meta.attr("content", TextUtils.join(" ;", viewport) + ";");
}
}
return doc.html();
}
@Override
protected void onExecuted(Bundle args, String html) {
webView.loadDataWithBaseURL("", html, "text/html", "UTF-8", null);
webView.setVisibility(View.VISIBLE);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(this, getArguments(), "message:full");
return dialog;
}
private void setupWebView(WebView webView) {
webView.setWebViewClient(new WebViewClient() {
public boolean shouldOverrideUrlLoading(WebView view, String url) {
Log.i("Open url=" + url);
@ -4056,17 +4000,56 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
});
WebSettings settings = webView.getSettings();
settings.setUseWideViewPort(true);
settings.setLoadWithOverviewMode(true);
settings.setLayoutAlgorithm(WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING);
settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
settings.setAllowFileAccess(false);
Dialog dialog = new Dialog(getContext(), android.R.style.Theme_Light_NoTitleBar_Fullscreen);
dialog.setContentView(dview);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean monospaced = prefs.getBoolean("monospaced", false);
if (monospaced)
settings.setStandardFontFamily("monospace");
new SimpleTask<String>() {
@Override
protected void onPreExecute(Bundle args) {
webView.setVisibility(View.GONE);
pbWait.setVisibility(View.VISIBLE);
}
@Override
protected void onPostExecute(Bundle args) {
pbWait.setVisibility(View.GONE);
}
@Override
protected String onExecute(Context context, Bundle args) throws Throwable {
long id = args.getLong("id");
DB db = DB.getInstance(context);
EntityMessage message = db.message().getMessage(id);
if (message == null || !message.content)
return null;
File file = message.getFile(context);
if (!file.exists())
return null;
String html = Helper.readText(file);
Document doc = Jsoup.parse(html);
HtmlHelper.removeViewportLimitations(doc);
HtmlHelper.embedImages(context, id, doc);
return doc.html();
}
@Override
protected void onExecuted(Bundle args, String html) {
webView.loadDataWithBaseURL("", html, "text/html", "UTF-8", null);
webView.setVisibility(View.VISIBLE);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Helper.unexpectedError(getFragmentManager(), ex);
}
}.execute(this, getArguments(), "message:full");
return dialog;
}
}

4
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -4475,9 +4475,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return null;
String html = Helper.readText(file);
html = HtmlHelper.getHtmlEmbedded(context, id, html);
Document document = Jsoup.parse(html);
HtmlHelper.embedImages(context, id, document);
Element body = document.body();
if (body != null) {
Element p = document.createElement("p");

25
app/src/main/java/eu/faircode/email/HtmlHelper.java
View file

@ -781,11 +781,9 @@ public class HtmlHelper {
return sb.toString();
}
static String getHtmlEmbedded(Context context, long id, String html) throws IOException {
static void embedImages(Context context, long id, Document document) throws IOException {
DB db = DB.getInstance(context);
Document doc = Jsoup.parse(html);
for (Element img : doc.select("img")) {
for (Element img : document.select("img")) {
String src = img.attr("src");
if (src.startsWith("cid:")) {
String cid = '<' + src.substring(4) + '>';
@ -808,8 +806,25 @@ public class HtmlHelper {
}
}
}
}
return doc.html();
static void removeViewportLimitations(Document document) {
for (Element meta : document.select("meta").select("[name=viewport]")) {
String content = meta.attr("content");
String[] params = content.split(";");
if (params.length > 0) {
List<String> viewport = new ArrayList<>();
for (String param : params)
if (!param.toLowerCase().contains("maximum-scale") &&
!param.toLowerCase().contains("user-scalable"))
viewport.add(param.trim());
if (viewport.size() == 0)
meta.attr("content", "");
else
meta.attr("content", TextUtils.join(" ;", viewport) + ";");
}
}
}
private static boolean isTrackingPixel(Element img) {