Pass on incoming messages until DB is imported.

mikehotel · Feb 17, 2013 · 1ff4fd8 · 1ff4fd8
1 parent 5eb0432
commit 1ff4fd8
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/src/org/thoughtcrime/securesms/service/MmsListener.java b/src/org/thoughtcrime/securesms/service/MmsListener.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,64 +10,68 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 package org.thoughtcrime.securesms.service;
 
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.protocol.WirePrefix;
 
 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.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Build;
-import android.preference.PreferenceManager;
-import android.util.Log;
 
 public class MmsListener extends BroadcastReceiver {
 
   private boolean isRelevent(Context context, Intent intent) {
     if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.DONUT)
       return false;
-
+
+    if (!ApplicationMigrationService.isDatabaseImported(context))
+      return false;
+
     if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(ApplicationPreferencesActivity.ALL_MMS_PERF, true))
       return true;
-		
+
     byte[] mmsData   = intent.getByteArrayExtra("data");
     PduParser parser = new PduParser(mmsData);
     GenericPdu pdu   = parser.parse();
-        
+
     if (pdu.getMessageType() != PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND)
       return false;
-        
+
     NotificationInd notificationPdu = (NotificationInd)pdu;
-        
+
     if (notificationPdu.getSubject() == null)
       return false;
-        
+
     return WirePrefix.isEncryptedMmsSubject(notificationPdu.getSubject().getString());
   }
-	
+
   @Override
     public void onReceive(Context context, Intent intent) {
     Log.w("MmsListener", "Got MMS broadcast...");
-		
+
     if (isRelevent(context, intent)) {
       intent.setAction(SendReceiveService.RECEIVE_MMS_ACTION);
       intent.putExtra("ResultCode", this.getResultCode());
       intent.setClass(context, SendReceiveService.class);
-			
+
       context.startService(intent);
       abortBroadcast();
     }
   }
 
-	
-	
+
+
 }
diff --git a/src/org/thoughtcrime/securesms/service/SmsListener.java b/src/org/thoughtcrime/securesms/service/SmsListener.java
@@ -82,6 +82,9 @@ private boolean isRelevent(Context context, Intent intent) {
     if (isExemption(message, messageBody))
       return false;
 
+    if (!ApplicationMigrationService.isDatabaseImported(context))
+      return false;
+
     if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean("pref_all_sms", true))
       return true;