TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 17:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable shared contact sending.

Browse Source
This commit is contained in:
Greyson Parrelli 2018-06-29 11:08:13 -07:00
parent 707ca53a23
commit 290b184491
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -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) {