mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Disable shared contact sending. 

Sending shared contacts isn't backwards-compatible, so we want to have a
few releases where receiving is enabled, but not sending. That way, when
we enable sending, most users should be able to properly receive the
shared contact messages.
fork-5.53.8
Greyson Parrelli 2018-05-21 10:44:30 -04:00
rodzic ca260a92e3
commit c0b75c2ef5
1 zmienionych plików z 14 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
src/org/thoughtcrime/securesms/ConversationActivity.java
Wyświetl plik

@ -426,11 +426,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
setMedia(data.getData(), MediaType.AUDIO); setMedia(data.getData(), MediaType.AUDIO);
break; break;
case PICK_CONTACT: case PICK_CONTACT:
if (isSecureText && !isSmsForced()) { // TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
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));
@ -1392,11 +1394,13 @@ 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;
if (MediaType.VCARD.equals(mediaType) && isSecureText) { // TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
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) {