Added BIMI privacy warning

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.
 

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) {

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";

app/src/main/res/layout/fragment_options_display.xml

@@ -497,11 +497,24 @@
                     app:layout_constraintTop_toBottomOf="@id/swAvatars"
                     app:switchPadding="12dp" />
 
+                <eu.faircode.email.FixedTextView
+                    android:id="@+id/tvBimiHint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
+                    android:drawablePadding="6dp"
+                    android:drawableTint="?attr/colorWarning"
+                    android:text="@string/title_advanced_gravatars_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?attr/colorWarning"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swBimi" />
+
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvBimiUnverified"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:drawableStart="@drawable/twotone_check_24"
                     android:drawablePadding="6dp"
@@ -510,13 +523,12 @@
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textStyle="italic"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swBimi" />
+                    app:layout_constraintTop_toBottomOf="@id/tvBimiHint" />
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvBimiVerified"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:drawableStart="@drawable/twotone_done_all_24"
                     android:drawablePadding="6dp"
@@ -531,7 +543,6 @@
                     android:id="@+id/ibBimi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
                     android:layout_marginTop="6dp"
                     android:contentDescription="@string/title_info"
                     android:tooltipText="@string/title_info"
@@ -554,6 +565,7 @@
                     android:id="@+id/tvGravatarsHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
                     android:drawableTint="?attr/colorWarning"
@@ -578,6 +590,7 @@
                     android:id="@+id/tvFaviconsHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
                     android:drawableTint="?attr/colorWarning"