mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-26 01:37:43 +00:00
54dbffaf30
The "contact" option in the attachments tray now brings you through an optimized contact sharing flow, allowing you to select specific fields to share. The contact is then presented as a special message type, allowing you to interact with the card to add the contact to your system contacts, invite them to signal, initiate a signal message, etc.
171 lines
8.2 KiB
Java
171 lines
8.2 KiB
Java
package org.thoughtcrime.securesms.contactshare;
|
|
|
|
import android.support.annotation.NonNull;
|
|
import android.support.annotation.Nullable;
|
|
|
|
import org.thoughtcrime.securesms.attachments.Attachment;
|
|
import org.thoughtcrime.securesms.attachments.AttachmentId;
|
|
import org.thoughtcrime.securesms.attachments.PointerAttachment;
|
|
import org.whispersystems.libsignal.util.guava.Optional;
|
|
import org.whispersystems.signalservice.api.messages.shared.SharedContact;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.LinkedList;
|
|
import java.util.List;
|
|
|
|
import static org.thoughtcrime.securesms.contactshare.Contact.*;
|
|
|
|
public class ContactModelMapper {
|
|
|
|
public static SharedContact.Builder localToRemoteBuilder(@NonNull Contact contact) {
|
|
List<SharedContact.Phone> phoneNumbers = new ArrayList<>(contact.getPhoneNumbers().size());
|
|
List<SharedContact.Email> emails = new ArrayList<>(contact.getEmails().size());
|
|
List<SharedContact.PostalAddress> postalAddresses = new ArrayList<>(contact.getPostalAddresses().size());
|
|
|
|
for (Phone phone : contact.getPhoneNumbers()) {
|
|
phoneNumbers.add(new SharedContact.Phone.Builder().setValue(phone.getNumber())
|
|
.setType(localToRemoteType(phone.getType()))
|
|
.setLabel(phone.getLabel())
|
|
.build());
|
|
}
|
|
|
|
for (Email email : contact.getEmails()) {
|
|
emails.add(new SharedContact.Email.Builder().setValue(email.getEmail())
|
|
.setType(localToRemoteType(email.getType()))
|
|
.setLabel(email.getLabel())
|
|
.build());
|
|
}
|
|
|
|
for (PostalAddress postalAddress : contact.getPostalAddresses()) {
|
|
postalAddresses.add(new SharedContact.PostalAddress.Builder().setType(localToRemoteType(postalAddress.getType()))
|
|
.setLabel(postalAddress.getLabel())
|
|
.setStreet(postalAddress.getStreet())
|
|
.setPobox(postalAddress.getPoBox())
|
|
.setNeighborhood(postalAddress.getNeighborhood())
|
|
.setCity(postalAddress.getCity())
|
|
.setRegion(postalAddress.getRegion())
|
|
.setPostcode(postalAddress.getPostalCode())
|
|
.setCountry(postalAddress.getCountry())
|
|
.build());
|
|
}
|
|
|
|
SharedContact.Name name = new SharedContact.Name.Builder().setDisplay(contact.getName().getDisplayName())
|
|
.setGiven(contact.getName().getGivenName())
|
|
.setFamily(contact.getName().getFamilyName())
|
|
.setPrefix(contact.getName().getPrefix())
|
|
.setSuffix(contact.getName().getSuffix())
|
|
.setMiddle(contact.getName().getMiddleName())
|
|
.build();
|
|
|
|
return new SharedContact.Builder().setName(name)
|
|
.withOrganization(contact.getOrganization())
|
|
.withPhones(phoneNumbers)
|
|
.withEmails(emails)
|
|
.withAddresses(postalAddresses);
|
|
}
|
|
|
|
public static Contact remoteToLocal(@NonNull SharedContact sharedContact) {
|
|
Name name = new Name(sharedContact.getName().getDisplay().orNull(),
|
|
sharedContact.getName().getGiven().orNull(),
|
|
sharedContact.getName().getFamily().orNull(),
|
|
sharedContact.getName().getPrefix().orNull(),
|
|
sharedContact.getName().getSuffix().orNull(),
|
|
sharedContact.getName().getMiddle().orNull());
|
|
|
|
List<Phone> phoneNumbers = new LinkedList<>();
|
|
if (sharedContact.getPhone().isPresent()) {
|
|
for (SharedContact.Phone phone : sharedContact.getPhone().get()) {
|
|
phoneNumbers.add(new Phone(phone.getValue(),
|
|
remoteToLocalType(phone.getType()),
|
|
phone.getLabel().orNull()));
|
|
}
|
|
}
|
|
|
|
List<Email> emails = new LinkedList<>();
|
|
if (sharedContact.getEmail().isPresent()) {
|
|
for (SharedContact.Email email : sharedContact.getEmail().get()) {
|
|
emails.add(new Email(email.getValue(),
|
|
remoteToLocalType(email.getType()),
|
|
email.getLabel().orNull()));
|
|
}
|
|
}
|
|
|
|
List<PostalAddress> postalAddresses = new LinkedList<>();
|
|
if (sharedContact.getAddress().isPresent()) {
|
|
for (SharedContact.PostalAddress postalAddress : sharedContact.getAddress().get()) {
|
|
postalAddresses.add(new PostalAddress(remoteToLocalType(postalAddress.getType()),
|
|
postalAddress.getLabel().orNull(),
|
|
postalAddress.getStreet().orNull(),
|
|
postalAddress.getPobox().orNull(),
|
|
postalAddress.getNeighborhood().orNull(),
|
|
postalAddress.getCity().orNull(),
|
|
postalAddress.getRegion().orNull(),
|
|
postalAddress.getPostcode().orNull(),
|
|
postalAddress.getCountry().orNull()));
|
|
}
|
|
}
|
|
|
|
Avatar avatar = null;
|
|
if (sharedContact.getAvatar().isPresent()) {
|
|
Attachment attachment = PointerAttachment.forPointer(Optional.of(sharedContact.getAvatar().get().getAttachment().asPointer())).get();
|
|
boolean isProfile = sharedContact.getAvatar().get().isProfile();
|
|
|
|
avatar = new Avatar(null, attachment, isProfile);
|
|
}
|
|
|
|
return new Contact(name, sharedContact.getOrganization().orNull(), phoneNumbers, emails, postalAddresses, avatar);
|
|
}
|
|
|
|
private static Phone.Type remoteToLocalType(SharedContact.Phone.Type type) {
|
|
switch (type) {
|
|
case HOME: return Phone.Type.HOME;
|
|
case MOBILE: return Phone.Type.MOBILE;
|
|
case WORK: return Phone.Type.WORK;
|
|
default: return Phone.Type.CUSTOM;
|
|
}
|
|
}
|
|
|
|
private static Email.Type remoteToLocalType(SharedContact.Email.Type type) {
|
|
switch (type) {
|
|
case HOME: return Email.Type.HOME;
|
|
case MOBILE: return Email.Type.MOBILE;
|
|
case WORK: return Email.Type.WORK;
|
|
default: return Email.Type.CUSTOM;
|
|
}
|
|
}
|
|
|
|
private static PostalAddress.Type remoteToLocalType(SharedContact.PostalAddress.Type type) {
|
|
switch (type) {
|
|
case HOME: return PostalAddress.Type.HOME;
|
|
case WORK: return PostalAddress.Type.WORK;
|
|
default: return PostalAddress.Type.CUSTOM;
|
|
}
|
|
}
|
|
|
|
private static SharedContact.Phone.Type localToRemoteType(Phone.Type type) {
|
|
switch (type) {
|
|
case HOME: return SharedContact.Phone.Type.HOME;
|
|
case MOBILE: return SharedContact.Phone.Type.MOBILE;
|
|
case WORK: return SharedContact.Phone.Type.WORK;
|
|
default: return SharedContact.Phone.Type.CUSTOM;
|
|
}
|
|
}
|
|
|
|
private static SharedContact.Email.Type localToRemoteType(Email.Type type) {
|
|
switch (type) {
|
|
case HOME: return SharedContact.Email.Type.HOME;
|
|
case MOBILE: return SharedContact.Email.Type.MOBILE;
|
|
case WORK: return SharedContact.Email.Type.WORK;
|
|
default: return SharedContact.Email.Type.CUSTOM;
|
|
}
|
|
}
|
|
|
|
private static SharedContact.PostalAddress.Type localToRemoteType(PostalAddress.Type type) {
|
|
switch (type) {
|
|
case HOME: return SharedContact.PostalAddress.Type.HOME;
|
|
case WORK: return SharedContact.PostalAddress.Type.WORK;
|
|
default: return SharedContact.PostalAddress.Type.CUSTOM;
|
|
}
|
|
}
|
|
}
|