diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index f3c9b7ab74..b9e3f8e49e 100644
--- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -34,6 +34,8 @@ public class ApplicationMigrationService extends Service
@Override
public void onStart(Intent intent, int startId) {
+ if (intent == null) return;
+
if (intent.getAction() != null && intent.getAction().equals(MIGRATE_DATABASE)) {
handleDatabaseMigration((MasterSecret)intent.getParcelableExtra("master_secret"));
}
diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
index 068b945be4..f721db062e 100644
--- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -75,6 +75,8 @@ public class KeyCachingService extends Service {
@Override
public void onStart(Intent intent, int startId) {
+ if (intent == null) return;
+
if (intent.getAction() != null && intent.getAction().equals(CLEAR_KEY_ACTION))
handleClearKey();
else if (intent.getAction() != null && intent.getAction().equals(ACTIVITY_START_EVENT))
diff --git a/src/org/thoughtcrime/securesms/service/SendReceiveService.java b/src/org/thoughtcrime/securesms/service/SendReceiveService.java
index baee31128a..6a0c912ba6 100644
--- a/src/org/thoughtcrime/securesms/service/SendReceiveService.java
+++ b/src/org/thoughtcrime/securesms/service/SendReceiveService.java
@@ -1,6 +1,6 @@
-/**
+/**
* Copyright (C) 2011 Whisper Systems
- *
+ *
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -10,20 +10,12 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
package org.thoughtcrime.securesms.service;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.database.CanonicalSessionMigrator;
-import org.thoughtcrime.securesms.util.WorkerThread;
-
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
@@ -33,14 +25,21 @@ import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.os.Handler;
import android.os.IBinder;
-import android.os.Looper;
import android.os.Message;
import android.util.Log;
import android.widget.Toast;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.CanonicalSessionMigrator;
+import org.thoughtcrime.securesms.util.WorkerThread;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* Services that handles sending/receiving of SMS/MMS.
- *
+ *
* @author Moxie Marlinspike
*/
@@ -54,27 +53,27 @@ public class SendReceiveService extends Service {
public static final String RECEIVE_MMS_ACTION = "org.thoughtcrime.securesms.SendReceiveService.RECEIVE_MMS_ACTION";
public static final String DOWNLOAD_MMS_ACTION = "org.thoughtcrime.securesms.SendReceiveService.DOWNLOAD_MMS_ACTION";
public static final String DOWNLOAD_MMS_CONNECTIVITY_ACTION = "org.thoughtcrime.securesms.SendReceiveService.DOWNLOAD_MMS_CONNECTIVITY_ACTION";
-
+
private static final int SEND_SMS = 0;
private static final int RECEIVE_SMS = 1;
private static final int SEND_MMS = 2;
private static final int RECEIVE_MMS = 3;
private static final int DOWNLOAD_MMS = 4;
-
+
private ToastHandler toastHandler;
-
+
private SmsReceiver smsReceiver;
private SmsSender smsSender;
private MmsReceiver mmsReceiver;
private MmsSender mmsSender;
private MmsDownloader mmsDownloader;
-
+
private MasterSecret masterSecret;
private NewKeyReceiver receiver;
private List workQueue;
private List pendingSecretList;
private Thread workerThread;
-
+
@Override
public void onCreate() {
initializeHandlers();
@@ -83,9 +82,11 @@ public class SendReceiveService extends Service {
initializeWorkQueue();
initializeMasterSecret();
}
-
+
@Override
public void onStart(Intent intent, int startId) {
+ if (intent == null) return;
+
if (intent.getAction().equals(SEND_SMS_ACTION))
scheduleSecretRequiredIntent(SEND_SMS, intent);
else if (intent.getAction().equals(RECEIVE_SMS_ACTION))
@@ -98,7 +99,7 @@ public class SendReceiveService extends Service {
scheduleIntent(RECEIVE_MMS, intent);
else if (intent.getAction().equals(DOWNLOAD_MMS_ACTION) || intent.getAction().equals(DOWNLOAD_MMS_CONNECTIVITY_ACTION))
scheduleSecretRequiredIntent(DOWNLOAD_MMS, intent);
- else
+ else
Log.w("SendReceiveService", "Received intent with unknown action: " + intent.getAction());
}
@@ -106,11 +107,11 @@ public class SendReceiveService extends Service {
public IBinder onBind(Intent intent) {
return null;
}
-
+
private void initializeHandlers() {
toastHandler = new ToastHandler();
}
-
+
private void initializeProcessors() {
smsReceiver = new SmsReceiver(this);
smsSender = new SmsSender(this);
@@ -118,15 +119,15 @@ public class SendReceiveService extends Service {
mmsSender = new MmsSender(this);
mmsDownloader = new MmsDownloader(this, toastHandler);
}
-
+
private void initializeWorkQueue() {
pendingSecretList = new LinkedList();
workQueue = new LinkedList();
workerThread = new WorkerThread(workQueue, "SendReceveService-WorkerThread");
workerThread.start();
- }
-
+ }
+
private void initializeMasterSecret() {
receiver = new NewKeyReceiver();
IntentFilter filter = new IntentFilter(KeyCachingService.NEW_KEY_EVENT);
@@ -135,18 +136,18 @@ public class SendReceiveService extends Service {
Intent bindIntent = new Intent(this, KeyCachingService.class);
bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE);
}
-
+
private void initializeWithMasterSecret(MasterSecret masterSecret) {
Log.w("SendReceiveService", "SendReceive service got master secret: " + masterSecret);
-
+
if (masterSecret != null) {
synchronized (workQueue) {
this.masterSecret = masterSecret;
-
+
Iterator iterator = pendingSecretList.iterator();
- while (iterator.hasNext())
+ while (iterator.hasNext())
workQueue.add(iterator.next());
-
+
workQueue.notifyAll();
}
}
@@ -155,50 +156,50 @@ public class SendReceiveService extends Service {
private void initializeAddressCanonicalization() {
CanonicalSessionMigrator.migrateSessions(this);
}
-
+
private void scheduleIntent(int what, Intent intent) {
Runnable work = new SendReceiveWorkItem(intent, what);
-
+
synchronized (workQueue) {
workQueue.add(work);
workQueue.notifyAll();
}
}
-
+
private void scheduleSecretRequiredIntent(int what, Intent intent) {
Runnable work = new SendReceiveWorkItem(intent, what);
-
+
synchronized (workQueue) {
if (masterSecret != null) {
workQueue.add(work);
workQueue.notifyAll();
- } else {
- pendingSecretList.add(work);
+ } else {
+ pendingSecretList.add(work);
}
}
}
-
+
private class SendReceiveWorkItem implements Runnable {
-
+
private final Intent intent;
private final int what;
-
+
public SendReceiveWorkItem(Intent intent, int what) {
this.intent = intent;
this.what = what;
}
-
+
public void run() {
switch (what) {
case RECEIVE_SMS: smsReceiver.process(masterSecret, intent); return;
case SEND_SMS: smsSender.process(masterSecret, intent); return;
case RECEIVE_MMS: mmsReceiver.process(masterSecret, intent); return;
case SEND_MMS: mmsSender.process(masterSecret, intent); return;
- case DOWNLOAD_MMS: mmsDownloader.process(masterSecret, intent); return;
+ case DOWNLOAD_MMS: mmsDownloader.process(masterSecret, intent); return;
}
}
}
-
+
public class ToastHandler extends Handler {
public void makeToast(String toast) {
Message message = this.obtainMessage();
@@ -218,12 +219,12 @@ public class SendReceiveService extends Service {
initializeWithMasterSecret(masterSecret);
- SendReceiveService.this.unbindService(this);
+ SendReceiveService.this.unbindService(this);
}
public void onServiceDisconnected(ComponentName name) {}
};
-
+
private class NewKeyReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
@@ -231,5 +232,5 @@ public class SendReceiveService extends Service {
initializeWithMasterSecret((MasterSecret)intent.getParcelableExtra("master_secret"));
}
};
-
+
}