TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-05 07:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Subtle rebase conflicts...

Browse Source
This commit is contained in:
Moxie Marlinspike
2013-11-18 15:29:19 -08:00
parent f10d6a7b0b
commit fde8d32848
7 changed files with 23 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/thoughtcrime/securesms/service/KeyCachingService.java
View File

@@ -27,6 +27,7 @@ import android.os.Binder;
import android.os.Build;
import android.os.IBinder;
import android.os.SystemClock;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
import android.widget.RemoteViews;

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

@@ -164,7 +164,7 @@ public class MmsDownloader {
private void retrieveAndStore(MasterSecret masterSecret, long messageId, long threadId,
String contentLocation, byte[] transactionId,
boolean radioEnabled, boolean useProxy)
throws IOException, MmsException
throws IOException, MmsException, ApnUnavailableException
{
RetrieveConf retrieved = MmsDownloadHelper.retrieveMms(context, contentLocation,
radio.getApnInformation(),