From 85e991dacd3efb01981d35dcba97e8bd126d55a7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 23 Jun 2021 12:13:59 +0200
Subject: [PATCH] Confirm images/HTML/link more options

---
 .../main/java/eu/faircode/email/AdapterMessage.java  | 12 ++++++++++++
 .../eu/faircode/email/FragmentDialogOpenLink.java    | 12 ++++++++++++
 .../main/java/eu/faircode/email/FragmentOptions.java |  2 ++
 app/src/main/res/layout/dialog_open_link.xml         | 10 ++++++++++
 app/src/main/res/layout/dialog_show_full.xml         | 10 ++++++++++
 app/src/main/res/layout/dialog_show_images.xml       | 10 ++++++++++
 6 files changed, 56 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2f3062ed54..8417995db3 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3886,6 +3886,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     full ? R.layout.dialog_show_full : R.layout.dialog_show_images, null);
             CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
             CheckBox cbNotAgainDomain = dview.findViewById(R.id.cbNotAgainDomain);
+            Button btnMore = dview.findViewById(R.id.btnMore);
 
             if (message.from == null || message.from.length == 0) {
                 cbNotAgain.setVisibility(View.GONE);
@@ -3914,6 +3915,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
             });
 
+            btnMore.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent privacy = new Intent(v.getContext(), ActivitySetup.class)
+                            .setAction("privacy")
+                            .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                            .putExtra("tab", "privacy");
+                    v.getContext().startActivity(privacy);
+                }
+            });
+
             if (full) {
                 TextView tvDark = dview.findViewById(R.id.tvDark);
                 CheckBox cbDark = dview.findViewById(R.id.cbDark);
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 7f51798892..75ccdfef6f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -145,6 +145,7 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
         final TextView tvHost = dview.findViewById(R.id.tvHost);
         final TextView tvOwner = dview.findViewById(R.id.tvOwner);
         final CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
+        final Button btnMore = dview.findViewById(R.id.btnMore);
         final Group grpDifferent = dview.findViewById(R.id.grpDifferent);
         final Group grpOwner = dview.findViewById(R.id.grpOwner);
 
@@ -261,6 +262,17 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
             }
         });
 
+        btnMore.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent privacy = new Intent(v.getContext(), ActivitySetup.class)
+                        .setAction("privacy")
+                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra("tab", "privacy");
+                v.getContext().startActivity(privacy);
+            }
+        });
+
         tvOwnerRemark.setMovementMethod(LinkMovementMethod.getInstance());
         cbNotAgain.setText(context.getString(R.string.title_no_ask_for_again, uri.getHost()));
         cbNotAgain.setVisibility(
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index be88be75bf..f1f3667939 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -178,6 +178,8 @@ public class FragmentOptions extends FragmentBase {
             pager.setCurrentItem(3);
         else if ("display".equals(tab))
             pager.setCurrentItem(4);
+        else if ("privacy".equals(tab))
+            pager.setCurrentItem(6);
         else if ("encryption".equals(tab))
             pager.setCurrentItem(7);
         else if ("misc".equals(tab))
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 0b65b23ba0..4907979e9e 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -243,6 +243,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvOwner" />
 
+        <Button
+            android:id="@+id/btnMore"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_more"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpDifferent"
             android:layout_width="0dp"
diff --git a/app/src/main/res/layout/dialog_show_full.xml b/app/src/main/res/layout/dialog_show_full.xml
index 960fd4970e..936ee62c95 100644
--- a/app/src/main/res/layout/dialog_show_full.xml
+++ b/app/src/main/res/layout/dialog_show_full.xml
@@ -72,5 +72,15 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
+
+        <Button
+            android:id="@+id/btnMore"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_more"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbNotAgainDomain" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </eu.faircode.email.ScrollViewEx>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index 242c139148..0d5f539610 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -76,6 +76,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbNotAgain" />
 
+        <Button
+            android:id="@+id/btnMore"
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:text="@string/title_advanced_more"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cbNotAgainDomain" />
+
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpTracking"
             android:layout_width="0dp"