From dd9045dd28b2227490002b72c8d866da5e981b45 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 16 Jul 2021 18:39:06 +0200 Subject: [PATCH] Added BIMI privacy warning --- PRIVACY.md | 4 +++- .../email/FragmentOptionsDisplay.java | 14 +++++++++++-- .../main/java/eu/faircode/email/Helper.java | 1 + .../res/layout/fragment_options_display.xml | 21 +++++++++++++++---- 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index efeb796d07..e1076d7217 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -30,7 +30,9 @@ FairEmail **can use** these services if they are explicitly enabled (off by defa * [Thunderbird autoconfiguration](https://developer.mozilla.org/docs/Mozilla/Thunderbird/Autoconfiguration) – [Privacy policy](https://www.mozilla.org/privacy/) FairEmail **can access** the websites at the domain names of email addresses -if [favicons](https://en.wikipedia.org/wiki/Favicon) are explicitly enabled (off by default). +if [Brand Indicators for Message Identification](https://en.wikipedia.org/wiki/Brand_Indicators_for_Message_Identification) (BIMI) +or [favicons](https://en.wikipedia.org/wiki/Favicon) +are explicitly enabled (off by default). FairEmail **will** obvously access the configured email servers. diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index 45d8cc0035..4e462cc2d8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -85,10 +85,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer private ViewButtonColor btnHighlightColor; private SwitchCompat swColorStripe; private SwitchCompat swAvatars; - private SwitchCompat swBimi; private ImageButton ibBimi; - private TextView tvGravatarsHint; + private TextView tvBimiHint; + private SwitchCompat swBimi; private SwitchCompat swGravatars; + private TextView tvGravatarsHint; private SwitchCompat swFavicons; private TextView tvFaviconsHint; private SwitchCompat swGeneratedIcons; @@ -202,6 +203,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer swColorStripe = view.findViewById(R.id.swColorStripe); swAvatars = view.findViewById(R.id.swAvatars); swBimi = view.findViewById(R.id.swBimi); + tvBimiHint = view.findViewById(R.id.tvBimiHint); ibBimi = view.findViewById(R.id.ibBimi); swGravatars = view.findViewById(R.id.swGravatars); tvGravatarsHint = view.findViewById(R.id.tvGravatarsHint); @@ -476,6 +478,14 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer } }); + tvBimiHint.getPaint().setUnderlineText(true); + tvBimiHint.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.view(v.getContext(), Uri.parse(Helper.BIMI_PRIVACY_URI), true); + } + }); + ibBimi.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index bac66a5334..a462f1a8eb 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -156,6 +156,7 @@ public class Helper { static final String XDA_URI = "https://forum.xda-developers.com/showthread.php?t=3824168"; static final String SUPPORT_URI = "https://contact.faircode.eu/?product=fairemailsupport&version=" + BuildConfig.VERSION_NAME; static final String TEST_URI = "https://play.google.com/apps/testing/" + BuildConfig.APPLICATION_ID; + static final String BIMI_PRIVACY_URI = "https://datatracker.ietf.org/doc/html/draft-brotman-ietf-bimi-guidance-03#section-7.4"; static final String FAVICON_PRIVACY_URI = "https://en.wikipedia.org/wiki/Favicon"; static final String GRAVATAR_PRIVACY_URI = "https://en.wikipedia.org/wiki/Gravatar"; static final String LICENSE_URI = "https://www.gnu.org/licenses/gpl-3.0.html"; diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml index eea66fb42a..fb2d7e4f75 100644 --- a/app/src/main/res/layout/fragment_options_display.xml +++ b/app/src/main/res/layout/fragment_options_display.xml @@ -497,11 +497,24 @@ app:layout_constraintTop_toBottomOf="@id/swAvatars" app:switchPadding="12dp" /> + + + app:layout_constraintTop_toBottomOf="@id/tvBimiHint" />