mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 16:57:50 +00:00
Improve Delete Thread, Reset Secure Session confirmation dialogs
Fixes #4512 Closes #4513 // FREEBIE
This commit is contained in:
parent
ce617fb7cb
commit
cca38ddf3f
@ -89,10 +89,11 @@
|
|||||||
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
|
<string name="ConversationItem_unable_to_open_media">Can\'t find an app able to open this media.</string>
|
||||||
|
|
||||||
<!-- ConversationActivity -->
|
<!-- ConversationActivity -->
|
||||||
<string name="ConversationActivity_reset_secure_session_confirmation">Reset secure session confirmation</string>
|
<string name="ConversationActivity_reset_secure_session_question">Reset secure session?</string>
|
||||||
<string name="ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question">Are you sure that you want to reset this secure session?</string>
|
<string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">This may help if you\'re having encryption problems in this conversation. Your messages will be kept.</string>
|
||||||
<string name="ConversationActivity_delete_thread_confirmation">Delete thread confirmation</string>
|
<string name="ConversationActivity_reset">Reset</string>
|
||||||
<string name="ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question">Are you sure that you want to permanently delete this conversation?</string>
|
<string name="ConversationActivity_delete_thread_question">Delete conversation?</string>
|
||||||
|
<string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">This will permanently delete all messages in this conversation.</string>
|
||||||
<string name="ConversationActivity_add_attachment">Add attachment</string>
|
<string name="ConversationActivity_add_attachment">Add attachment</string>
|
||||||
<string name="ConversationActivity_select_contact_info">Select contact info</string>
|
<string name="ConversationActivity_select_contact_info">Select contact info</string>
|
||||||
<string name="ConversationActivity_compose_message">Compose message</string>
|
<string name="ConversationActivity_compose_message">Compose message</string>
|
||||||
@ -1039,7 +1040,7 @@
|
|||||||
<string name="conversation__menu_add_attachment">Add attachment</string>
|
<string name="conversation__menu_add_attachment">Add attachment</string>
|
||||||
<string name="conversation__menu_update_group">Update group</string>
|
<string name="conversation__menu_update_group">Update group</string>
|
||||||
<string name="conversation__menu_leave_group">Leave group</string>
|
<string name="conversation__menu_leave_group">Leave group</string>
|
||||||
<string name="conversation__menu_delete_thread">Delete thread</string>
|
<string name="conversation__menu_delete_thread">Delete conversation</string>
|
||||||
<string name="conversation__menu_view_media">All images</string>
|
<string name="conversation__menu_view_media">All images</string>
|
||||||
<string name="conversation__menu_conversation_settings">Conversation settings</string>
|
<string name="conversation__menu_conversation_settings">Conversation settings</string>
|
||||||
|
|
||||||
|
@ -497,11 +497,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|||||||
|
|
||||||
private void handleResetSecureSession() {
|
private void handleResetSecureSession() {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
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.setIconAttribute(R.attr.dialog_alert_icon);
|
||||||
builder.setCancelable(true);
|
builder.setCancelable(true);
|
||||||
builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_reset_this_secure_session_question);
|
builder.setMessage(R.string.ConversationActivity_this_may_help_if_youre_having_encryption_problems);
|
||||||
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
|
builder.setPositiveButton(R.string.ConversationActivity_reset, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
if (isSingleConversation()) {
|
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();
|
builder.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -645,11 +645,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|||||||
|
|
||||||
private void handleDeleteThread() {
|
private void handleDeleteThread() {
|
||||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
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.setIconAttribute(R.attr.dialog_alert_icon);
|
||||||
builder.setCancelable(true);
|
builder.setCancelable(true);
|
||||||
builder.setMessage(R.string.ConversationActivity_are_you_sure_that_you_want_to_permanently_delete_this_conversation_question);
|
builder.setMessage(R.string.ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation);
|
||||||
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
|
builder.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
public void onClick(DialogInterface dialog, int which) {
|
||||||
if (threadId > 0) {
|
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();
|
builder.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user