TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-24 02:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Be sure we don't let MMS out if the transport is disabled.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-02-23 14:38:41 -08:00
parent 636c50b3b8
commit 8093b14922
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/transport/MmsTransport.java
View File

@ -31,6 +31,7 @@ import org.thoughtcrime.securesms.protocol.WirePrefix;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientFactory; import org.thoughtcrime.securesms.recipients.RecipientFactory;
import org.thoughtcrime.securesms.recipients.RecipientFormattingException; import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.textsecure.crypto.MasterSecret; import org.whispersystems.textsecure.crypto.MasterSecret;
import org.whispersystems.textsecure.crypto.SessionCipher; import org.whispersystems.textsecure.crypto.SessionCipher;
import org.whispersystems.textsecure.crypto.protocol.CiphertextMessage; import org.whispersystems.textsecure.crypto.protocol.CiphertextMessage;
@ -62,6 +63,12 @@ public class MmsTransport {
} }
public MmsSendResult deliver(SendReq message) throws UndeliverableMessageException { public MmsSendResult deliver(SendReq message) throws UndeliverableMessageException {
if (TextSecurePreferences.isPushRegistered(context) &&
!TextSecurePreferences.isSmsFallbackEnabled(context))
{
throw new UndeliverableMessageException("MMS Transport is not enabled!");
}
try { try {
if (isCdmaDevice()) { if (isCdmaDevice()) {
Log.w("MmsTransport", "Sending MMS directly without radio change..."); Log.w("MmsTransport", "Sending MMS directly without radio change...");