From 73869b1effb0ab34fbff943e8958ce61a54d5e2a Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Wed, 5 Jul 2017 15:53:43 -0400
Subject: [PATCH] Fix possible cause of crash on launch.

// FREEBIE
---
 .../environment/Migrations/OWSDatabaseMigrationRunner.m    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m b/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m
index d2a6c6d07..f3815bba1 100644
--- a/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m
+++ b/Signal/src/environment/Migrations/OWSDatabaseMigrationRunner.m
@@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
         [[OWS100RemoveTSRecipientsMigration alloc] initWithStorageManager:self.storageManager],
         [[OWS102MoveLoggingPreferenceToUserDefaults alloc] initWithStorageManager:self.storageManager],
         [[OWS103EnableVideoCalling alloc] initWithStorageManager:self.storageManager],
-        [[OWS104CreateRecipientIdentities alloc] initWithStorageManager:self.storageManager],
+        // OWS104CreateRecipientIdentities is run separately. See runSafeBlockingMigrations.
         [[OWS105AttachmentFilePaths alloc] initWithStorageManager:self.storageManager]
     ];
 }
@@ -46,6 +46,11 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)runSafeBlockingMigrations
 {
+    // This should only include migrations which:
+    //
+    // a) Do read/write database transactions and therefore would block on the async database
+    //    view registration.
+    // b) Will not affect any of the data used by the async database views.
     [self runMigrations:@[
         [[OWS104CreateRecipientIdentities alloc] initWithStorageManager:self.storageManager],
     ]];