From 4351232b44ef78f7704955cef97766398a7cd368 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 25 Nov 2018 19:49:08 +0100
Subject: [PATCH] Removed sent time

---
 .../java/eu/faircode/email/AdapterMessage.java    |  3 ---
 app/src/main/res/layout/item_message_compact.xml  | 15 ++-------------
 app/src/main/res/layout/item_message_normal.xml   | 15 ++-------------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index e892f6d22f..3e089ca9d2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -159,7 +159,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         private TextView tvReplyTo;
         private TextView tvCc;
         private TextView tvBcc;
-        private TextView tvTimeSent;
         private TextView tvTimeReceived;
         private TextView tvSubjectEx;
         private TextView tvKeywords;
@@ -197,7 +196,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             ivAddContact = itemView.findViewById(R.id.ivAddContact);
             tvSize = itemView.findViewById(R.id.tvSize);
             tvTime = itemView.findViewById(R.id.tvTime);
-            tvTimeSent = itemView.findViewById(R.id.tvTimeSent);
             tvTimeReceived = itemView.findViewById(R.id.tvTimeReceived);
             ivAnswered = itemView.findViewById(R.id.ivAnswered);
             ivAttachments = itemView.findViewById(R.id.ivAttachments);
@@ -432,7 +430,6 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
 
             if (show_expanded) {
                 ivExpanderAddress.setImageResource(show_addresses ? R.drawable.baseline_expand_less_24 : R.drawable.baseline_expand_more_24);
-                tvTimeSent.setText(message.sent == null ? null : df.format(new Date(message.sent)));
                 tvTimeReceived.setText(df.format(new Date(message.received)));
 
                 tvFromEx.setText(MessageHelper.getFormattedAddresses(message.from, true));
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index f684df4851..b53134a4c8 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -381,17 +381,6 @@
             app:layout_constraintStart_toEndOf="@id/tvBccTitle"
             app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-        <TextView
-            android:id="@+id/tvTimeSent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="12:34:56"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
         <TextView
             android:id="@+id/tvTimeReceived"
             android:layout_width="wrap_content"
@@ -401,7 +390,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeSent" />
+            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
         <TextView
             android:id="@+id/tvSubjectEx"
@@ -586,7 +575,7 @@
             android:id="@+id/grpAddress"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeSent,tvTimeReceived,tvSubjectEx" />
+            app:constraint_referenced_ids="tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeReceived,tvSubjectEx" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpHeaders"
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index e9dcace3d1..a28232e303 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -378,17 +378,6 @@
             app:layout_constraintStart_toEndOf="@id/tvBccTitle"
             app:layout_constraintTop_toBottomOf="@id/tvCc" />
 
-        <TextView
-            android:id="@+id/tvTimeSent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="12:34:56"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
-
         <TextView
             android:id="@+id/tvTimeReceived"
             android:layout_width="wrap_content"
@@ -398,7 +387,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textIsSelectable="true"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvTimeSent" />
+            app:layout_constraintTop_toBottomOf="@id/tvBcc" />
 
         <TextView
             android:id="@+id/tvSubjectEx"
@@ -583,7 +572,7 @@
             android:id="@+id/grpAddress"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeSent,tvTimeReceived,tvSubjectEx" />
+            app:constraint_referenced_ids="tvFromExTitle,tvFromEx,tvToTitle,tvTo,tvReplyToTitle,tvReplyTo,tvCcTitle,tvCc,tvBccTitle,tvBcc,tvTimeReceived,tvSubjectEx" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpHeaders"