|
|
@ -428,12 +428,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PICK_CONTACT:
|
|
|
|
case PICK_CONTACT:
|
|
|
|
// TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
|
|
|
|
// TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
|
|
|
|
addAttachmentContactInfo(data.getData());
|
|
|
|
|
|
|
|
// if (isSecureText && !isSmsForced()) {
|
|
|
|
|
|
|
|
// openContactShareEditor(data.getData());
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// addAttachmentContactInfo(data.getData());
|
|
|
|
// addAttachmentContactInfo(data.getData());
|
|
|
|
// }
|
|
|
|
if (isSecureText && !isSmsForced()) {
|
|
|
|
|
|
|
|
openContactShareEditor(data.getData());
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
addAttachmentContactInfo(data.getData());
|
|
|
|
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case GET_CONTACT_DETAILS:
|
|
|
|
case GET_CONTACT_DETAILS:
|
|
|
|
sendSharedContact(data.getParcelableArrayListExtra(ContactShareEditActivity.KEY_CONTACTS));
|
|
|
|
sendSharedContact(data.getParcelableArrayListExtra(ContactShareEditActivity.KEY_CONTACTS));
|
|
|
|