mirror of
https://github.com/oxen-io/session-android.git
synced 2024-12-24 08:47:46 +00:00
requestRouteToHost of URL rather than MMSC on MMS Download
// FREEBIE Closes #1806
This commit is contained in:
parent
feabbb33d2
commit
7b0479ff0f
@ -82,25 +82,20 @@ public class MmsDownloadHelper extends MmsCommunication {
|
||||
byte[] pdu = null;
|
||||
|
||||
for (MmsConnectionParameters.Apn param : connectionParameters.get()) {
|
||||
String proxy = null;
|
||||
int proxyPort = 80;
|
||||
boolean hasRoute;
|
||||
|
||||
if (proxyIfPossible && param.hasProxy()) {
|
||||
proxy = param.getProxy();
|
||||
proxyPort = param.getPort();
|
||||
hasRoute = checkRouteToHost(context, proxy, usingMmsRadio);
|
||||
} else {
|
||||
hasRoute = checkRouteToHost(context, Uri.parse(param.getMmsc()).getHost(), usingMmsRadio);
|
||||
}
|
||||
|
||||
if (hasRoute) {
|
||||
try {
|
||||
pdu = makeRequest(context, url, proxy, proxyPort);
|
||||
} catch(IOException e) {
|
||||
Log.w("MmsDownloadHelper", "Request failed: "+e.getMessage());
|
||||
try {
|
||||
if (proxyIfPossible && param.hasProxy()) {
|
||||
if (checkRouteToHost(context, param.getProxy(), usingMmsRadio)) {
|
||||
pdu = makeRequest(context, url, param.getProxy(), param.getPort());
|
||||
}
|
||||
} else {
|
||||
if (checkRouteToHost(context, Uri.parse(url).getHost(), usingMmsRadio)) {
|
||||
pdu = makeRequest(context, url, null, -1);
|
||||
}
|
||||
}
|
||||
|
||||
if (pdu != null) break;
|
||||
} catch (IOException ioe) {
|
||||
Log.w("MmsDownloadHelper", ioe);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -101,28 +101,25 @@ public class MmsSendHelper extends MmsCommunication {
|
||||
Log.w(TAG, "Sending MMS of length: " + mms.length);
|
||||
try {
|
||||
MmsConnectionParameters parameters = getMmsConnectionParameters(context, apn);
|
||||
|
||||
for (MmsConnectionParameters.Apn param : parameters.get()) {
|
||||
String proxy = null;
|
||||
int proxyPort = 80;
|
||||
boolean hasRoute;
|
||||
|
||||
if(useProxyIfAvailable && param.hasProxy()){
|
||||
proxy = param.getProxy();
|
||||
proxyPort = param.getPort();
|
||||
hasRoute = checkRouteToHost(context, proxy, usingMmsRadio);
|
||||
} else {
|
||||
hasRoute = checkRouteToHost(context, Uri.parse(param.getMmsc()).getHost(), usingMmsRadio);
|
||||
}
|
||||
|
||||
if (hasRoute) {
|
||||
try {
|
||||
byte[] response = makePost(context, param.getMmsc(), proxy, proxyPort, mms);
|
||||
if (response != null) return response;
|
||||
} catch(IOException e) {
|
||||
Log.w("MmsSendHelper", "Request failed: "+e.getMessage());
|
||||
try {
|
||||
if (useProxyIfAvailable && param.hasProxy()) {
|
||||
if (checkRouteToHost(context, param.getProxy(), usingMmsRadio)) {
|
||||
byte[] response = makePost(context, param.getMmsc(), param.getProxy(), param.getPort(), mms);
|
||||
if (response != null) return response;
|
||||
}
|
||||
} else {
|
||||
if (checkRouteToHost(context, Uri.parse(param.getMmsc()).getHost(), usingMmsRadio)) {
|
||||
byte[] response = makePost(context, param.getMmsc(), null, -1, mms);
|
||||
if (response != null) return response;
|
||||
}
|
||||
}
|
||||
} catch (IOException ioe) {
|
||||
Log.w(TAG, ioe);
|
||||
}
|
||||
}
|
||||
|
||||
throw new IOException("Connection manager could not obtain route to host.");
|
||||
} catch (ApnUnavailableException aue) {
|
||||
Log.w(TAG, aue);
|
||||
|
Loading…
x
Reference in New Issue
Block a user