TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 15:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved several hard-coded UI strings to strings.xml

Browse Source 
Closes #2203
This commit is contained in:
guiweber
2014-12-15 09:44:41 -05:00
committed by Moxie Marlinspike
parent e277f9f6d1
commit d7419caa4b
7 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/database/model/MessageRecord.java
View File

@@ -95,11 +95,11 @@ public abstract class MessageRecord extends DisplayRecord {
@Override
public SpannableString getDisplayBody() {
if (isGroupUpdate() && isOutgoing()) {
return emphasisAdded("Updated the group.");
return emphasisAdded(context.getString(R.string.MessageRecord_updated_group));
} else if (isGroupUpdate()) {
return emphasisAdded(GroupUtil.getDescription(getBody().getBody()));
return emphasisAdded(GroupUtil.getDescription(context, getBody().getBody()));
} else if (isGroupQuit() && isOutgoing()) {
return emphasisAdded("You have left the group.");
return emphasisAdded(context.getString(R.string.MessageRecord_left_group));
} else if (isGroupQuit()) {
return emphasisAdded(context.getString(R.string.ConversationItem_group_action_left, getIndividualRecipient().toShortString()));
}

2
src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
View File

@@ -57,7 +57,7 @@ public class ThreadRecord extends DisplayRecord {
if (SmsDatabase.Types.isDecryptInProgressType(type)) {
return emphasisAdded(context.getString(R.string.MessageDisplayHelper_decrypting_please_wait));
} else if (isGroupUpdate()) {
return emphasisAdded(GroupUtil.getDescription(getBody().getBody()));
return emphasisAdded(GroupUtil.getDescription(context, getBody().getBody()));
} else if (isGroupQuit()) {
return emphasisAdded(context.getString(R.string.ThreadRecord_left_the_group));
} else if (isKeyExchange()) {