msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Always confirm links in junk messages

Browse Source
pull/210/head
M66B 2 years ago
parent 19e4950152
commit 101371854b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

22
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -619,7 +619,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
Uri uri = Uri.parse(image[0].getSource()); Uri uri = Uri.parse(image[0].getSource());
if (UriHelper.isHyperLink(uri)) { if (UriHelper.isHyperLink(uri)) {
ripple(event); ripple(event);
if (onOpenLink(uri, null, false)) if (onOpenLink(uri, null, EntityFolder.JUNK.equals(message.folderType)))
return true; return true;
} }
} }
@ -638,7 +638,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
title = null; title = null;
ripple(event); ripple(event);
if (onOpenLink(uri, title, false)) if (onOpenLink(uri, title, EntityFolder.JUNK.equals(message.folderType)))
return true; return true;
} }
@ -649,7 +649,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return true; return true;
ripple(event); ripple(event);
onOpenImage(message.id, image[0].getSource()); onOpenImage(message.id, image[0].getSource(), EntityFolder.JUNK.equals(message.folderType));
return true; return true;
} }
@ -2792,7 +2792,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
return false; return false;
Uri uri = Uri.parse(url); Uri uri = Uri.parse(url);
return ViewHolder.this.onOpenLink(uri, null, false); return ViewHolder.this.onOpenLink(uri, null, EntityFolder.JUNK.equals(message.folderType));
} }
}); });
webView.setImages(show_images, inline); webView.setImages(show_images, inline);
@ -5414,7 +5414,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void onActionUnsubscribe(TupleMessageEx message) { private void onActionUnsubscribe(TupleMessageEx message) {
Uri uri = Uri.parse(message.unsubscribe); Uri uri = Uri.parse(message.unsubscribe);
onOpenLink(uri, context.getString(R.string.title_legend_show_unsubscribe), true); onOpenLink(uri,
context.getString(R.string.title_legend_show_unsubscribe),
EntityFolder.JUNK.equals(message.folderType));
} }
private void onActionDecrypt(TupleMessageEx message, boolean auto) { private void onActionDecrypt(TupleMessageEx message, boolean auto) {
@ -5873,7 +5875,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
private boolean onOpenLink(Uri uri, String title, boolean always_confirm) { private boolean onOpenLink(Uri uri, String title, boolean always_confirm) {
Log.i("Opening uri=" + uri + " title=" + title); Log.i("Opening uri=" + uri + " title=" + title + " always confirm=" + always_confirm);
uri = Uri.parse(uri.toString().replaceAll("\\s+", "")); uri = Uri.parse(uri.toString().replaceAll("\\s+", ""));
if (ProtectedContent.isProtectedContent(uri)) { if (ProtectedContent.isProtectedContent(uri)) {
@ -5958,7 +5960,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
"/activate/".equals(uri.getPath())); "/activate/".equals(uri.getPath()));
} }
private void onOpenImage(long id, @NonNull String source) { private void onOpenImage(long id, @NonNull String source, boolean always_confirm) {
Log.i("Viewing image source=" + source); Log.i("Viewing image source=" + source);
Uri uri = Uri.parse(source); Uri uri = Uri.parse(source);
@ -5993,10 +5995,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
} }
}.execute(context, owner, args, "view:cid"); }.execute(context, owner, args, "view:cid");
else if ("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme)) else if ("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme)) {
onOpenLink(uri, null, false); onOpenLink(uri, null, always_confirm);
else if ("data".equals(scheme)) } else if ("data".equals(scheme))
new SimpleTask<File>() { new SimpleTask<File>() {
@Override @Override
protected File onExecute(Context context, Bundle args) throws IOException { protected File onExecute(Context context, Bundle args) throws IOException {

Write Preview
Loading…
Cancel
Save