From b05c84061676a5bb16d78a483f57d7a5ee1b7fd0 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 10 Mar 2013 15:47:13 -0700
Subject: [PATCH] Fix for MMS send bug with an APN proxy.

---
 src/org/thoughtcrime/securesms/crypto/SessionCipher.java  | 2 +-
 src/org/thoughtcrime/securesms/service/MmsDownloader.java | 2 ++
 src/org/thoughtcrime/securesms/service/MmsSender.java     | 8 +++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/crypto/SessionCipher.java b/src/org/thoughtcrime/securesms/crypto/SessionCipher.java
index 9174cf0ba7..6ae2d5f059 100644
--- a/src/org/thoughtcrime/securesms/crypto/SessionCipher.java
+++ b/src/org/thoughtcrime/securesms/crypto/SessionCipher.java
@@ -53,7 +53,7 @@ import android.util.Log;
 
 public class SessionCipher {
 	
-  public static Object CIPHER_LOCK = new Object();
+  public static final Object CIPHER_LOCK = new Object();
 	
   public static final int CIPHER_KEY_LENGTH = 16;
   public static final int MAC_KEY_LENGTH    = 20;
diff --git a/src/org/thoughtcrime/securesms/service/MmsDownloader.java b/src/org/thoughtcrime/securesms/service/MmsDownloader.java
index d3db620ebd..876fd1d748 100644
--- a/src/org/thoughtcrime/securesms/service/MmsDownloader.java
+++ b/src/org/thoughtcrime/securesms/service/MmsDownloader.java
@@ -109,8 +109,10 @@ public class MmsDownloader extends MmscProcessor {
     } catch (IOException e) {
       Log.w("MmsDownloader", e);
       if (!item.useMmsRadioMode() && !item.proxyRequestIfPossible()) {
+        Log.w("MmsDownloader", "Falling back to just radio mode...");
         scheduleDownloadWithRadioMode(item);
       } else if (!item.proxyRequestIfPossible()) {
+        Log.w("MmsDownloadeR", "Falling back to radio mode and proxy...");
         scheduleDownloadWithRadioModeAndProxy(item);
       } else {
         DatabaseFactory.getMmsDatabase(context).markDownloadState(item.getMessageId(), MmsDatabase.Types.DOWNLOAD_SOFT_FAILURE);
diff --git a/src/org/thoughtcrime/securesms/service/MmsSender.java b/src/org/thoughtcrime/securesms/service/MmsSender.java
index a6aaad6dad..1cead66291 100644
--- a/src/org/thoughtcrime/securesms/service/MmsSender.java
+++ b/src/org/thoughtcrime/securesms/service/MmsSender.java
@@ -239,13 +239,15 @@ public class MmsSender extends MmscProcessor {
   }
 
   private void scheduleSendWithMmsRadioAndProxy(SendItem item) {
-    item.useMmsRadio = true;
+    Log.w("MmsSender", "Falling back to sending MMS with radio and proxy...");
+    item.useMmsRadio         = true;
+    item.useProxyIfAvailable = true;
     handleSendMmsAction(item);
   }
 
   private void scheduleSendWithMmsRadio(SendItem item) {
-    item.useMmsRadio         = true;
-    item.useProxyIfAvailable = true;
+    Log.w("MmsSender", "Falling back to sending MMS with radio only...");
+    item.useMmsRadio = true;
     handleSendMmsAction(item);
   }