From eaee7a0fbc4b040dc379b60e05c9cc80eb1fd140 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Fri, 23 May 2014 01:58:39 +0000
Subject: [PATCH] Show sending status in ViewEmailFragment

---
 res/layout/fragment_view_email.xml          | 18 ++++++++++++++++++
 res/values/strings.xml                      |  1 +
 src/i2p/bote/android/ViewEmailFragment.java |  7 +++++++
 src/i2p/bote/android/util/BoteHelper.java   |  6 +++++-
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/res/layout/fragment_view_email.xml b/res/layout/fragment_view_email.xml
index 8e4f6bf..adfbced 100644
--- a/res/layout/fragment_view_email.xml
+++ b/res/layout/fragment_view_email.xml
@@ -103,6 +103,24 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content" />
                 </TableRow>
+
+                <TableRow
+                    android:id="@+id/email_status_row"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" >
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="3dp"
+                        android:text="@string/email_status" />
+
+                    <TextView
+                        android:id="@+id/email_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+                </TableRow>
             </TableLayout>
         </RelativeLayout>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0a5040c..867d6cf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -55,6 +55,7 @@
     <string name="email_to">To:</string>
     <string name="email_sent">Sent:</string>
     <string name="email_received">Received:</string>
+    <string name="email_status">Status:</string>
 
     <string name="compose">Compose</string>
     <string name="subject">Subject</string>
diff --git a/src/i2p/bote/android/ViewEmailFragment.java b/src/i2p/bote/android/ViewEmailFragment.java
index a5bff9d..f6b2500 100644
--- a/src/i2p/bote/android/ViewEmailFragment.java
+++ b/src/i2p/bote/android/ViewEmailFragment.java
@@ -18,6 +18,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.TableRow;
 import android.widget.TextView;
 
 public class ViewEmailFragment extends Fragment {
@@ -115,5 +116,11 @@ public class ViewEmailFragment extends Fragment {
             // TODO Auto-generated catch block
             e.printStackTrace();
         }
+
+        if (BoteHelper.isOutbox(mFolderName)) {
+            ((TextView) v.findViewById(R.id.email_status)).setText(
+                    BoteHelper.getEmailStatusText(getActivity(), email, true));
+            ((TableRow) v.findViewById(R.id.email_status_row)).setVisibility(View.VISIBLE);
+        }
     }
 }
diff --git a/src/i2p/bote/android/util/BoteHelper.java b/src/i2p/bote/android/util/BoteHelper.java
index 8fc37e3..e02bfe8 100644
--- a/src/i2p/bote/android/util/BoteHelper.java
+++ b/src/i2p/bote/android/util/BoteHelper.java
@@ -200,6 +200,10 @@ public class BoteHelper extends GeneralHelper {
     }
 
     public static boolean isOutbox(EmailFolder folder) {
-        return "Outbox".equalsIgnoreCase(folder.getName());
+        return isOutbox(folder.getName());
+    }
+
+    public static boolean isOutbox(String folderName) {
+        return "Outbox".equalsIgnoreCase(folderName);
     }
 }