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

Improve Delete Thread, Reset Secure Session confirmation dialogs

Browse Source 
Fixes #4512
Closes #4513
// FREEBIE
This commit is contained in:
Geonu Kang
2015-11-20 01:05:31 +09:00
committed by Moxie Marlinspike
parent ce617fb7cb
commit cca38ddf3f
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -497,11 +497,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleResetSecureSession() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.ConversationActivity_reset_secure_session_confirmation);
builder.setTitle(R.string.ConversationActivity_reset_secure_session_question);
builder.setIconAttribute(R.attr.dialog_alert_icon);
builder.setCancelable(true);
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() {
builder.setMessage(R.string.ConversationActivity_this_may_help_if_youre_having_encryption_problems);
builder.setPositiveButton(R.string.ConversationActivity_reset, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (isSingleConversation()) {
@@ -524,7 +524,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
}
});
builder.setNegativeButton(R.string.no, null);
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
}
@@ -645,11 +645,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleDeleteThread() {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.ConversationActivity_delete_thread_confirmation);
builder.setTitle(R.string.ConversationActivity_delete_thread_question);
builder.setIconAttribute(R.attr.dialog_alert_icon);
builder.setCancelable(true);
builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
builder.setMessage(R.string.ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation);
builder.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (threadId > 0) {
@@ -661,7 +661,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
});
builder.setNegativeButton(R.string.no, null);
builder.setNegativeButton(android.R.string.cancel, null);
builder.show();
}