From 67527c651377d963fd501b5ecd1fdf5f14a75a0b Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 13 Nov 2023 17:11:15 +0100 Subject: [PATCH] DMARC viewer improvements --- app/src/amazon/AndroidManifest.xml | 2 +- app/src/debug/AndroidManifest.xml | 2 +- app/src/fdroid/AndroidManifest.xml | 2 +- app/src/github/AndroidManifest.xml | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../java/eu/faircode/email/ActivityDmarc.java | 20 +++++++++---------- app/src/main/res/values/strings.xml | 1 + app/src/play/AndroidManifest.xml | 2 +- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml index 9b560becea..f9d21261af 100644 --- a/app/src/amazon/AndroidManifest.xml +++ b/app/src/amazon/AndroidManifest.xml @@ -490,7 +490,7 @@ android:description="@string/title_advanced_dmarc_viewer" android:exported="true" android:icon="@mipmap/ic_launcher" - android:label="DMARC" + android:label="@string/app_dmarc" android:launchMode="singleInstance" android:resizeableActivity="true"> diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index f873dbb8ef..e6bc1ab954 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -497,7 +497,7 @@ android:enabled="true" android:exported="true" android:icon="@mipmap/ic_launcher" - android:label="DMARC" + android:label="@string/app_dmarc" android:launchMode="singleInstance" android:resizeableActivity="true"> diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml index 7d9507752a..0be1abcfc5 100644 --- a/app/src/fdroid/AndroidManifest.xml +++ b/app/src/fdroid/AndroidManifest.xml @@ -496,7 +496,7 @@ android:description="@string/title_advanced_dmarc_viewer" android:exported="true" android:icon="@mipmap/ic_launcher" - android:label="DMARC" + android:label="@string/app_dmarc" android:launchMode="singleInstance" android:resizeableActivity="true"> diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml index 5a9df5e35f..3e9db62678 100644 --- a/app/src/github/AndroidManifest.xml +++ b/app/src/github/AndroidManifest.xml @@ -496,7 +496,7 @@ android:enabled="true" android:exported="true" android:icon="@mipmap/ic_launcher" - android:label="DMARC" + android:label="@string/app_dmarc" android:launchMode="singleInstance" android:resizeableActivity="true"> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 595eadd698..ddf0f639bf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -491,7 +491,7 @@ android:description="@string/title_advanced_dmarc_viewer" android:exported="true" android:icon="@mipmap/ic_launcher" - android:label="DMARC" + android:label="@string/app_dmarc" android:launchMode="singleInstance" android:resizeableActivity="true"> diff --git a/app/src/main/java/eu/faircode/email/ActivityDmarc.java b/app/src/main/java/eu/faircode/email/ActivityDmarc.java index b286039870..ec1d7dac35 100644 --- a/app/src/main/java/eu/faircode/email/ActivityDmarc.java +++ b/app/src/main/java/eu/faircode/email/ActivityDmarc.java @@ -300,7 +300,7 @@ public class ActivityDmarc extends ActivityBase { continue; if (ConnectionHelper.inSubnet(text, net[0], prefix)) { valid = allow; - because = ip + " in " + p.first; + because = (allow ? '+' : '-') + ip + " in " + p.first; } } else if ("a".equals(ip) || ip.startsWith("a:")) { String domain = (ip.startsWith("a:") @@ -321,13 +321,13 @@ public class ActivityDmarc extends ActivityBase { if (prefix == null) { if (text.equals(a.response)) { valid = allow; - because = ip + " in " + domain; + because = (allow ? '+' : '-') + ip + " in " + domain; break; } } else { if (ConnectionHelper.inSubnet(text, a.response, prefix)) { valid = allow; - because = ip + " in " + domain + "/" + prefix; + because = (allow ? '+' : '-') + ip + " in " + domain + "/" + prefix; break; } } @@ -354,13 +354,13 @@ public class ActivityDmarc extends ActivityBase { if (prefix == null) { if (text.equals(a.response)) { valid = allow; - because = ip + " in " + domain; + because = (allow ? '+' : '-') + ip + " in " + domain; break; } } else { if (ConnectionHelper.inSubnet(text, a.response, prefix)) { valid = allow; - because = ip + " in " + domain + "/" + prefix; + because = (allow ? '+' : '-') + ip + " in " + domain + "/" + prefix; break; } } @@ -372,7 +372,7 @@ public class ActivityDmarc extends ActivityBase { } } else if ("ptr".equals(ip) || ip.startsWith("ptr:")) { valid = false; - because = ip + " ptr not supported"; + because = (allow ? '+' : '-') + ip + " ptr not supported"; } if (valid != null) break; @@ -502,13 +502,11 @@ public class ActivityDmarc extends ActivityBase { spf = lookupSpf(context, lastDomain, extra); for (Pair p : spf) { ssb.append(p.first).append(' ') - .append(p.second.response).append("\n"); - if (start == null) { + .append(p.second.response).append("\n\n"); + if (start == null) start = ssb.length(); - ssb.append("\n"); - } } - ssb.append('\n').append(extra); + ssb.append(extra); if (start != null) { ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), start, ssb.length(), 0); ssb.append("\n"); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab7649b9cf..3fb7381966 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ Minimum required storage space: %1$s Last update: %1$s Downloaded from: %1$s + DMARC Monitor Send diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml index 4ed54b3cba..6ae6539a57 100644 --- a/app/src/play/AndroidManifest.xml +++ b/app/src/play/AndroidManifest.xml @@ -490,7 +490,7 @@ android:description="@string/title_advanced_dmarc_viewer" android:exported="true" android:icon="@mipmap/ic_launcher" - android:label="DMARC" + android:label="@string/app_dmarc" android:launchMode="singleInstance" android:resizeableActivity="true">