Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 20:24:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more UX issues with blocked users.

Browse Source
This commit is contained in:
Greyson Parrelli
2020-04-23 11:06:52 -04:00
parent 8c6001fa5a
commit 4bdcaa72cd
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -770,9 +770,19 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (isSecureText) {
menu.findItem(R.id.menu_call_secure).setVisible(false);
menu.findItem(R.id.menu_video_secure).setVisible(false);
if (menu.findItem(R.id.menu_expiring_messages) != null) {
menu.findItem(R.id.menu_expiring_messages).setVisible(false);
}
if (menu.findItem(R.id.menu_expiring_messages_off) != null) {
menu.findItem(R.id.menu_expiring_messages_off).setVisible(false);
}
} else {
menu.findItem(R.id.menu_call_insecure).setVisible(false);
}
menu.findItem(R.id.menu_mute_notifications).setVisible(false);
}
searchViewItem = menu.findItem(R.id.menu_search);
@@ -983,24 +993,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
private void handleUnblock() {
int titleRes = R.string.ConversationActivity_unblock_this_contact_question;
int bodyRes = R.string.ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact;
if (recipient.get().isGroup()) {
titleRes = R.string.ConversationActivity_unblock_this_group_question;
bodyRes = R.string.ConversationActivity_unblock_this_group_description;
}
//noinspection CodeBlock2Expr
new AlertDialog.Builder(this)
.setTitle(titleRes)
.setMessage(bodyRes)
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(R.string.ConversationActivity_unblock, (dialog, which) -> {
SignalExecutors.BOUNDED.execute(() -> {
RecipientUtil.unblock(ConversationActivity.this, recipient.get());
});
}).show();
BlockUnblockDialog.showUnblockFor(this, getLifecycle(), recipient.get(), () -> {
SignalExecutors.BOUNDED.execute(() -> {
RecipientUtil.unblock(ConversationActivity.this, recipient.get());
});
});
}
@TargetApi(Build.VERSION_CODES.KITKAT)