From 782bd6003b2bf935494a5f77c2736d5c53e82472 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Tue, 23 May 2017 18:23:47 -0700
Subject: [PATCH] Actually fallback to manual MMS receiving when system fails

Should resolve #6668 for tmobile users on older lollipop phones
// FREEBIE
---
 src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
index 1367b7e312..163e650eb2 100644
--- a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
@@ -67,7 +67,11 @@ public class CompatMmsConnection implements OutgoingMmsConnection, IncomingMmsCo
   {
     if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
       Log.w(TAG, "Receiving via Lollipop API");
-      return new IncomingLollipopMmsConnection(context).retrieve(contentLocation, transactionId, subscriptionId);
+      try {
+        return new IncomingLollipopMmsConnection(context).retrieve(contentLocation, transactionId, subscriptionId);
+      } catch (MmsException e) {
+        Log.w(TAG, e);
+      }
     }
 
     if (subscriptionId == -1) {