From eb3569d8f8477e9d25965a97dbd35c68ddaf199f Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 23 Apr 2018 15:52:59 -0400
Subject: [PATCH] Don't start app version migrations until storage is ready.

---
 SignalMessaging/environment/AppSetup.m | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m
index 6b01b5893..c55bc0761 100644
--- a/SignalMessaging/environment/AppSetup.m
+++ b/SignalMessaging/environment/AppSetup.m
@@ -52,14 +52,16 @@ NS_ASSUME_NONNULL_BEGIN
         [NSKeyedUnarchiver setClass:[OWSDatabaseMigration class] forClassName:[OWSDatabaseMigration collection]];
 
         [OWSStorage setupStorageWithMigrationBlock:^() {
-            // Don't start database migrations until storage is ready.
-            [VersionMigrations performUpdateCheckWithCompletion:^() {
-                OWSAssertIsOnMainThread();
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                // Don't start database migrations until storage is ready.
+                [VersionMigrations performUpdateCheckWithCompletion:^() {
+                    OWSAssertIsOnMainThread();
 
-                migrationCompletion();
+                    migrationCompletion();
 
-                backgroundTask = nil;
-            }];
+                    backgroundTask = nil;
+                }];
+            });
         }];
         [[Environment current].contactsManager startObserving];
     });