mirror of https://github.com/M66B/FairEmail.git
Revert "Show return path in addresses section / experiments"
This reverts commit 4b1cb2d840
.
This commit is contained in:
parent
f300673c97
commit
7d4564a4fb
|
@ -301,7 +301,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
private boolean language_detection;
|
private boolean language_detection;
|
||||||
private List<String> languages;
|
private List<String> languages;
|
||||||
private boolean experiments;
|
|
||||||
private static boolean debug;
|
private static boolean debug;
|
||||||
private int level;
|
private int level;
|
||||||
private boolean canDarken;
|
private boolean canDarken;
|
||||||
|
@ -390,7 +389,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
private TextView tvSubmitterTitle;
|
private TextView tvSubmitterTitle;
|
||||||
private TextView tvDeliveredToTitle;
|
private TextView tvDeliveredToTitle;
|
||||||
private TextView tvReturnPathTitle;
|
|
||||||
private TextView tvFromExTitle;
|
private TextView tvFromExTitle;
|
||||||
private TextView tvToTitle;
|
private TextView tvToTitle;
|
||||||
private TextView tvReplyToTitle;
|
private TextView tvReplyToTitle;
|
||||||
|
@ -406,7 +404,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
private TextView tvSubmitter;
|
private TextView tvSubmitter;
|
||||||
private TextView tvDeliveredTo;
|
private TextView tvDeliveredTo;
|
||||||
private TextView tvReturnPath;
|
|
||||||
private TextView tvFromEx;
|
private TextView tvFromEx;
|
||||||
private TextView tvTo;
|
private TextView tvTo;
|
||||||
private TextView tvReplyTo;
|
private TextView tvReplyTo;
|
||||||
|
@ -791,7 +788,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
tvSubmitterTitle = vsBody.findViewById(R.id.tvSubmitterTitle);
|
tvSubmitterTitle = vsBody.findViewById(R.id.tvSubmitterTitle);
|
||||||
tvDeliveredToTitle = vsBody.findViewById(R.id.tvDeliveredToTitle);
|
tvDeliveredToTitle = vsBody.findViewById(R.id.tvDeliveredToTitle);
|
||||||
tvReturnPathTitle = vsBody.findViewById(R.id.tvReturnPathTitle);
|
|
||||||
tvFromExTitle = vsBody.findViewById(R.id.tvFromExTitle);
|
tvFromExTitle = vsBody.findViewById(R.id.tvFromExTitle);
|
||||||
tvToTitle = vsBody.findViewById(R.id.tvToTitle);
|
tvToTitle = vsBody.findViewById(R.id.tvToTitle);
|
||||||
tvReplyToTitle = vsBody.findViewById(R.id.tvReplyToTitle);
|
tvReplyToTitle = vsBody.findViewById(R.id.tvReplyToTitle);
|
||||||
|
@ -807,7 +803,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
tvSubmitter = vsBody.findViewById(R.id.tvSubmitter);
|
tvSubmitter = vsBody.findViewById(R.id.tvSubmitter);
|
||||||
tvDeliveredTo = vsBody.findViewById(R.id.tvDeliveredTo);
|
tvDeliveredTo = vsBody.findViewById(R.id.tvDeliveredTo);
|
||||||
tvReturnPath = vsBody.findViewById(R.id.tvReturnPath);
|
|
||||||
tvFromEx = vsBody.findViewById(R.id.tvFromEx);
|
tvFromEx = vsBody.findViewById(R.id.tvFromEx);
|
||||||
tvTo = vsBody.findViewById(R.id.tvTo);
|
tvTo = vsBody.findViewById(R.id.tvTo);
|
||||||
tvReplyTo = vsBody.findViewById(R.id.tvReplyTo);
|
tvReplyTo = vsBody.findViewById(R.id.tvReplyTo);
|
||||||
|
@ -1660,7 +1655,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
tvSubmitterTitle.setVisibility(View.GONE);
|
tvSubmitterTitle.setVisibility(View.GONE);
|
||||||
tvDeliveredToTitle.setVisibility(View.GONE);
|
tvDeliveredToTitle.setVisibility(View.GONE);
|
||||||
tvReturnPathTitle.setVisibility(View.GONE);
|
|
||||||
tvFromExTitle.setVisibility(View.GONE);
|
tvFromExTitle.setVisibility(View.GONE);
|
||||||
tvToTitle.setVisibility(View.GONE);
|
tvToTitle.setVisibility(View.GONE);
|
||||||
tvReplyToTitle.setVisibility(View.GONE);
|
tvReplyToTitle.setVisibility(View.GONE);
|
||||||
|
@ -1676,7 +1670,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
|
|
||||||
tvSubmitter.setVisibility(View.GONE);
|
tvSubmitter.setVisibility(View.GONE);
|
||||||
tvDeliveredTo.setVisibility(View.GONE);
|
tvDeliveredTo.setVisibility(View.GONE);
|
||||||
tvReturnPath.setVisibility(View.GONE);
|
|
||||||
tvFromEx.setVisibility(View.GONE);
|
tvFromEx.setVisibility(View.GONE);
|
||||||
tvTo.setVisibility(View.GONE);
|
tvTo.setVisibility(View.GONE);
|
||||||
tvReplyTo.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.setVisibility(show_addresses && !TextUtils.isEmpty(message.deliveredto) ? View.VISIBLE : View.GONE);
|
||||||
tvDeliveredTo.setText(formatAddresses(new Address[]{deliveredto}, true));
|
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);
|
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.setVisibility((froms > 1 || show_addresses) && !TextUtils.isEmpty(from) ? View.VISIBLE : View.GONE);
|
||||||
tvFromEx.setText(from);
|
tvFromEx.setText(from);
|
||||||
|
@ -7279,8 +7268,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
||||||
} else
|
} else
|
||||||
languages = null;
|
languages = null;
|
||||||
|
|
||||||
this.experiments = prefs.getBoolean("experiments", false);
|
|
||||||
|
|
||||||
debug = prefs.getBoolean("debug", false);
|
debug = prefs.getBoolean("debug", false);
|
||||||
level = prefs.getInt("log_level", Log.getDefaultLogLevel());
|
level = prefs.getInt("log_level", Log.getDefaultLogLevel());
|
||||||
|
|
||||||
|
|
|
@ -181,31 +181,6 @@
|
||||||
app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
|
app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvSubmitter" />
|
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
|
<TextView
|
||||||
android:id="@+id/tvFromExTitle"
|
android:id="@+id/tvFromExTitle"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -216,7 +191,7 @@
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
android:textAppearance="@style/TextAppearance.AppCompat.Small"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvReturnPathTitle" />
|
app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvFromEx"
|
android:id="@+id/tvFromEx"
|
||||||
|
@ -229,7 +204,7 @@
|
||||||
android:textIsSelectable="true"
|
android:textIsSelectable="true"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
|
app:layout_constraintStart_toEndOf="@+id/barrier_addresses"
|
||||||
app:layout_constraintTop_toBottomOf="@id/tvReturnPath" />
|
app:layout_constraintTop_toBottomOf="@id/tvDeliveredTo" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/tvToTitle"
|
android:id="@+id/tvToTitle"
|
||||||
|
@ -512,7 +487,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
app:barrierDirection="end"
|
app:barrierDirection="end"
|
||||||
app:constraint_referenced_ids="
|
app:constraint_referenced_ids="
|
||||||
tvSubmitterTitle,tvDeliveredToTitle,tvReturnPathTitle,
|
tvSubmitterTitle,tvDeliveredToTitle,
|
||||||
tvFromExTitle,tvToTitle,tvReplyToTitle,
|
tvFromExTitle,tvToTitle,tvReplyToTitle,
|
||||||
tvCcTitle,tvBccTitle,
|
tvCcTitle,tvBccTitle,
|
||||||
tvIdentityTitle,
|
tvIdentityTitle,
|
||||||
|
|
|
@ -1377,7 +1377,6 @@
|
||||||
<string name="title_compose">Compose</string>
|
<string name="title_compose">Compose</string>
|
||||||
<string name="title_submitter">Sent by:</string>
|
<string name="title_submitter">Sent by:</string>
|
||||||
<string name="title_delivered_to">Delivered to:</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_from">From:</string>
|
||||||
<string name="title_to">To:</string>
|
<string name="title_to">To:</string>
|
||||||
<string name="title_reply_to">Reply to:</string>
|
<string name="title_reply_to">Reply to:</string>
|
||||||
|
|
Loading…
Reference in New Issue