Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-25 12:17:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid blocking yourself.

Browse Source
This commit is contained in:
Sagar
2025-04-11 21:15:28 +05:30
committed by Cody Henthorne
parent 69153cf339
commit ac1165c8fd
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
View File

@@ -38,6 +38,7 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
private BlockedUsersViewModel viewModel;
private View container;
private final LifecycleDisposable lifecycleDisposable = new LifecycleDisposable();
@@ -57,7 +58,7 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
Toolbar toolbar = findViewById(R.id.toolbar);
ContactFilterView contactFilterView = findViewById(R.id.contact_filter_edit_text);
View container = findViewById(R.id.fragment_container);
container = findViewById(R.id.fragment_container);
toolbar.setNavigationOnClickListener(unused -> onBackPressed());
contactFilterView.setOnFilterChangedListener(query -> {
@@ -99,7 +100,23 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
@Override
public void onBeforeContactSelected(boolean isFromUnknownSearchKey, @NonNull Optional<RecipientId> recipientId, String number, @NonNull Optional<ChatType> chatType, @NonNull Consumer<Boolean> callback) {
final String displayName = recipientId.map(id -> Recipient.resolved(id).getDisplayName(this)).orElse(number);
Optional<Recipient> resolvedRecipient = recipientId.map(Recipient::resolved);
final String displayName = resolvedRecipient
.map(r -> r.getDisplayName(this))
.orElse(number);
boolean isSelf = resolvedRecipient
.map(Recipient::isSelf)
.orElseGet(() -> Optional.ofNullable(number)
.map(Recipient::external)
.map(Recipient::isSelf)
.orElse(false));
if (isSelf) {
Snackbar.make(container, getString(R.string.BlockedUsersActivity__cannot_block_yourself), Snackbar.LENGTH_SHORT).show();
return;
}
AlertDialog confirmationDialog = new MaterialAlertDialogBuilder(this)
.setTitle(R.string.BlockedUsersActivity__block_user)