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

requestRouteToHost of URL rather than MMSC on MMS Download

Browse Source 
// FREEBIE

Closes #1806
This commit is contained in:
Moxie Marlinspike 2014-08-12 16:07:09 -07:00
parent feabbb33d2
commit 7b0479ff0f
2 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,25 +82,20 @@ public class MmsDownloadHelper extends MmsCommunication {
byte[] pdu = null; byte[] pdu = null;
for (MmsConnectionParameters.Apn param : connectionParameters.get()) { 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 { try {
pdu = makeRequest(context, url, proxy, proxyPort); if (proxyIfPossible && param.hasProxy()) {
} catch(IOException e) { if (checkRouteToHost(context, param.getProxy(), usingMmsRadio)) {
Log.w("MmsDownloadHelper", "Request failed: "+e.getMessage()); 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; if (pdu != null) break;
} catch (IOException ioe) {
Log.w("MmsDownloadHelper", ioe);
} }
} }

29
src/org/thoughtcrime/securesms/mms/MmsSendHelper.java
View File

@ -101,28 +101,25 @@ public class MmsSendHelper extends MmsCommunication {
Log.w(TAG, "Sending MMS of length: " + mms.length); Log.w(TAG, "Sending MMS of length: " + mms.length);
try { try {
MmsConnectionParameters parameters = getMmsConnectionParameters(context, apn); MmsConnectionParameters parameters = getMmsConnectionParameters(context, apn);
for (MmsConnectionParameters.Apn param : parameters.get()) { 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 { try {
byte[] response = makePost(context, param.getMmsc(), proxy, proxyPort, mms); 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; if (response != null) return response;
} catch(IOException e) {
Log.w("MmsSendHelper", "Request failed: "+e.getMessage());
} }
} }
} catch (IOException ioe) {
Log.w(TAG, ioe);
} }
}
throw new IOException("Connection manager could not obtain route to host."); throw new IOException("Connection manager could not obtain route to host.");
} catch (ApnUnavailableException aue) { } catch (ApnUnavailableException aue) {
Log.w(TAG, aue); Log.w(TAG, aue);