Fill in some strings.

// FREEBIE
signalapp · Feb 22, 2014 · da57a68 · da57a68
1 parent 9c9866e
commit da57a68
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -283,7 +283,11 @@
         Received message with unknown identity key. Click to process and display.
     </string>
     <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Received updated but unknown identity information. Tap to validate identity.</string>
-
+    <string name="SmsMessageRecord_secure_session_ended">Secure session ended.</string>
+
+    <!-- ThreadRecord -->
+    <string name="ThreadRecord_left_the_group">Left the group...</string>
+    <string name="TheadRecord_secure_session_ended">Secure session ended.</string>
 
     <!-- VerifyIdentityActivity -->
     <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">You do not have an identity key.</string>
@@ -758,6 +762,7 @@
 
     <!-- verify_keys -->
     <string name="verify_keys__menu_verified">Verified</string>
+
     <!-- EOF -->
 
 </resources>
diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
@@ -80,8 +80,7 @@ public SpannableString getDisplayBody() {
     } else if (!getBody().isPlaintext()) {
       return emphasisAdded(context.getString(R.string.MessageNotifier_encrypted_message));
     } else if (SmsDatabase.Types.isEndSessionType(type)) {
-      // TODO jake is going to fix this up
-      return new SpannableString("Session closed!");
+      return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_ended));
     } else if (isOutgoing() && Tag.isTagged(getBody().getBody())) {
       return new SpannableString(Tag.stripTag(getBody().getBody()));
     } else {

diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -53,13 +53,12 @@ public ThreadRecord(Context context, Body body, Recipients recipients, long date
 
   @Override
   public SpannableString getDisplayBody() {
-    // TODO jake is going to fill these in
     if (SmsDatabase.Types.isDecryptInProgressType(type)) {
       return emphasisAdded(context.getString(R.string.MessageDisplayHelper_decrypting_please_wait));
     } else if (isGroupUpdate()) {
       return emphasisAdded(GroupUtil.getDescription(getBody().getBody()));
     } else if (isGroupQuit()) {
-      return emphasisAdded("Someone left the group.");
+      return emphasisAdded(context.getString(R.string.ThreadRecord_left_the_group));
     } else if (isKeyExchange()) {
       return emphasisAdded(context.getString(R.string.ConversationListItem_key_exchange_message));
     } else if (SmsDatabase.Types.isFailedDecryptType(type)) {
@@ -69,8 +68,7 @@ public SpannableString getDisplayBody() {
     } else if (!getBody().isPlaintext()) {
       return emphasisAdded(context.getString(R.string.MessageNotifier_encrypted_message));
     } else if (SmsDatabase.Types.isEndSessionType(type)) {
-      // TODO jake is going to fix this up
-      return emphasisAdded("Session closed!");
+      return emphasisAdded(context.getString(R.string.TheadRecord_secure_session_ended));
     } else {
       if (Util.isEmpty(getBody().getBody())) {
         return new SpannableString(context.getString(R.string.MessageNotifier_no_subject));