Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-24 10:41:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

outgoing group MMS should never be encrypted

Browse Source 
// FREEBIE
This commit is contained in:
Jake McGinty
2014-04-03 11:21:13 -07:00
parent c43ef8bce0
commit cbe87aa05c
3 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/util/DirectoryHelper.java
+15 -7
View File
@@ -7,6 +7,7 @@ import android.widget.Toast;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.whispersystems.textsecure.directory.Directory;
import org.whispersystems.textsecure.directory.NotInDirectoryException;
import org.whispersystems.textsecure.push.ContactTokenDetails;
@@ -77,15 +78,22 @@ public class DirectoryHelper {
}
}
public static boolean isPushDestination(Context context, Recipient recipient) {
if (recipient == null) return false;
public static boolean isPushDestination(Context context, Recipients recipients) {
try {
final String number = recipient.getNumber();
if (number == null) return false;
if (!TextSecurePreferences.isPushRegistered(context)) return false;
if (GroupUtil.isEncodedGroup(number)) return true;
if (recipients == null) {
return false;
}
if (!TextSecurePreferences.isPushRegistered(context)) {
return false;
}
if (!recipients.isSingleRecipient()) {
return false;
}
if (recipients.isGroupRecipient()) {
return true;
}
final String number = recipients.getPrimaryRecipient().getNumber();
final String e164number = Util.canonicalizeNumber(context, number);
return Directory.getInstance(context).isActiveNumber(e164number);