From 4996e04f3844207856e2d42dd1d83b98e9aa9b7e Mon Sep 17 00:00:00 2001
From: Ville Ranki <ville.ranki@iki.fi>
Date: Thu, 13 Dec 2018 18:54:23 +0200
Subject: [PATCH] Adds visible contact id in the contact properties. Allows
 copying the id. Fixes #2756

---
 .../activity/VectorMemberDetailsActivity.java | 30 ++++++++-----------
 .../res/layout/activity_member_details.xml    | 29 +++++++++++++++++-
 vector/src/main/res/values/strings.xml        |  1 +
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java
index f530ff821b..27ffe16888 100644
--- a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java
@@ -108,7 +108,6 @@ public class VectorMemberDetailsActivity extends MXCActionBarActivity implements
     private static final int ITEM_ACTION_START_VIDEO_CALL = 13;
     private static final int ITEM_ACTION_MENTION = 14;
     private static final int ITEM_ACTION_DEVICES = 15;
-
     private static final int VECTOR_ROOM_MODERATOR_LEVEL = 50;
     private static final int VECTOR_ROOM_ADMIN_LEVEL = 100;
 
@@ -131,6 +130,8 @@ public class VectorMemberDetailsActivity extends MXCActionBarActivity implements
     ImageView mMemberAvatarBadgeImageView;
     @BindView(R.id.member_details_name)
     TextView mMemberNameTextView;
+    @BindView(R.id.member_details_id)
+    TextView mMemberIdTextView;
     @BindView(R.id.member_details_presence)
     TextView mPresenceTextView;
 
@@ -1223,23 +1224,6 @@ public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition
             });
 
 
-            // when clicking on the username
-            // switch member name <-> member id
-            mMemberNameTextView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    User user = mSession.getDataHandler().getUser(mMemberId);
-
-                    if (TextUtils.equals(mMemberNameTextView.getText(), mMemberId)) {
-                        if ((null != user) && !TextUtils.isEmpty(user.displayname)) {
-                            mMemberNameTextView.setText(user.displayname);
-                        }
-                    } else {
-                        mMemberNameTextView.setText(mMemberId);
-                    }
-                }
-            });
-
             // long tap : copy to the clipboard
             mMemberNameTextView.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
@@ -1249,6 +1233,14 @@ public boolean onLongClick(View v) {
                 }
             });
 
+            // copy id to the clipboard on click
+            mMemberIdTextView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    SystemUtilsKt.copyToClipboard(VectorMemberDetailsActivity.this, mMemberIdTextView.getText());
+                }
+            });
+
             mMemberAvatarImageView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -1478,9 +1470,11 @@ private void updateUi() {
         if (null != mMemberNameTextView) {
             if ((null != mRoomMember) && !TextUtils.isEmpty(mRoomMember.displayname)) {
                 mMemberNameTextView.setText(mRoomMember.displayname);
+                mMemberIdTextView.setText(mRoomMember.getUserId());
             } else {
                 refreshUser();
                 mMemberNameTextView.setText(mUser.displayname);
+                mMemberIdTextView.setText(mUser.user_id);
             }
 
             // do not display the activity name in the action bar
diff --git a/vector/src/main/res/layout/activity_member_details.xml b/vector/src/main/res/layout/activity_member_details.xml
index e93658fc6d..ac3a8e73f8 100644
--- a/vector/src/main/res/layout/activity_member_details.xml
+++ b/vector/src/main/res/layout/activity_member_details.xml
@@ -63,12 +63,39 @@
                 android:textColor="@android:color/white"
                 android:textSize="20sp" />
 
+            <!-- member id -->
+            <TextView
+                android:id="@+id/member_details_id"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/member_details_name"
+                android:layout_marginBottom="16dp"
+                android:gravity="center_horizontal"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?attr/vctr_default_text_light_color"
+                android:textSize="18sp" />
+            <!-- member id copy button -->
+            <TextView
+                android:id="@+id/member_details_id_copy"
+                android:text="@string/copy_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/member_details_name"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentEnd="true"
+                android:paddingRight="10dp"
+                android:paddingEnd="10dp"
+                android:maxLines="1"
+                android:textColor="@android:color/white"
+                android:textSize="20sp" />
+
             <!-- the member presence -->
             <TextView
                 android:id="@+id/member_details_presence"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@id/member_details_name"
+                android:layout_below="@id/member_details_id"
                 android:layout_marginBottom="16dp"
                 android:ellipsize="end"
                 android:gravity="center_horizontal"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 5447d8e1bb..8db363bb02 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -40,6 +40,7 @@
     <string name="leave">Leave</string>
     <string name="send">Send</string>
     <string name="copy">Copy</string>
+    <string name="copy_icon">⎘</string>
     <string name="resend">Resend</string>
     <string name="redact">Redact</string>
     <string name="quote">Quote</string>