Use recipientId's in ContactSelectionListAdapter.

src/org/thoughtcrime/securesms/ContactSelectionActivity.java

@@ -25,6 +25,7 @@ import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
@@ -113,10 +114,10 @@ public abstract class ContactSelectionActivity extends PassphraseRequiredActionB
   }
 
   @Override
-  public void onContactSelected(String number) {}
+  public void onContactSelected(RecipientId recipientId) {}
 
   @Override
-  public void onContactDeselected(String number) {}
+  public void onContactDeselected(RecipientId recipientId) {}
 
   private static class RefreshDirectoryTask extends AsyncTask<Context, Void, Void> {
 

src/org/thoughtcrime/securesms/ContactSelectionListFragment.java

@@ -50,6 +50,7 @@ import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.permissions.Permissions;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -80,7 +81,7 @@ public final class ContactSelectionListFragment extends    Fragment
   public static final String RECENTS      = "recents";
 
   private TextView                    emptyText;
-  private Set<String>                 selectedContacts;
+  private Set<RecipientId>            selectedContacts;
   private OnContactSelectedListener   onContactSelectedListener;
   private SwipeRefreshLayout          swipeRefresh;
   private View                        showContactsLayout;
@@ -161,8 +162,8 @@ public final class ContactSelectionListFragment extends    Fragment
     Permissions.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
   }
 
-  public @NonNull List<String> getSelectedContacts() {
+  public @NonNull List<RecipientId> getSelectedContacts() {
-    List<String> selected = new LinkedList<>();
+    List<RecipientId> selected = new LinkedList<>();
     if (selectedContacts != null) {
       selected.addAll(selectedContacts);
     }
@@ -323,14 +324,14 @@ public final class ContactSelectionListFragment extends    Fragment
   private class ListClickListener implements ContactSelectionListAdapter.ItemClickListener {
     @Override
     public void onItemClick(ContactSelectionListItem contact) {
-      if (!isMulti() || !selectedContacts.contains(contact.getNumber())) {
+      if (!isMulti() || !selectedContacts.contains(contact.getRecipientId())) {
-        selectedContacts.add(contact.getNumber());
+        selectedContacts.add(contact.getRecipientId());
         contact.setChecked(true);
-        if (onContactSelectedListener != null) onContactSelectedListener.onContactSelected(contact.getNumber());
+        if (onContactSelectedListener != null) onContactSelectedListener.onContactSelected(contact.getRecipientId());
       } else {
-        selectedContacts.remove(contact.getNumber());
+        selectedContacts.remove(contact.getRecipientId());
         contact.setChecked(false);
-        if (onContactSelectedListener != null) onContactSelectedListener.onContactDeselected(contact.getNumber());
+        if (onContactSelectedListener != null) onContactSelectedListener.onContactDeselected(contact.getRecipientId());
       }
     }
   }
@@ -344,8 +345,8 @@ public final class ContactSelectionListFragment extends    Fragment
   }
 
   public interface OnContactSelectedListener {
-    void onContactSelected(String number);
+    void onContactSelected(RecipientId recipientId);
-    void onContactDeselected(String number);
+    void onContactDeselected(RecipientId recipientId);
   }
 
   public interface InviteCallback {

src/org/thoughtcrime/securesms/GroupCreateActivity.java

@@ -284,10 +284,10 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
 
     switch (reqCode) {
       case PICK_CONTACT:
-        List<String> selected = data.getStringArrayListExtra("contacts");
+        List<RecipientId> selected = data.getParcelableArrayListExtra("contacts");
 
-        for (String contact : selected) {
+        for (RecipientId id : selected) {
-          Recipient recipient = Recipient.external(this, contact);
+          Recipient recipient = Recipient.resolved(id);
           addSelectedContacts(recipient);
         }
         break;

src/org/thoughtcrime/securesms/InviteActivity.java

@@ -29,6 +29,7 @@ import org.thoughtcrime.securesms.components.ContactFilterToolbar.OnFilterChange
 import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -97,12 +98,12 @@ public class InviteActivity extends PassphraseRequiredActionBarActivity implemen
   }
 
   @Override
-  public void onContactSelected(String number) {
+  public void onContactSelected(RecipientId recipientId) {
     updateSmsButtonText();
   }
 
   @Override
-  public void onContactDeselected(String number) {
+  public void onContactDeselected(RecipientId recipientId) {
     updateSmsButtonText();
   }
 

src/org/thoughtcrime/securesms/NewConversationActivity.java

@@ -27,6 +27,7 @@ import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 
 /**
  * Activity container for starting a new conversation.
@@ -49,8 +50,8 @@ public class NewConversationActivity extends ContactSelectionActivity
   }
 
   @Override
-  public void onContactSelected(String number) {
+  public void onContactSelected(RecipientId recipientId) {
-    Recipient recipient = Recipient.external(this, number);
+    Recipient recipient = Recipient.resolved(recipientId);
 
     Intent intent = new Intent(this, ConversationActivity.class);
     intent.putExtra(ConversationActivity.RECIPIENT_EXTRA, recipient.getId());

src/org/thoughtcrime/securesms/PushContactSelectionActivity.java

@@ -19,6 +19,8 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 
+import org.thoughtcrime.securesms.recipients.RecipientId;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,11 +43,9 @@ public class PushContactSelectionActivity extends ContactSelectionActivity {
     getToolbar().setNavigationIcon(R.drawable.ic_check_white_24dp);
     getToolbar().setNavigationOnClickListener(v -> {
       Intent resultIntent = getIntent();
-      List<String> selectedContacts = contactsFragment.getSelectedContacts();
+      List<RecipientId> selectedContacts = contactsFragment.getSelectedContacts();
 
-      if (selectedContacts != null) {
+      resultIntent.putParcelableArrayListExtra("contacts", new ArrayList<>(selectedContacts));
-        resultIntent.putStringArrayListExtra("contacts", new ArrayList<>(selectedContacts));
-      }
 
       setResult(RESULT_OK, resultIntent);
       finish();

src/org/thoughtcrime/securesms/ShareActivity.java

@@ -272,9 +272,9 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   @Override
-  public void onContactSelected(String number) {
+  public void onContactSelected(RecipientId recipientId) {
     SimpleTask.run(this.getLifecycle(), () -> {
-      Recipient recipient = Recipient.external(this, number);
+      Recipient recipient = Recipient.resolved(recipientId);
       long existingThread = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipient);
       return new Pair<>(existingThread, recipient);
     }, result -> {
@@ -284,8 +284,7 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   @Override
-  public void onContactDeselected(String number) {
+  public void onContactDeselected(RecipientId recipientId) {
-
   }
 
   @Override

src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java

@@ -70,7 +70,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
   private final ItemClickListener clickListener;
   private final GlideRequests     glideRequests;
 
-  private final Set<String> selectedContacts = new HashSet<>();
+  private final Set<RecipientId> selectedContacts = new HashSet<>();
 
   public abstract static class ViewHolder extends RecyclerView.ViewHolder {
 
@@ -189,7 +189,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
 
     viewHolder.unbind(glideRequests);
     viewHolder.bind(glideRequests, id, contactType, name, number, labelText, color, multiSelect);
-    viewHolder.setChecked(selectedContacts.contains(number));
+    viewHolder.setChecked(selectedContacts.contains(id));
   }
 
   @Override
@@ -222,7 +222,7 @@ public class ContactSelectionListAdapter extends CursorRecyclerViewAdapter<ViewH
     return getHeaderString(position);
   }
 
-  public Set<String> getSelectedContacts() {
+  public Set<RecipientId> getSelectedContacts() {
     return selectedContacts;
   }
 

src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java

@@ -129,8 +129,8 @@ public class ContactSelectionListItem extends LinearLayout implements RecipientF
     }
   }
 
-  public String getNumber() {
+  public @Nullable RecipientId getRecipientId() {
-    return number;
+    return recipient != null ? recipient.getId() : null;
   }
 
   @Override