From b855a1805f123fd1ec758855580ede301c7ef69b Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 7 Mar 2014 12:39:16 -0800
Subject: [PATCH] Mark message details on pending messages as such.

Closes #1034
---
 .../securesms/ConversationFragment.java         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/ConversationFragment.java b/src/org/thoughtcrime/securesms/ConversationFragment.java
index 8d5d6b4546..2a424ce854 100644
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -12,24 +12,23 @@ import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.text.ClipboardManager;
 import android.view.ContextMenu;
-import android.view.MenuItem;
 import android.view.LayoutInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CursorAdapter;
 
 import com.actionbarsherlock.app.SherlockListFragment;
 
-import org.thoughtcrime.securesms.recipients.RecipientFactory;
-import org.thoughtcrime.securesms.util.DirectoryHelper;
-import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.textsecure.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.loaders.ConversationLoader;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
+import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.util.Dialogs;
+import org.thoughtcrime.securesms.util.DirectoryHelper;
+import org.whispersystems.textsecure.crypto.MasterSecret;
 
 import java.sql.Date;
 import java.text.SimpleDateFormat;
@@ -144,10 +143,10 @@ public class ConversationFragment extends SherlockListFragment
 
     String transport;
 
-    if      (message.isPush()) transport = "push";
-    else if (message.isMms())  transport = "mms";
-    else                       transport = "sms";
-
+    if      (message.isPending()) transport = "pending";
+    else if (message.isPush())    transport = "push";
+    else if (message.isMms())     transport = "mms";
+    else                          transport = "sms";
 
     SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz");
     AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());