TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-20 14:54:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send m-notifyresp-ind after retrieving MMS

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-05-06 19:09:06 -07:00
parent a057b628eb
commit 81107a98eb
5 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/thoughtcrime/securesms/service/MmsDownloader.java
View File

@@ -28,10 +28,15 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.mms.MmsDownloadHelper;
import org.thoughtcrime.securesms.mms.MmsSendHelper;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
import org.thoughtcrime.securesms.protocol.WirePrefix;
import ws.com.google.android.mms.InvalidHeaderValueException;
import ws.com.google.android.mms.MmsException;
import ws.com.google.android.mms.pdu.NotifyRespInd;
import ws.com.google.android.mms.pdu.PduComposer;
import ws.com.google.android.mms.pdu.PduHeaders;
import ws.com.google.android.mms.pdu.RetrieveConf;
import java.io.IOException;
@@ -100,9 +105,7 @@ public class MmsDownloader extends MmscProcessor {
}
storeRetrievedMms(mmsDatabase, item, retrieved);
// NotifyRespInd notifyResponse = new NotifyRespInd(PduHeaders.CURRENT_MMS_VERSION, item.getTransactionId(), PduHeaders.STATUS_RETRIEVED);
// MmsSendHelper.sendMms(context, new PduComposer(context, notifyResponse).make());
sendRetrievedAcknowledgement(item);
} catch (IOException e) {
Log.w("MmsDownloader", e);
@@ -147,6 +150,22 @@ public class MmsDownloader extends MmscProcessor {
MessageNotifier.updateNotification(context, item.getMasterSecret(), messageAndThreadId.second);
}
private void sendRetrievedAcknowledgement(DownloadItem item) {
try {
NotifyRespInd notifyResponse = new NotifyRespInd(PduHeaders.CURRENT_MMS_VERSION,
item.getTransactionId(),
PduHeaders.STATUS_RETRIEVED);
MmsSendHelper.sendNotificationReceived(context, new PduComposer(context, notifyResponse).make(),
getApnInformation(), item.useMmsRadioMode(),
item.proxyRequestIfPossible());
} catch (InvalidHeaderValueException e) {
Log.w("MmsDownloader", e);
} catch (IOException e) {
Log.w("MmsDownloader", e);
}
}
protected void handleConnectivityChange() {
LinkedList<DownloadItem> downloadItems = (LinkedList<DownloadItem>)pendingMessages.clone();

2
src/org/thoughtcrime/securesms/service/SmsListener.java
View File

@@ -110,8 +110,6 @@ public class SmsListener extends BroadcastReceiver {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
String messageBody = getSmsMessageBodyFromIntent(intent);
Log.w("SmsListener", "Checking challenge: " + messageBody);
if (messageBody == null)
return false;