Skip to content

Commit

Permalink
Mark message details on pending messages as such.
Browse files Browse the repository at this point in the history
  • Loading branch information
moxie0 committed Mar 7, 2014
1 parent 339193a commit b855a18
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions src/org/thoughtcrime/securesms/ConversationFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,23 @@
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;
Expand Down Expand Up @@ -144,10 +143,10 @@ private void handleDisplayDetails(MessageRecord message) {

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());
Expand Down

0 comments on commit b855a18

Please sign in to comment.