From 04a52980a334e6f303c2b6498b2f62eec87ef6c7 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Tue, 25 Sep 2018 16:43:58 -0600
Subject: [PATCH] fixup migration

- nested transaction for enumeration
- save when complete
---
 .../environment/migrations/OWS110SortIdMigration.swift      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/SignalMessaging/environment/migrations/OWS110SortIdMigration.swift b/SignalMessaging/environment/migrations/OWS110SortIdMigration.swift
index c61681788..3fc22671d 100644
--- a/SignalMessaging/environment/migrations/OWS110SortIdMigration.swift
+++ b/SignalMessaging/environment/migrations/OWS110SortIdMigration.swift
@@ -28,7 +28,7 @@ class OWS110SortIdMigration: OWSDatabaseMigration {
             var archivedThreads: [TSThread] = []
 
             // get archived threads before migration
-            TSThread.enumerateCollectionObjects({ (object, _) in
+            TSThread.enumerateCollectionObjects(with: transaction) { (object, _) in
                 guard let thread = object as? TSThread else {
                     owsFailDebug("unexpected object: \(type(of: object))")
                     return
@@ -37,7 +37,7 @@ class OWS110SortIdMigration: OWSDatabaseMigration {
                 if thread.isArchivedByLegacyTimestampForSorting {
                     archivedThreads.append(thread)
                 }
-            })
+            }
 
             guard let legacySorting: YapDatabaseAutoViewTransaction = transaction.extension(TSMessageDatabaseViewExtensionName_Legacy) as? YapDatabaseAutoViewTransaction else {
                 owsFailDebug("legacySorting was unexpectedly nil")
@@ -61,6 +61,8 @@ class OWS110SortIdMigration: OWSDatabaseMigration {
             for archivedThread in archivedThreads {
                 archivedThread.archiveThread(with: transaction)
             }
+
+            self.save(with: transaction)
         }
 
         completion()