mark auto-fallback to sms as forcedSms

// FREEBIE
This commit is contained in:
Jake McGinty
2014-04-03 16:20:23 -07:00
committed by Moxie Marlinspike
parent 4438b4ae69
commit b715debefc
4 changed files with 9 additions and 9 deletions

View File

@@ -167,6 +167,7 @@ public class UniversalTransport {
if (!isSmsFallbackApprovalRequired) {
Log.w("UniversalTransport", "Falling back to MMS");
DatabaseFactory.getMmsDatabase(context).markAsForcedSms(mediaMessage.getDatabaseMessageId());
return mmsTransport.deliver(mediaMessage);
} else if (!Session.hasEncryptCapableSession(context, masterSecret, recipient)) {
Log.w("UniversalTransport", "Marking message as pending insecure SMS fallback");
@@ -188,6 +189,7 @@ public class UniversalTransport {
if (!isSmsFallbackApprovalRequired) {
Log.w("UniversalTransport", "Falling back to SMS");
DatabaseFactory.getSmsDatabase(context).markAsForcedSms(smsMessage.getId());
smsTransport.deliver(smsMessage);
} else if (!Session.hasEncryptCapableSession(context, masterSecret, recipient)) {
Log.w("UniversalTransport", "Marking message as pending insecure fallback.");