From e3619e3b2484cdbdbe56ca3f9ff6734bd425c378 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 26 Aug 2023 22:37:08 +0200
Subject: [PATCH] Revert "Added option to disable priority indicator"

This reverts commit c687019c8c08581c739b325cc489b140d3f30f02.
---
 .../java/eu/faircode/email/AdapterMessage.java  | 17 ++++++-----------
 .../java/eu/faircode/email/FragmentOptions.java |  2 +-
 .../faircode/email/FragmentOptionsDisplay.java  | 12 +-----------
 .../res/layout/fragment_options_display.xml     | 13 +------------
 app/src/main/res/values/strings.xml             |  1 -
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e3a7454445..6f44c3d040 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -291,7 +291,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private String subject_ellipsize;
 
     private boolean show_filtered;
-    private boolean priority_indicator;
     private boolean keywords_header;
     private boolean labels_header;
     private boolean flags;
@@ -1383,15 +1382,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             } else
                 ibAuth.setVisibility(View.GONE);
 
-            if (priority_indicator || outgoing) {
-                if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority)) {
-                    ibPriority.setImageLevel(message.ui_priority);
-                    ibPriority.setVisibility(View.VISIBLE);
-                } else if (EntityMessage.PRIORITIY_LOW.equals(message.ui_priority)) {
-                    ibPriority.setImageLevel(message.ui_priority);
-                    ibPriority.setVisibility(View.VISIBLE);
-                } else
-                    ibPriority.setVisibility(View.GONE);
+            if (EntityMessage.PRIORITIY_HIGH.equals(message.ui_priority)) {
+                ibPriority.setImageLevel(message.ui_priority);
+                ibPriority.setVisibility(View.VISIBLE);
+            } else if (EntityMessage.PRIORITIY_LOW.equals(message.ui_priority)) {
+                ibPriority.setImageLevel(message.ui_priority);
+                ibPriority.setVisibility(View.VISIBLE);
             } else
                 ibPriority.setVisibility(View.GONE);
 
@@ -7889,7 +7885,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.sender_ellipsize = prefs.getString("sender_ellipsize", "end");
         this.subject_ellipsize = prefs.getString("subject_ellipsize", "full");
         this.show_filtered = prefs.getBoolean("show_filtered", false);
-        this.priority_indicator = prefs.getBoolean("priority_indicator", true);
         this.keywords_header = prefs.getBoolean("keywords_header", false);
         this.labels_header = prefs.getBoolean("labels_header", true);
         this.flags = prefs.getBoolean("flags", true);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptions.java b/app/src/main/java/eu/faircode/email/FragmentOptions.java
index b4881b9e17..2fd767dc6f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptions.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptions.java
@@ -145,7 +145,7 @@ public class FragmentOptions extends FragmentBase {
             "email_format", "prefer_contact", "only_contact", "distinguish_contacts", "show_recipients",
             "font_size_sender", "sender_ellipsize",
             "subject_top", "subject_italic", "highlight_subject", "font_size_subject", "subject_ellipsize",
-            "priority_indicator", "keywords_header", "labels_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines", "align_header",
+            "keywords_header", "labels_header", "flags", "flags_background", "preview", "preview_italic", "preview_lines", "align_header",
             "message_zoom", "overview_mode", "addresses", "button_extra", "attachments_alt", "thumbnails",
             "contrast", "hyphenation", "display_font", "monospaced_pre",
             "list_count", "bundled_fonts", "parse_classes",
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 865687f532..5ad9ac714f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -150,7 +150,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
     private Spinner spFontSizeSubject;
     private Spinner spSubjectEllipsize;
 
-    private SwitchCompat swPriorityIndicator;
     private SwitchCompat swKeywords;
     private SwitchCompat swLabels;
     private SwitchCompat swFlags;
@@ -213,7 +212,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             "email_format", "prefer_contact", "only_contact", "distinguish_contacts", "show_recipients",
             "font_size_sender", "sender_ellipsize",
             "subject_top", "subject_italic", "highlight_subject", "font_size_subject", "subject_ellipsize",
-            "priority_indicator", "keywords_header", "labels_header", "flags", "flags_background",
+            "keywords_header", "labels_header", "flags", "flags_background",
             "preview", "preview_italic", "preview_lines", "align_header",
             "addresses", "hide_attachments",
             "message_zoom", "editor_zoom", "overview_mode",
@@ -322,7 +321,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
         spFontSizeSubject = view.findViewById(R.id.spFontSizeSubject);
         spSubjectEllipsize = view.findViewById(R.id.spSubjectEllipsize);
 
-        swPriorityIndicator = view.findViewById(R.id.swPriorityIndicator);
         swKeywords = view.findViewById(R.id.swKeywords);
         swLabels = view.findViewById(R.id.swLabels);
         swFlags = view.findViewById(R.id.swFlags);
@@ -1090,13 +1088,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             }
         });
 
-        swPriorityIndicator.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("priority_indicator", checked).apply();
-            }
-        });
-
         swKeywords.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -1591,7 +1582,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
                     break;
                 }
 
-            swPriorityIndicator.setChecked(prefs.getBoolean("priority_indicator", true));
             swKeywords.setChecked(prefs.getBoolean("keywords_header", false));
             swLabels.setChecked(prefs.getBoolean("labels_header", true));
             swFlags.setChecked(prefs.getBoolean("flags", true));
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 63f214db8a..d700bc2a7a 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1519,17 +1519,6 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvSubjectEllipsizeRemark" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swPriorityIndicator"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_priority_indicator"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/vSeparatorOther"
-                    app:switchPadding="12dp" />
-
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swKeywords"
                     android:layout_width="0dp"
@@ -1538,7 +1527,7 @@
                     android:text="@string/title_advanced_keywords"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swPriorityIndicator"
+                    app:layout_constraintTop_toBottomOf="@id/vSeparatorOther"
                     app:switchPadding="12dp" />
 
                 <androidx.appcompat.widget.SwitchCompat
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87f4cf2eb1..0b26858eb0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -600,7 +600,6 @@
     <string name="title_advanced_compact_mode_remark">Compact mode only</string>
 
     <string name="title_advanced_highlight_color">Highlight color</string>
-    <string name="title_advanced_priority_indicator">Show priority indicator</string>
     <string name="title_advanced_keywords">Show keywords in message header</string>
     <string name="title_advanced_labels">Show Gmail labels in message header</string>
     <string name="title_advanced_flags">Show stars</string>