From a1966934255249bdda8f182fa09e4e3b81dc12e9 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Fri, 28 Jul 2017 17:04:52 -0400
Subject: [PATCH] Make sure DB views are ready before kicking processing job

// FREEBIE
---
 Signal/src/AppDelegate.m                           | 6 +++---
 SignalServiceKit/src/Messages/OWSMessageReceiver.h | 2 +-
 SignalServiceKit/src/Messages/OWSMessageReceiver.m | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index a9238ca88..6748639f3 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -517,9 +517,6 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
                 // This will fetch new messages, if we're using domain
                 // fronting.
                 [[PushManager sharedManager] applicationDidBecomeActive];
-
-                // If there were any messages in our local queue which we hadn't yet processed.
-                [[OWSMessageReceiver sharedInstance] handleAnyUnprocessedEnvelopes];
             }];
 
     DDLogInfo(@"%@ applicationDidBecomeActive completed.", self.tag);
@@ -796,6 +793,9 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
     [AppVersion.instance appLaunchDidComplete];
 
     [self ensureRootViewController];
+
+    // If there were any messages in our local queue which we hadn't yet processed.
+    [[OWSMessageReceiver sharedInstance] handleAnyUnprocessedEnvelopesAsync];
 }
 
 - (void)ensureRootViewController
diff --git a/SignalServiceKit/src/Messages/OWSMessageReceiver.h b/SignalServiceKit/src/Messages/OWSMessageReceiver.h
index c4a7b367e..5af585219 100644
--- a/SignalServiceKit/src/Messages/OWSMessageReceiver.h
+++ b/SignalServiceKit/src/Messages/OWSMessageReceiver.h
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)syncRegisterDatabaseExtension:(YapDatabase *)database;
 
 - (void)handleReceivedEnvelope:(OWSSignalServiceProtosEnvelope *)envelope;
-- (void)handleAnyUnprocessedEnvelopes;
+- (void)handleAnyUnprocessedEnvelopesAsync;
 
 @end
 
diff --git a/SignalServiceKit/src/Messages/OWSMessageReceiver.m b/SignalServiceKit/src/Messages/OWSMessageReceiver.m
index d22ec1c83..91e979ae8 100644
--- a/SignalServiceKit/src/Messages/OWSMessageReceiver.m
+++ b/SignalServiceKit/src/Messages/OWSMessageReceiver.m
@@ -335,7 +335,7 @@ NSString *const OWSMessageProcessingJobFinderExtensionGroup = @"OWSMessageProces
 
 #pragma mark - instance methods
 
-- (void)handleAnyUnprocessedEnvelopes
+- (void)handleAnyUnprocessedEnvelopesAsync
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         [self.processingQueue drainQueue];