From 5805539deb6118a45258450f64d64da8ebfdaedd Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 27 Sep 2019 14:02:01 -0400
Subject: [PATCH] Revert "Potential MMS download fix for some users."

This reverts commit 1e375ec494ec63c514552c48dbb34e226cd29071.
---
 .../mms/IncomingLollipopMmsConnection.java    | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
index e0f6739165..a3c58e5513 100644
--- a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
@@ -23,8 +23,6 @@ import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
-import android.os.Bundle;
 import android.telephony.SmsManager;
 import org.thoughtcrime.securesms.logging.Log;
 
@@ -41,7 +39,6 @@ import org.thoughtcrime.securesms.util.Util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Locale;
 import java.util.concurrent.TimeoutException;
 
 public class IncomingLollipopMmsConnection extends LollipopMmsConnection implements IncomingMmsConnection {
@@ -73,12 +70,7 @@ public class IncomingLollipopMmsConnection extends LollipopMmsConnection impleme
     try {
       MmsBodyProvider.Pointer pointer = MmsBodyProvider.makeTemporaryPointer(getContext());
 
-      final String transactionIdString = Util.toIsoString(transactionId);
-      Log.i(TAG, String.format(Locale.ENGLISH, "Downloading subscriptionId=%s multimedia from '%s' [transactionId='%s'] to '%s'",
-                                               subscriptionId,
-                                               contentLocation,
-                                               transactionIdString,
-                                               pointer.getUri()));
+      Log.i(TAG, "downloading multimedia from " + contentLocation + " to " + pointer.getUri());
 
       SmsManager smsManager;
 
@@ -88,17 +80,10 @@ public class IncomingLollipopMmsConnection extends LollipopMmsConnection impleme
         smsManager = SmsManager.getDefault();
       }
 
-      final Bundle configOverrides = smsManager.getCarrierConfigValues();
-
-      if (configOverrides.getBoolean(SmsManager.MMS_CONFIG_APPEND_TRANSACTION_ID)) {
-        contentLocation += transactionIdString;
-        Log.i(TAG, "Appending transactionId to contentLocation at the direction of CarrierConfigValues. New location: " + contentLocation);
-      }
-
       smsManager.downloadMultimediaMessage(getContext(),
                                            contentLocation,
                                            pointer.getUri(),
-                                           configOverrides,
+                                           null,
                                            getPendingIntent());
 
       waitForResult();