From 0d35e2bfa903d9707156544af45d00a4ec0afd55 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 13 Jun 2014 17:48:56 -0700
Subject: [PATCH] Fix the "Tap for X fallback" labels.

---
 res/values/strings.xml                               | 3 ++-
 src/org/thoughtcrime/securesms/ConversationItem.java | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44f2e8da6e..b09d2b791c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -56,7 +56,8 @@
     <string name="ConversationItem_group_action_left">%1$s has left the group.</string>
     <string name="ConversationItem_group_action_joined">%1$s have joined the group.</string>
     <string name="ConversationItem_group_action_modify">%1$s has updated the group.</string>
-    <string name="ConversationItem_click_to_approve">Tap for SMS fallback</string>
+    <string name="ConversationItem_click_to_approve_sms">Tap for SMS fallback</string>
+    <string name="ConversationItem_click_to_approve_mms">Tap for MMS fallback</string>
     <string name="ConversationItem_click_to_approve_unencrypted">Tap for insecure fallback</string>
     <string name="ConversationItem_click_to_approve_sms_dialog_title">Fallback to SMS?</string>
     <string name="ConversationItem_click_to_approve_mms_dialog_title">Fallback to MMS?</string>
diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java
index 3c34f34b8c..e76828da93 100644
--- a/src/org/thoughtcrime/securesms/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationItem.java
@@ -261,8 +261,12 @@ public class ConversationItem extends LinearLayout {
       dateText.setText(R.string.ConversationItem_error_sending_message);
     } else if (messageRecord.isPendingSmsFallback() && indicatorText != null) {
       dateText.setText("");
-      if (messageRecord.isPendingSecureSmsFallback()) indicatorText.setText(R.string.ConversationItem_click_to_approve);
-      else                                            indicatorText.setText(R.string.ConversationItem_click_to_approve_unencrypted);
+      if (messageRecord.isPendingSecureSmsFallback()) {
+        if (messageRecord.isMms()) indicatorText.setText(R.string.ConversationItem_click_to_approve_mms);
+        else                       indicatorText.setText(R.string.ConversationItem_click_to_approve_sms);
+      } else {
+        indicatorText.setText(R.string.ConversationItem_click_to_approve_unencrypted);
+      }
     } else if (messageRecord.isPending()) {
       dateText.setText(" ··· ");
     } else {