TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 01:11:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make 'reset secure session' consistent

Browse Source 
Closes #4200
Fixes #4198
// FREEBIE
This commit is contained in:
Geonu Kang
2015-10-04 12:13:34 +09:00
committed by Moxie Marlinspike
parent 399dfb1a98
commit a0859a71b2
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ public class SmsMessageRecord extends MessageRecord {
} else if (!getBody().isPlaintext()) {
return emphasisAdded(context.getString(R.string.MessageNotifier_locked_message));
} else if (SmsDatabase.Types.isEndSessionType(type)) {
return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_ended));
return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
} else {
return super.getDisplayBody();
}

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

@@ -69,7 +69,7 @@ public class ThreadRecord extends DisplayRecord {
} else if (!getBody().isPlaintext()) {
return emphasisAdded(context.getString(R.string.MessageNotifier_locked_message));
} else if (SmsDatabase.Types.isEndSessionType(type)) {
return emphasisAdded(context.getString(R.string.TheadRecord_secure_session_ended));
return emphasisAdded(context.getString(R.string.ThreadRecord_secure_session_reset));
} else if (MmsSmsColumns.Types.isLegacyType(type)) {
return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported));
} else if (MmsSmsColumns.Types.isDraftMessageType(type)) {