|
|
@ -34,6 +34,8 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
|
|
|
|
import org.thoughtcrime.securesms.util.Base64;
|
|
|
|
import org.thoughtcrime.securesms.util.Base64;
|
|
|
|
import org.thoughtcrime.securesms.util.GroupUtil;
|
|
|
|
import org.thoughtcrime.securesms.util.GroupUtil;
|
|
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
|
|
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.jobqueue.JobParameters;
|
|
|
|
import org.whispersystems.libaxolotl.DuplicateMessageException;
|
|
|
|
import org.whispersystems.libaxolotl.DuplicateMessageException;
|
|
|
|
import org.whispersystems.libaxolotl.IdentityKey;
|
|
|
|
import org.whispersystems.libaxolotl.IdentityKey;
|
|
|
@ -96,6 +98,11 @@ public class PushDecryptJob extends ContextJob {
|
|
|
|
public void onRun() throws NoSuchMessageException {
|
|
|
|
public void onRun() throws NoSuchMessageException {
|
|
|
|
if (!IdentityKeyUtil.hasIdentityKey(context)) {
|
|
|
|
if (!IdentityKeyUtil.hasIdentityKey(context)) {
|
|
|
|
Log.w(TAG, "Skipping job, waiting for migration...");
|
|
|
|
Log.w(TAG, "Skipping job, waiting for migration...");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (KeyCachingService.getMasterSecret(context) != null) {
|
|
|
|
|
|
|
|
MessageNotifier.updateNotification(context, null, -2);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|