Don't use ConnectivityManager checkRouteToHost for IPv6

moxie0 · moxie0 · commit dfa710a6fce0 · 2013-07-12T15:25:34.000-07:00
T-Mobile LTE now uses IPv6 addresses for their MMSC, which are
incompatible with ConnectivityManager's checkRouteToHost.
diff --git a/src/org/thoughtcrime/securesms/mms/MmsCommunication.java b/src/org/thoughtcrime/securesms/mms/MmsCommunication.java
@@ -148,15 +148,17 @@ private static void checkRouteToHost(Context context, String host, boolean using
       return;
     }
 
-    byte[] ipAddressBytes       = inetAddress.getAddress();
-    int ipAddress               = Conversions.byteArrayToIntLittleEndian(ipAddressBytes, 0);
-    ConnectivityManager manager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+    Log.w("MmsCommunication", "Checking route to address: " + host + " , " + inetAddress.getHostAddress());
 
-    if (!manager.requestRouteToHost(MmsDownloader.TYPE_MOBILE_MMS, ipAddress))
-      throw new IOException("Connection manager could not obtain route to host.");
-    //        if (!manager.requestRouteToHost(ConnectivityManager.TYPE_MOBILE, ipAddress))
-    //        	throw new IOException("Connection manager could not obtain route to host.");
+    byte[] ipAddressBytes = inetAddress.getAddress();
 
+    if (ipAddressBytes != null && ipAddressBytes.length == 4) {
+      int ipAddress               = Conversions.byteArrayToIntLittleEndian(ipAddressBytes, 0);
+      ConnectivityManager manager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
+
+      if (!manager.requestRouteToHost(MmsDownloader.TYPE_MOBILE_MMS, ipAddress))
+        throw new IOException("Connection manager could not obtain route to host.");
+    }
   }
 
   protected static AndroidHttpClient constructHttpClient(Context context, MmsConnectionParameters mmsConfig) {
