From fda900e95d89183fec112d18d2cd63e83bff5f35 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Fri, 17 Jul 2015 18:02:17 -0700
Subject: [PATCH] Fix for receiving message after upgrade with no MS set.

// FREEBIE
---
 src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index 17993d0c4b..4a4fdc7c51 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -34,6 +34,8 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.VersionTracker;
 import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.libaxolotl.DuplicateMessageException;
 import org.whispersystems.libaxolotl.IdentityKey;
@@ -96,6 +98,11 @@ public class PushDecryptJob extends ContextJob {
   public void onRun() throws NoSuchMessageException {
     if (!IdentityKeyUtil.hasIdentityKey(context)) {
       Log.w(TAG, "Skipping job, waiting for migration...");
+
+      if (KeyCachingService.getMasterSecret(context) != null) {
+        MessageNotifier.updateNotification(context, null, -2);
+      }
+
       return;
     }