keejef
/
session-android
mirror of https://github.com/oxen-io/session-android
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Initial fixes for MMS retrieval.

Browse Source 
1) Parse the APN information based on what the ConnectionManager
tells us.

2) Accept email addresses as a valid Recipient format.
pull/1/head
Moxie Marlinspike 13 years ago
parent 59e7226183
commit cf9dc51f31
9 changed files with 224 additions and 217 deletions
Show Stats Download Patch File Download Diff File

4
src/org/thoughtcrime/securesms/database/MmsDatabase.java
Unescape Escape View File

@ -421,9 +421,9 @@ public class MmsDatabase extends Database {
database.delete(TABLE_NAME, null, null);
}
public Cursor getCarrierMmsInformation() {
public Cursor getCarrierMmsInformation(String apn) {
Uri uri = Uri.withAppendedPath(Uri.parse("content://telephony/carriers"), "current");
String selection = "type = 'mms'";
String selection = (apn == null || apn.trim().length() == 0) ? null : String.format("apn = '%s'", apn.trim());
return context.getContentResolver().query(uri, null, selection, null, null);
}

20
src/org/thoughtcrime/securesms/mms/MmsCommunication.java
Unescape Escape View File

@ -16,9 +16,10 @@
*/
package org.thoughtcrime.securesms.mms;
import java.io.DataInputStream;
import java.io.IOException;
import java.net.InetAddress;
import android.content.Context;
import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.Uri;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
@ -42,15 +43,16 @@ import org.thoughtcrime.securesms.util.Conversions;
import ws.com.google.android.mms.MmsException;
import android.content.Context;
import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.Uri;
import java.io.DataInputStream;
import java.io.IOException;
import java.net.InetAddress;
public class MmsCommunication {
protected static MmsConnectionParameters getMmsConnectionParameters(Context context) throws MmsException {
Cursor cursor = DatabaseFactory.getMmsDatabase(context).getCarrierMmsInformation();
protected static MmsConnectionParameters getMmsConnectionParameters(Context context, String apn)
throws MmsException
{
Cursor cursor = DatabaseFactory.getMmsDatabase(context).getCarrierMmsInformation(apn);
try {
if (cursor == null || !cursor.moveToFirst())

18
src/org/thoughtcrime/securesms/mms/MmsDownloadHelper.java
Unescape Escape View File

@ -16,9 +16,8 @@
*/
package org.thoughtcrime.securesms.mms;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import android.content.Context;
import android.util.Log;
import org.apache.http.HttpHost;
import org.apache.http.HttpRequest;
@ -30,12 +29,15 @@ import org.apache.http.client.methods.HttpGet;
import ws.com.google.android.mms.MmsException;
import android.content.Context;
import android.util.Log;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
public class MmsDownloadHelper extends MmsCommunication {
private static byte[] makeRequest(MmsConnectionParameters connectionParameters, String url) throws ClientProtocolException, IOException {
private static byte[] makeRequest(MmsConnectionParameters connectionParameters, String url)
throws ClientProtocolException, IOException
{
try {
HttpClient client = constructHttpClient(connectionParameters);
URI hostUrl = new URI(url);
@ -58,9 +60,9 @@ public class MmsDownloadHelper extends MmsCommunication {
}
}
public static byte[] retrieveMms(Context context, String url) throws IOException {
public static byte[] retrieveMms(Context context, String url, String apn) throws IOException {
try {
MmsConnectionParameters connectionParameters = getMmsConnectionParameters(context);
MmsConnectionParameters connectionParameters = getMmsConnectionParameters(context, apn);
checkRouteToHost(context, connectionParameters, url);
return makeRequest(connectionParameters, url);

16
src/org/thoughtcrime/securesms/mms/MmsSendHelper.java
Unescape Escape View File

@ -16,9 +16,8 @@
*/
package org.thoughtcrime.securesms.mms;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import android.content.Context;
import android.util.Log;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
@ -27,11 +26,12 @@ import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ByteArrayEntity;
import org.thoughtcrime.securesms.util.Hex;
import ws.com.google.android.mms.MmsException;
import android.content.Context;
import android.util.Log;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
public class MmsSendHelper extends MmsCommunication {
@ -63,10 +63,10 @@ public class MmsSendHelper extends MmsCommunication {
}
}
public static byte[] sendMms(Context context, byte[] mms) throws IOException {
public static byte[] sendMms(Context context, byte[] mms, String apn) throws IOException {
Log.w("MmsSender", "Sending MMS of length: " + mms.length);
try {
MmsConnectionParameters parameters = getMmsConnectionParameters(context);
MmsConnectionParameters parameters = getMmsConnectionParameters(context, apn);
checkRouteToHost(context, parameters, parameters.getMmsc());
return makePost(parameters, mms);
} catch (MmsException me) {

3
src/org/thoughtcrime/securesms/recipients/RecipientFactory.java
Unescape Escape View File

@ -19,7 +19,6 @@ package org.thoughtcrime.securesms.recipients;
import android.content.Context;
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.telephony.PhoneNumberUtils;
import android.util.Log;
import org.thoughtcrime.securesms.R;
@ -146,7 +145,7 @@ public class RecipientFactory {
int end = recipient.indexOf('>');
String value = recipient.substring(begin + 1, end);
if (PhoneNumberUtils.isWellFormedSmsAddress(value))
if (NumberUtil.isValidSmsOrEmail(value))
return value;
else
throw new RecipientFormattingException("Bracketed value: " + value + " is not valid.");

14
src/org/thoughtcrime/securesms/service/MmsDownloader.java
Unescape Escape View File

@ -16,8 +16,9 @@
*/
package org.thoughtcrime.securesms.service;
import java.io.IOException;
import java.util.LinkedList;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import org.thoughtcrime.securesms.crypto.DecryptingQueue;
import org.thoughtcrime.securesms.crypto.MasterSecret;
@ -29,9 +30,9 @@ import org.thoughtcrime.securesms.protocol.WirePrefix;
import ws.com.google.android.mms.MmsException;
import ws.com.google.android.mms.pdu.PduParser;
import ws.com.google.android.mms.pdu.RetrieveConf;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import java.io.IOException;
import java.util.LinkedList;
public class MmsDownloader extends MmscProcessor {
@ -66,7 +67,8 @@ public class MmsDownloader extends MmscProcessor {
try {
byte[] pdu = MmsDownloadHelper.retrieveMms(context, item.getContentLocation());
byte[] pdu = MmsDownloadHelper.retrieveMms(context, item.getContentLocation(),
getApnInformation());
RetrieveConf retrieved = (RetrieveConf)new PduParser(pdu).parse();
for (int i=0;i<retrieved.getBody().getPartsNum();i++) {

7
src/org/thoughtcrime/securesms/service/MmsReceiver.java
Unescape Escape View File

@ -16,6 +16,10 @@
*/
package org.thoughtcrime.securesms.service;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase;
@ -24,9 +28,6 @@ import ws.com.google.android.mms.pdu.GenericPdu;
import ws.com.google.android.mms.pdu.NotificationInd;
import ws.com.google.android.mms.pdu.PduHeaders;
import ws.com.google.android.mms.pdu.PduParser;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
public class MmsReceiver {

19
src/org/thoughtcrime/securesms/service/MmsSender.java
Unescape Escape View File

@ -16,16 +16,16 @@
*/
package org.thoughtcrime.securesms.service;
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedList;
import android.content.Context;
import android.content.Intent;
import android.telephony.TelephonyManager;
import android.util.Log;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.SessionCipher;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.mms.MmsSendHelper;
import org.thoughtcrime.securesms.mms.PngTransport;
import org.thoughtcrime.securesms.mms.TextTransport;
import org.thoughtcrime.securesms.protocol.WirePrefix;
import org.thoughtcrime.securesms.recipients.Recipient;
@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.util.Hex;
import ws.com.google.android.mms.ContentType;
import ws.com.google.android.mms.MmsException;
import ws.com.google.android.mms.pdu.CharacterSets;
import ws.com.google.android.mms.pdu.EncodedStringValue;
import ws.com.google.android.mms.pdu.PduBody;
import ws.com.google.android.mms.pdu.PduComposer;
@ -42,10 +41,10 @@ import ws.com.google.android.mms.pdu.PduParser;
import ws.com.google.android.mms.pdu.PduPart;
import ws.com.google.android.mms.pdu.SendConf;
import ws.com.google.android.mms.pdu.SendReq;
import android.content.Context;
import android.content.Intent;
import android.telephony.TelephonyManager;
import android.util.Log;
import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedList;
public class MmsSender extends MmscProcessor {
@ -140,7 +139,7 @@ public class MmsSender extends MmscProcessor {
if (number != null && number.trim().length() != 0)
pdu.setFrom(new EncodedStringValue(number));
byte[] response = MmsSendHelper.sendMms(context, new PduComposer(context, pdu).make());
byte[] response = MmsSendHelper.sendMms(context, new PduComposer(context, pdu).make(), getApnInformation());
SendConf conf = (SendConf) new PduParser(response).parse();
for (int i=0;i<pdu.getBody().getPartsNum();i++) {

6
src/org/thoughtcrime/securesms/service/MmscProcessor.java
Unescape Escape View File

@ -16,8 +16,6 @@
*/
package org.thoughtcrime.securesms.service;
import java.util.LinkedList;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@ -48,6 +46,10 @@ public abstract class MmscProcessor {
this.wakeLock.setReferenceCounted(false);
}
protected String getApnInformation() {
return connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS).getExtraInfo();
}
protected boolean isConnected() {
NetworkInfo info = connectivityManager.getNetworkInfo(TYPE_MOBILE_MMS);

Write Preview
Loading…
Cancel
Save