Merge pull request #3987 from deltachat/adb/issue-3984

remove address from vcard

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

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();
   }
 }

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" -->
 
-
-    <TextView android:id="@+id/addr"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:textDirection="ltr"
-              android:singleLine="true"
-              android:ellipsize="marquee"
-              android:textAppearance="?android:attr/textAppearanceSmall"
-              android:textSize="14sp"
-              android:fontFamily="sans-serif-light"
-              tools:text="user@example.com" />
-
   </LinearLayout>
 
 </org.thoughtcrime.securesms.contacts.ContactSelectionListItem>