TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-09 15:29:52 +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

8
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@@ -392,7 +392,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
case R.id.menu_add_attachment: handleAddAttachment(); return true;
case R.id.menu_view_media: handleViewMedia(); return true;
case R.id.menu_add_to_contacts: handleAddToContacts(); return true;
case R.id.menu_abort_session: handleAbortSecureSession(); return true;
case R.id.menu_reset_secure_session: handleResetSecureSession(); return true;
case R.id.menu_group_recipients: handleDisplayGroupRecipients(); return true;
case R.id.menu_distribution_broadcast: handleDistributionBroadcastEnabled(item); return true;
case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item); return true;
@@ -498,12 +498,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
}
private void handleAbortSecureSession() {
private void handleResetSecureSession() {
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
builder.setTitle(R.string.ConversationActivity_abort_secure_session_confirmation);
builder.setTitle(R.string.ConversationActivity_reset_secure_session_confirmation);
builder.setIconAttribute(R.attr.dialog_alert_icon);
builder.setCancelable(true);
builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_abort_this_secure_session_question);
builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

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)) {