mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-22 16:07:30 +00:00
disambiguate send
This commit is contained in:
parent
f26dbb2f34
commit
6b18f66e19
@ -19,7 +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.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,37 +29,28 @@ import org.apache.http.entity.ByteArrayEntity;
|
|||||||
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 MmsSendHelper extends MmsCommunication {
|
public class MmsSendHelper extends MmsCommunication {
|
||||||
|
|
||||||
private static byte[] makePost(MmsConnectionParameters parameters, byte[] mms) throws ClientProtocolException, IOException {
|
private static byte[] makePost(MmsConnectionParameters parameters, byte[] mms) throws ClientProtocolException, IOException {
|
||||||
Log.w("MmsSender", "Sending MMS1 of length: " + mms.length);
|
Log.w("MmsSender", "Sending MMS1 of length: " + mms.length);
|
||||||
try {
|
HttpClient client = constructHttpClient(parameters);
|
||||||
HttpClient client = constructHttpClient(parameters);
|
HttpPost request = new HttpPost(parameters.getMmsc());
|
||||||
URI hostUrl = new URI(parameters.getMmsc());
|
ByteArrayEntity entity = new ByteArrayEntity(mms);
|
||||||
HttpHost target = new HttpHost(hostUrl.getHost(), hostUrl.getPort(), HttpHost.DEFAULT_SCHEME_NAME);
|
|
||||||
HttpPost request = new HttpPost(parameters.getMmsc());
|
|
||||||
ByteArrayEntity entity = new ByteArrayEntity(mms);
|
|
||||||
|
|
||||||
entity.setContentType("application/vnd.wap.mms-message");
|
entity.setContentType("application/vnd.wap.mms-message");
|
||||||
|
|
||||||
request.setEntity(entity);
|
request.setEntity(entity);
|
||||||
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[] sendMms(Context context, byte[] mms, String apn) throws IOException {
|
public static byte[] sendMms(Context context, byte[] mms, String apn) throws IOException {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user