TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-22 16:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

disambiguate

Browse Source
This commit is contained in:
Moxie Marlinspike 2012-10-31 17:56:39 -07:00
parent 93c0fffc31
commit f26dbb2f34
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/org/thoughtcrime/securesms/mms/MmsDownloadHelper.java
View File

@ -19,8 +19,6 @@ package org.thoughtcrime.securesms.mms;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse; import org.apache.http.HttpResponse;
import org.apache.http.StatusLine; import org.apache.http.StatusLine;
import org.apache.http.client.ClientProtocolException; import org.apache.http.client.ClientProtocolException;
@ -30,34 +28,25 @@ import org.apache.http.client.methods.HttpGet;
import ws.com.google.android.mms.MmsException; import ws.com.google.android.mms.MmsException;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
public class MmsDownloadHelper extends MmsCommunication { public class MmsDownloadHelper extends MmsCommunication {
private static byte[] makeRequest(MmsConnectionParameters connectionParameters, String url) private static byte[] makeRequest(MmsConnectionParameters connectionParameters, String url)
throws ClientProtocolException, IOException throws ClientProtocolException, IOException
{ {
try {
HttpClient client = constructHttpClient(connectionParameters); HttpClient client = constructHttpClient(connectionParameters);
URI hostUrl = new URI(url); HttpGet request = new HttpGet(url);
HttpHost target = new HttpHost(hostUrl.getHost(), hostUrl.getPort(), HttpHost.DEFAULT_SCHEME_NAME);
HttpRequest request = new HttpGet(url);
request.setParams(client.getParams()); request.setParams(client.getParams());
request.addHeader("Accept", "*/*, application/vnd.wap.mms-message, application/vnd.wap.sic"); request.addHeader("Accept", "*/*, application/vnd.wap.mms-message, application/vnd.wap.sic");
HttpResponse response = client.execute(target, request); HttpResponse response = client.execute(request);
StatusLine status = response.getStatusLine(); StatusLine status = response.getStatusLine();
if (status.getStatusCode() != 200) if (status.getStatusCode() != 200)
throw new IOException("Non-successful HTTP response: " + status.getReasonPhrase()); throw new IOException("Non-successful HTTP response: " + status.getReasonPhrase());
return parseResponse(response.getEntity()); return parseResponse(response.getEntity());
} catch (URISyntaxException use) {
Log.w("MmsDownlader", use);
throw new IOException("Bad URI syntax");
}
} }
public static byte[] retrieveMms(Context context, String url, String apn) throws IOException { public static byte[] retrieveMms(Context context, String url, String apn) throws IOException {