|
|
@ -429,13 +429,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
setMedia(data.getData(), MediaType.AUDIO);
|
|
|
|
setMedia(data.getData(), MediaType.AUDIO);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
case PICK_CONTACT:
|
|
|
|
case PICK_CONTACT:
|
|
|
|
// TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
|
|
|
|
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));
|
|
|
@ -1400,13 +1398,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
private void setMedia(@Nullable Uri uri, @NonNull MediaType mediaType, int width, int height) {
|
|
|
|
private void setMedia(@Nullable Uri uri, @NonNull MediaType mediaType, int width, int height) {
|
|
|
|
if (uri == null) return;
|
|
|
|
if (uri == null) return;
|
|
|
|
|
|
|
|
|
|
|
|
// TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
|
|
|
|
if (MediaType.VCARD.equals(mediaType) && isSecureText) {
|
|
|
|
|
|
|
|
openContactShareEditor(uri);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
attachmentManager.setMedia(glideRequests, uri, mediaType, getCurrentMediaConstraints(), width, height);
|
|
|
|
attachmentManager.setMedia(glideRequests, uri, mediaType, getCurrentMediaConstraints(), width, height);
|
|
|
|
// if (MediaType.VCARD.equals(mediaType) && isSecureText) {
|
|
|
|
}
|
|
|
|
// openContactShareEditor(uri);
|
|
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
|
|
// attachmentManager.setMedia(glideRequests, uri, mediaType, getCurrentMediaConstraints(), width, height);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void openContactShareEditor(Uri contactUri) {
|
|
|
|
private void openContactShareEditor(Uri contactUri) {
|
|
|
|