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

Check URI against block lists

Browse source
This commit is contained in:
M66B 2021-08-08 12:57:55 +02:00
parent df90a94e7b
commit 76e99796a5
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/DnsBlockList.java
View file

@ -24,6 +24,7 @@ import android.content.SharedPreferences;
import android.net.Uri;
import android.text.TextUtils;
import androidx.core.net.MailTo;
import androidx.preference.PreferenceManager;
import java.net.Inet4Address;
@ -162,7 +163,17 @@ public class DnsBlockList {
return (hasDomain ? false : null);
}
static Boolean isJunk(Context context, String domain) {
static Boolean isJunk(Context context, Uri uri) {
String domain = null;
if ("mailto".equalsIgnoreCase(uri.getScheme())) {
MailTo email = MailTo.parse(uri.toString());
domain = UriHelper.getEmailDomain(email.getTo());
} else
domain = uri.getHost();
if (domain == null)
return null;
return isJunk(context, domain, false, BLOCK_LISTS);
}

6
app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
View file

@ -408,13 +408,13 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
if (check_links_dbl &&
tvSuspicious.getVisibility() != View.VISIBLE) {
Bundle args = new Bundle();
args.putString("host", host);
args.putParcelable("uri", uri);
new SimpleTask<Boolean>() {
@Override
protected Boolean onExecute(Context context, Bundle args) throws Throwable {
String host = args.getString("host");
return DnsBlockList.isJunk(context, host);
Uri uri = args.getParcelable("uri");
return DnsBlockList.isJunk(context, uri);
}
@Override