empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Catch exception from misconfigured MMSC

Browse source 
Fixes #7339
This commit is contained in:
Moxie Marlinspike 2018-01-16 11:32:51 -08:00
parent 94e2b9e66e
commit fe02b3f8d3
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
View file

@ -48,14 +48,24 @@ public class IncomingLegacyMmsConnection extends LegacyMmsConnection implements
} }
private HttpUriRequest constructRequest(Apn contentApn, boolean useProxy) throws IOException { private HttpUriRequest constructRequest(Apn contentApn, boolean useProxy) throws IOException {
HttpGetHC4 request = new HttpGetHC4(contentApn.getMmsc()); HttpGetHC4 request;
try {
request = new HttpGetHC4(contentApn.getMmsc());
} catch (IllegalArgumentException e) {
// #7339
throw new IOException(e);
}
for (Header header : getBaseHeaders()) { for (Header header : getBaseHeaders()) {
request.addHeader(header); request.addHeader(header);
} }
if (useProxy) { if (useProxy) {
HttpHost proxy = new HttpHost(contentApn.getProxy(), contentApn.getPort()); HttpHost proxy = new HttpHost(contentApn.getProxy(), contentApn.getPort());
request.setConfig(RequestConfig.custom().setProxy(proxy).build()); request.setConfig(RequestConfig.custom().setProxy(proxy).build());
} }
return request; return request;
} }