Merge pull request signalapp#1887 from mcginty/mms-3xx

allow url client to follow redirects before checking response code
gsajith · Aug 29, 2014 · 877f2a2 · 877f2a2
2 parents 102b405 + eb462f0
commit 877f2a2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/org/thoughtcrime/securesms/mms/MmsCommunication.java b/src/org/thoughtcrime/securesms/mms/MmsCommunication.java
@@ -180,6 +180,7 @@ protected static HttpURLConnection constructHttpClient(String urlString, String
       urlConnection = (HttpURLConnection) url.openConnection();
     }
 
+    urlConnection.setInstanceFollowRedirects(true);
     urlConnection.setConnectTimeout(20*1000);
     urlConnection.setReadTimeout(20*1000);
     urlConnection.setUseCaches(false);

diff --git a/src/org/thoughtcrime/securesms/mms/MmsDownloadHelper.java b/src/org/thoughtcrime/securesms/mms/MmsDownloadHelper.java
@@ -21,6 +21,7 @@
 import android.util.Log;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.util.Arrays;
 
@@ -45,15 +46,16 @@ private static byte[] makeRequest(String url, String proxy, int proxyPort)
       Log.w(TAG, "Connecting to " + url);
       client.connect();
 
-      int responseCode = client.getResponseCode();
+      final InputStream is           = client.getInputStream();
+      final int         responseCode = client.getResponseCode();
 
       Log.w(TAG, "Response code: " + responseCode + "/" + client.getResponseMessage());
 
       if (responseCode != 200) {
         throw new IOException("non-200 response");
       }
 
-      return parseResponse(client.getInputStream());
+      return parseResponse(is);
     } finally {
       if (client != null) client.disconnect();
     }

diff --git a/src/org/thoughtcrime/securesms/mms/MmsSendHelper.java b/src/org/thoughtcrime/securesms/mms/MmsSendHelper.java
@@ -66,15 +66,16 @@ private static byte[] makePost(String url, String proxy, int proxyPort, byte[] m
 
       Log.w(TAG, "Payload sent");
 
-      int responseCode = client.getResponseCode();
+      final InputStream is           = client.getInputStream();
+      final int         responseCode = client.getResponseCode();
 
       Log.w(TAG, "Response code: " + responseCode + "/" + client.getResponseMessage());
 
       if (responseCode != 200) {
         throw new IOException("non-200 response");
       }
 
-      return parseResponse(client.getInputStream());
+      return parseResponse(is);
     } finally {
       if (client != null) client.disconnect();
     }