Refactor MMS send/download to be synchronous.

1) Make the radio change a synchronous action with a timeout.

2) Move the send logic into an MmsTransport, in preparation for
   UniversalTransport composition.

3) Move the download logic into a synchronous receiver.

src/org/thoughtcrime/securesms/mms/MmsCommunication.java

@@ -153,7 +153,7 @@ public class MmsCommunication {
       int ipAddress               = Conversions.byteArrayToIntLittleEndian(ipAddressBytes, 0);
       ConnectivityManager manager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
 
-      if (!manager.requestRouteToHost(MmsDownloader.TYPE_MOBILE_MMS, ipAddress))
+      if (!manager.requestRouteToHost(MmsRadio.TYPE_MOBILE_MMS, ipAddress))
         throw new IOException("Connection manager could not obtain route to host.");
     }
   }

src/org/thoughtcrime/securesms/mms/MmsRadio.java

@@ -0,0 +1,143 @@
+package org.thoughtcrime.securesms.mms;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.os.PowerManager;
+import android.util.Log;
+
+import org.thoughtcrime.securesms.util.Util;
+
+public class MmsRadio {
+
+  private static MmsRadio instance;
+
+  public static synchronized MmsRadio getInstance(Context context) {
+    if (instance == null)
+      instance = new MmsRadio(context);
+
+    return instance;
+  }
+
+  ///
+
+  private static final String FEATURE_ENABLE_MMS = "enableMMS";
+  private static final int APN_ALREADY_ACTIVE    = 0;
+  public  static final int TYPE_MOBILE_MMS       = 2;
+
+  private final Context context;
+
+  private ConnectivityManager   connectivityManager;
+  private ConnectivityListener  connectivityListener;
+  private PowerManager.WakeLock wakeLock;
+  private int connectedCounter = 0;
+
+  private MmsRadio(Context context) {
+    PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
+    this.context             = context;
+    this.connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    this.wakeLock            = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "MMS Connection");
+    this.wakeLock.setReferenceCounted(true);
+  }
+
+  public String getApnInformation() {
+    return connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS).getExtraInfo();
+  }
+
+  public synchronized void disconnect() {
+    Log.w("MmsRadio", "MMS Radio Disconnect Called...");
+    wakeLock.release();
+    connectedCounter--;
+
+    Log.w("MmsRadio", "Reference count: " + connectedCounter);
+
+    if (connectedCounter == 0) {
+      Log.w("MmsRadio", "Turning off MMS radio...");
+      connectivityManager.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE, FEATURE_ENABLE_MMS);
+
+      if (connectivityListener != null) {
+        Log.w("MmsRadio", "Unregistering receiver...");
+        context.unregisterReceiver(connectivityListener);
+        connectivityListener = null;
+      }
+    }
+  }
+
+  public synchronized void connect() throws MmsRadioException {
+    int status = connectivityManager.startUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
+                                                              FEATURE_ENABLE_MMS);
+
+    Log.w("MmsRadio", "startUsingNetworkFeature status: " + status);
+
+    if (status == APN_ALREADY_ACTIVE) {
+      wakeLock.acquire();
+      connectedCounter++;
+      return;
+    } else {
+      wakeLock.acquire();
+      connectedCounter++;
+
+      if (connectivityListener == null) {
+        IntentFilter filter  = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+        connectivityListener = new ConnectivityListener();
+        context.registerReceiver(connectivityListener, filter);
+      }
+
+      Util.wait(this, 30000);
+
+      if (!isConnected()) {
+        Log.w("MmsRadio", "Got back from connectivity wait, and not connected...");
+        disconnect();
+        throw new MmsRadioException("Unable to successfully enable MMS radio.");
+      }
+    }
+  }
+
+  private boolean isConnected() {
+    NetworkInfo info = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS);
+
+    if ((info == null) || (info.getType() != TYPE_MOBILE_MMS) || !info.isConnected())
+      return false;
+
+    return true;
+  }
+
+  private boolean isConnectivityPossible() {
+    NetworkInfo networkInfo = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS);
+
+    return networkInfo != null  && networkInfo.isAvailable();
+  }
+
+  private boolean isConnectivityFailure() {
+    NetworkInfo networkInfo = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS);
+
+    return networkInfo == null || networkInfo.getDetailedState() == NetworkInfo.DetailedState.FAILED;
+  }
+
+  private synchronized void issueConnectivityChange() {
+    if (isConnected()) {
+      Log.w("MmsRadio", "Notifying connected...");
+      notifyAll();
+      return;
+    }
+
+    if (!isConnected() && (isConnectivityFailure() || !isConnectivityPossible())) {
+      Log.w("MmsRadio", "Notifying not connected...");
+      notifyAll();
+      return;
+    }
+  }
+
+  private class ConnectivityListener extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+      Log.w("MmsRadio", "Got connectivity change...");
+      issueConnectivityChange();
+    }
+  }
+
+
+}

src/org/thoughtcrime/securesms/mms/MmsRadioException.java

@@ -0,0 +1,7 @@
+package org.thoughtcrime.securesms.mms;
+
+public class MmsRadioException extends Throwable {
+  public MmsRadioException(String s) {
+    super(s);
+  }
+}

src/org/thoughtcrime/securesms/mms/MmsSendHelper.java

@@ -24,10 +24,8 @@ import android.util.Log;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ByteArrayEntity;
-import org.thoughtcrime.securesms.service.MmscProcessor;
 import org.whispersystems.textsecure.util.Util;
 
 import java.io.IOException;
@@ -39,7 +37,9 @@ import ws.com.google.android.mms.pdu.SendConf;
 
 public class MmsSendHelper extends MmsCommunication {
 
-  private static byte[] makePost(Context context, MmsConnectionParameters parameters, byte[] mms) throws ClientProtocolException, IOException {
+  private static byte[] makePost(Context context, MmsConnectionParameters parameters, byte[] mms)
+      throws IOException
+  {
     AndroidHttpClient client = null;
 
     try {
@@ -114,7 +114,7 @@ public class MmsSendHelper extends MmsCommunication {
   public static boolean hasNecessaryApnDetails(Context context) {
     try {
       ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
-      String apn = connectivityManager.getNetworkInfo(MmscProcessor.TYPE_MOBILE_MMS).getExtraInfo();
+      String apn = connectivityManager.getNetworkInfo(MmsRadio.TYPE_MOBILE_MMS).getExtraInfo();
 
       MmsCommunication.getMmsConnectionParameters(context, apn, true);
       return true;