diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c3f79487..b9dabfe56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * remove deprecated "companion app" code * remove deprecated "Watch Sent Folder" preference * fix sorting of old media in gallery +* don't show email address in shared vcard * update to core 2.23.0 ## v2.22.0 diff --git a/src/main/java/org/thoughtcrime/securesms/components/VcardView.java b/src/main/java/org/thoughtcrime/securesms/components/VcardView.java index 8a9ce5f1c..a5b635bcd 100644 --- a/src/main/java/org/thoughtcrime/securesms/components/VcardView.java +++ b/src/main/java/org/thoughtcrime/securesms/components/VcardView.java @@ -24,7 +24,6 @@ public class VcardView extends FrameLayout { private final @NonNull AvatarView avatar; private final @NonNull TextView name; - private final @NonNull TextView address; private @Nullable SlideClickListener viewListener; private @Nullable VcardSlide slide; @@ -44,7 +43,6 @@ public class VcardView extends FrameLayout { this.avatar = findViewById(R.id.avatar); this.name = findViewById(R.id.name); - this.address = findViewById(R.id.addr); setOnClickListener(v -> { if (viewListener != null && slide != null) { @@ -61,7 +59,6 @@ public class VcardView extends FrameLayout { try { VcardContact vcardContact = rpc.parseVcard(slide.asAttachment().getRealPath(getContext())).get(0); name.setText(vcardContact.displayName); - address.setText(vcardContact.addr); avatar.setAvatar(glideRequests, new Recipient(getContext(), vcardContact), false); this.slide = slide; } catch (RpcException e) { @@ -70,6 +67,6 @@ public class VcardView extends FrameLayout { } public String getDescription() { - return name.getText() + "\n" + address.getText(); + return name.getText().toString(); } } diff --git a/src/main/res/layout/vcard_view.xml b/src/main/res/layout/vcard_view.xml index f9cc74a11..973feb740 100644 --- a/src/main/res/layout/vcard_view.xml +++ b/src/main/res/layout/vcard_view.xml @@ -37,18 +37,6 @@ long word and the chat is muted, then the long word is not shown at all (instead of using `…`). That's why we use android:singleLine="true" --> - - -