Fixed a bug in PgpContactAdapter.

Author: DenBond7

FlowCrypt/src/main/java/com/flowcrypt/email/ui/adapter/PgpContactAdapter.java

@@ -48,25 +48,21 @@ public CharSequence convertToString(Cursor cursor) {
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-        TextView textViewName = (TextView) view.findViewById(R.id.textViewName);
-        TextView textViewEmail = (TextView) view.findViewById(R.id.textViewEmail);
-        TextView textViewOnlyEmail = (TextView) view.findViewById(R.id.textViewOnlyEmail);
+        TextView textViewName = view.findViewById(R.id.textViewName);
+        TextView textViewEmail = view.findViewById(R.id.textViewEmail);
+        TextView textViewOnlyEmail = view.findViewById(R.id.textViewOnlyEmail);
 
         String name = cursor.getString(cursor.getColumnIndex(ContactsDaoSource.COL_NAME));
         String email = cursor.getString(cursor.getColumnIndex(ContactsDaoSource.COL_EMAIL));
 
         if (TextUtils.isEmpty(name)) {
-            textViewName.setVisibility(View.GONE);
-            textViewEmail.setVisibility(View.GONE);
-            textViewOnlyEmail.setVisibility(View.VISIBLE);
+            textViewEmail.setText(null);
+            textViewName.setText(null);
             textViewOnlyEmail.setText(email);
         } else {
-            textViewName.setVisibility(View.VISIBLE);
-            textViewEmail.setVisibility(View.VISIBLE);
-            textViewOnlyEmail.setVisibility(View.GONE);
-
             textViewEmail.setText(email);
             textViewName.setText(name);
+            textViewOnlyEmail.setText(null);
         }
     }
 }

FlowCrypt/src/main/res/layout/pgp_contact_item.xml

@@ -17,7 +17,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content_small"
         android:textSize="@dimen/default_text_size_big"
-        android:visibility="visible"
         app:layout_constraintBottom_toTopOf="@+id/textViewEmail"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,7 +27,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/default_margin_content_small"
-        android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textViewName"
@@ -42,7 +40,6 @@
         android:layout_marginStart="@dimen/default_margin_content_small"
         android:layout_marginTop="@dimen/default_margin_content_small"
         android:textSize="@dimen/default_text_size_big"
-        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"