empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove phone numbers from blocked list.

Browse source
This commit is contained in:
mtang-signal 2024-10-22 15:26:25 -07:00 • committed by Greyson Parrelli
parent 31d60f7800
commit 267ef66517
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersAdapter.java
View file

@ -13,9 +13,7 @@ import androidx.recyclerview.widget.RecyclerView;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.components.AvatarImageView;
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.whispersystems.signalservice.api.util.OptionalUtil;
import java.util.Objects;
@ -44,14 +42,14 @@ final class BlockedUsersAdapter extends ListAdapter<Recipient, BlockedUsersAdapt
private final AvatarImageView avatar;
private final TextView displayName;
private final TextView numberOrUsername;
private final TextView username;
public ViewHolder(@NonNull View itemView, Consumer<Integer> clickConsumer) {
super(itemView);
this.avatar = itemView.findViewById(R.id.avatar);
this.displayName = itemView.findViewById(R.id.display_name);
this.numberOrUsername = itemView.findViewById(R.id.number_or_username);
this.username = itemView.findViewById(R.id.username);
itemView.setOnClickListener(unused -> {
if (getAdapterPosition() != RecyclerView.NO_POSITION) {
@ -64,19 +62,13 @@ final class BlockedUsersAdapter extends ListAdapter<Recipient, BlockedUsersAdapt
avatar.setAvatar(recipient);
displayName.setText(recipient.getDisplayName(itemView.getContext()));
if (recipient.hasAUserSetDisplayName(itemView.getContext())) {
String identifier = OptionalUtil.or(recipient.getE164().map(PhoneNumberFormatter::prettyPrint),
recipient.getUsername())
.orElse(null);
String identifier = recipient.getUsername().orElse(null);
if (identifier != null) {
numberOrUsername.setText(identifier);
numberOrUsername.setVisibility(View.VISIBLE);
} else {
numberOrUsername.setVisibility(View.GONE);
}
if (identifier != null) {
username.setText(identifier);
username.setVisibility(View.VISIBLE);
} else {
numberOrUsername.setVisibility(View.GONE);
username.setVisibility(View.GONE);
}
}
}

4
app/src/main/res/layout/blocked_users_adapter_item.xml
View file

@ -22,14 +22,14 @@
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintBottom_toTopOf="@id/number_or_username"
app:layout_constraintBottom_toTopOf="@id/username"
app:layout_constraintStart_toEndOf="@id/avatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="Aadam" />
<TextView
android:id="@+id/number_or_username"
android:id="@+id/username"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Signal.Body2"