From 7d4564a4fbcc17f041bd9cee90e67b18cc67cc8d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 31 Aug 2022 16:20:39 +0200
Subject: [PATCH] Revert "Show return path in addresses section / experiments"

This reverts commit 4b1cb2d840d48998d49fe106d00b6b665a22b4bf.
---
 .../eu/faircode/email/AdapterMessage.java     | 13 --------
 .../res/layout/include_message_addresses.xml  | 31 ++-----------------
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 01c76262f9..1740485be8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -301,7 +301,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     private boolean language_detection;
     private List<String> languages;
-    private boolean experiments;
     private static boolean debug;
     private int level;
     private boolean canDarken;
@@ -390,7 +389,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private TextView tvSubmitterTitle;
         private TextView tvDeliveredToTitle;
-        private TextView tvReturnPathTitle;
         private TextView tvFromExTitle;
         private TextView tvToTitle;
         private TextView tvReplyToTitle;
@@ -406,7 +404,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         private TextView tvSubmitter;
         private TextView tvDeliveredTo;
-        private TextView tvReturnPath;
         private TextView tvFromEx;
         private TextView tvTo;
         private TextView tvReplyTo;
@@ -791,7 +788,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             tvSubmitterTitle = vsBody.findViewById(R.id.tvSubmitterTitle);
             tvDeliveredToTitle = vsBody.findViewById(R.id.tvDeliveredToTitle);
-            tvReturnPathTitle = vsBody.findViewById(R.id.tvReturnPathTitle);
             tvFromExTitle = vsBody.findViewById(R.id.tvFromExTitle);
             tvToTitle = vsBody.findViewById(R.id.tvToTitle);
             tvReplyToTitle = vsBody.findViewById(R.id.tvReplyToTitle);
@@ -807,7 +803,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             tvSubmitter = vsBody.findViewById(R.id.tvSubmitter);
             tvDeliveredTo = vsBody.findViewById(R.id.tvDeliveredTo);
-            tvReturnPath = vsBody.findViewById(R.id.tvReturnPath);
             tvFromEx = vsBody.findViewById(R.id.tvFromEx);
             tvTo = vsBody.findViewById(R.id.tvTo);
             tvReplyTo = vsBody.findViewById(R.id.tvReplyTo);
@@ -1660,7 +1655,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             tvSubmitterTitle.setVisibility(View.GONE);
             tvDeliveredToTitle.setVisibility(View.GONE);
-            tvReturnPathTitle.setVisibility(View.GONE);
             tvFromExTitle.setVisibility(View.GONE);
             tvToTitle.setVisibility(View.GONE);
             tvReplyToTitle.setVisibility(View.GONE);
@@ -1676,7 +1670,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             tvSubmitter.setVisibility(View.GONE);
             tvDeliveredTo.setVisibility(View.GONE);
-            tvReturnPath.setVisibility(View.GONE);
             tvFromEx.setVisibility(View.GONE);
             tvTo.setVisibility(View.GONE);
             tvReplyTo.setVisibility(View.GONE);
@@ -2463,10 +2456,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvDeliveredTo.setVisibility(show_addresses && !TextUtils.isEmpty(message.deliveredto) ? View.VISIBLE : View.GONE);
             tvDeliveredTo.setText(formatAddresses(new Address[]{deliveredto}, true));
 
-            tvReturnPathTitle.setVisibility(show_addresses && experiments && message.return_path != null && message.return_path.length > 0 ? View.VISIBLE : View.GONE);
-            tvReturnPath.setVisibility(show_addresses && experiments && message.return_path != null && message.return_path.length > 0 ? View.VISIBLE : View.GONE);
-            tvReturnPath.setText(formatAddresses(message.return_path, true));
-
             tvFromExTitle.setVisibility((froms > 1 || show_addresses) && !TextUtils.isEmpty(from) ? View.VISIBLE : View.GONE);
             tvFromEx.setVisibility((froms > 1 || show_addresses) && !TextUtils.isEmpty(from) ? View.VISIBLE : View.GONE);
             tvFromEx.setText(from);
@@ -7279,8 +7268,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         } else
             languages = null;
 
-        this.experiments = prefs.getBoolean("experiments", false);
-
         debug = prefs.getBoolean("debug", false);
         level = prefs.getInt("log_level", Log.getDefaultLogLevel());
 
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index 04b3aeef1b..eaf22e90e6 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -181,31 +181,6 @@
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
         app:layout_constraintTop_toBottomOf="@id/tvSubmitter" />
 
-    <TextView
-        android:id="@+id/tvReturnPathTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:labelFor="@+id/tvFromEx"
-        android:text="@string/title_return_path"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvDeliveredToTitle" />
-
-    <TextView
-        android:id="@+id/tvReturnPath"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:layout_marginEnd="6dp"
-        android:text="Return path"
-        android:textAppearance="@style/TextAppearance.AppCompat.Small"
-        android:textIsSelectable="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
-        app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
-
     <TextView
         android:id="@+id/tvFromExTitle"
         android:layout_width="wrap_content"
@@ -216,7 +191,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Small"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvReturnPathTitle" />
+        app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
 
     <TextView
         android:id="@+id/tvFromEx"
@@ -229,7 +204,7 @@
         android:textIsSelectable="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
-        app:layout_constraintTop_toBottomOf="@id/tvReturnPath" />
+        app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
 
     <TextView
         android:id="@+id/tvToTitle"
@@ -512,7 +487,7 @@
         android:layout_height="wrap_content"
         app:barrierDirection="end"
         app:constraint_referenced_ids="
-            tvSubmitterTitle,tvDeliveredToTitle,tvReturnPathTitle,
+            tvSubmitterTitle,tvDeliveredToTitle,
             tvFromExTitle,tvToTitle,tvReplyToTitle,
             tvCcTitle,tvBccTitle,
             tvIdentityTitle,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 812134bd51..43dd6766eb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1377,7 +1377,6 @@
     <string name="title_compose">Compose</string>
     <string name="title_submitter">Sent by:</string>
     <string name="title_delivered_to">Delivered to:</string>
-    <string name="title_return_path">Return path:</string>
     <string name="title_from">From:</string>
     <string name="title_to">To:</string>
     <string name="title_reply_to">Reply to:</string>