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

Fixed webview anchor navigation

Browse source
This commit is contained in:
M66B 2019-05-03 10:37:14 +02:00
parent 39aa3512f5
commit ce633798a3
2 changed files with 6 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("email://", data[1], "text/html", "UTF-8", null); printWebView.loadDataWithBaseURL(null, data[1], "text/html", "UTF-8", null);
} }
@Override @Override

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

@ -1502,7 +1502,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("email://", themeHtml(original.html), "text/html", "UTF-8", null); webView.loadDataWithBaseURL(null, themeHtml(original.html), "text/html", "UTF-8", null);
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
tvBody.setVisibility(View.GONE); tvBody.setVisibility(View.GONE);
@ -1518,7 +1518,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("email://", themeHtml(html), "text/html", "UTF-8", null); webView.loadDataWithBaseURL(null, themeHtml(html), "text/html", "UTF-8", null);
pbBody.setVisibility(View.GONE); pbBody.setVisibility(View.GONE);
tvBody.setVisibility(View.GONE); tvBody.setVisibility(View.GONE);
@ -1575,7 +1575,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("email://", html, "text/html", "UTF-8", null); webView.loadDataWithBaseURL(null, 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);
@ -1905,6 +1905,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
private void onOpenLink(final Uri uri) { private void onOpenLink(final Uri uri) {
Log.i("Opening uri=" + uri);
if (BuildConfig.APPLICATION_ID.equals(uri.getHost()) && "/activate/".equals(uri.getPath())) { if (BuildConfig.APPLICATION_ID.equals(uri.getHost()) && "/activate/".equals(uri.getPath())) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context); LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
lbm.sendBroadcast( lbm.sendBroadcast(