Fix #3598: Initialize DB after store existence check for passcode res…

…et (#3619)

Client/Application/Delegates/AppDelegate.swift

@@ -71,9 +71,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
 
         // Must happen before passcode check, otherwise may unnecessarily reset keychain
         Migration.moveDatabaseToApplicationDirectory()
-        // We have to wait until pre1.12 migration is done until we proceed with database
-        // initialization. This is because Database container may change. See bugs #3416, #3377.
-        DataController.shared.initialize()
 
         // Passcode checking, must happen on immediate launch
         if !DataController.shared.storeExists() {
@@ -85,6 +82,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UIViewControllerRestorati
             KeychainWrapper.sharedAppContainerKeychain.setAuthenticationInfo(nil)
         }
 
+        // We have to wait until pre1.12 migration is done until we proceed with database
+        // initialization. This is because Database container may change. See bugs #3416, #3377.
+        DataController.shared.initialize()
+
         return startApplication(application, withLaunchOptions: launchOptions)
     }