mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Use about:blank as base URL

Browse source
This commit is contained in:
M66B 2019-05-03 10:53:34 +02:00
parent c5ced1e885
commit 73a2b149e8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/ActivityView.java
View file

@ -1241,7 +1241,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
} }
}); });
printWebView.loadDataWithBaseURL(null, data[1], "text/html", "UTF-8", null); printWebView.loadDataWithBaseURL("about:blank", data[1], "text/html", "UTF-8", null);
} }
@Override @Override

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

@ -1446,6 +1446,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}; };
setupWebView(webView); setupWebView(webView);
webView.setScrollContainer(false);
webView.setId(vwBody.getId()); webView.setId(vwBody.getId());
webView.setVisibility(vwBody.getVisibility()); webView.setVisibility(vwBody.getVisibility());
@ -1512,7 +1513,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setVisibility(View.VISIBLE); ibFull.setVisibility(View.VISIBLE);
ibImages.setVisibility(show_images ? View.GONE : View.VISIBLE); ibImages.setVisibility(show_images ? View.GONE : View.VISIBLE);
webView.loadDataWithBaseURL(null, themeHtml(original.html), "text/html", "UTF-8", null); webView.loadDataWithBaseURL("about:blank", themeHtml(original.html), "text/html", "UTF-8", null);
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
tvBody.setVisibility(View.GONE); tvBody.setVisibility(View.GONE);
@ -1528,7 +1529,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibFull.setVisibility(View.VISIBLE); ibFull.setVisibility(View.VISIBLE);
ibImages.setVisibility(show_images ? View.GONE : View.VISIBLE); ibImages.setVisibility(show_images ? View.GONE : View.VISIBLE);
webView.loadDataWithBaseURL(null, themeHtml(html), "text/html", "UTF-8", null); webView.loadDataWithBaseURL("about:blank", themeHtml(html), "text/html", "UTF-8", null);
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
tvBody.setVisibility(View.GONE); tvBody.setVisibility(View.GONE);
@ -1585,7 +1586,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
settings.setDisplayZoomControls(false); settings.setDisplayZoomControls(false);
String html = properties.getHtml(message.id); String html = properties.getHtml(message.id);
webView.loadDataWithBaseURL(null, html, "text/html", "UTF-8", null); webView.loadDataWithBaseURL("about:blank", html, "text/html", "UTF-8", null);
final Dialog dialog = new Dialog(context, android.R.style.Theme_Black_NoTitleBar_Fullscreen); final Dialog dialog = new Dialog(context, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
dialog.setContentView(webView); dialog.setContentView(webView);