Merge pull request #1655 from deltachat/fix_early_keychain_access

finish app initialization as soon as the access to keychain is allowed

DcCore/DcCore/Helper/KeychainManager.swift

@@ -3,6 +3,7 @@ import Security
 
 public enum KeychainError: Error {
     case noPassword
+    case accessError(message: String, status: OSStatus)
     case unhandledError(message: String, status: OSStatus)
 }
 
@@ -86,7 +87,7 @@ public class KeychainManager {
         case errSecItemNotFound:
             throw KeychainError.noPassword
         case errSecInteractionNotAllowed:
-            throw KeychainError.unhandledError(message: "Keychain not yet available.", status: status)
+            throw KeychainError.accessError(message: "Keychain not yet available.", status: status)
         default:
             throw KeychainError.unhandledError(message: "Unknown error while querying secret for account \(id):",
                                                status: status)

DcShare/Controller/ShareViewController.swift

@@ -90,7 +90,7 @@ class ShareViewController: SLComposeServiceViewController {
                 if !dcContext.open(passphrase: secret) {
                     logger.error("Failed to open database.")
                 }
-            } catch KeychainError.unhandledError(let message, let status) {
+            } catch KeychainError.unhandledError(let message, let status), KeychainError.accessError(let message, let status) {
                 logger.error("KeychainError. \(message). Error status: \(status)")
             } catch {
                 logger.error("\(error)")

deltachat-ios/AppDelegate.swift

@@ -23,6 +23,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
     var window: UIWindow?
     var notifyToken: String?
     var applicationInForeground: Bool = false
+    private var launchOptions: [UIApplication.LaunchOptionsKey: Any]?
+    private var appFullyInitialized = false
 
     // purpose of `bgIoTimestamp` is to block rapidly subsequent calls to remote- or local-wakeups:
     //
@@ -55,15 +57,29 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
         DBDebugToolkit.setup(with: []) // empty array will override default device shake trigger
         DBDebugToolkit.setupCrashReporting()
-        
+
         let console = ConsoleDestination()
         console.format = "$DHH:mm:ss.SSS$d $C$L$c $M" // see https://docs.swiftybeaver.com/article/20-custom-format
         logger.addDestination(console)
 
+        logger.info("➡️ didFinishLaunchingWithOptions")
+
+        let webPCoder = SDImageWebPCoder.shared
+        SDImageCodersManager.shared.addCoder(webPCoder)
+        let svgCoder = SDImageSVGKCoder.shared
+        SDImageCodersManager.shared.addCoder(svgCoder)
+
         dcAccounts.logger = DcLogger()
         dcAccounts.openDatabase()
         migrateToDcAccounts()
 
+        self.launchOptions = launchOptions
+        continueDidFinishLaunchingWithOptions()
+        return true
+    }
+
+    // finishes the app initialization which depends on the successful access to the keychain
+    func continueDidFinishLaunchingWithOptions() {
         if let sharedUserDefaults = UserDefaults.shared, !sharedUserDefaults.bool(forKey: UserDefaults.hasSavedKeyToKeychain) {
             // we can assume a fresh install (UserDefaults are deleted on app removal)
             // -> reset the keychain (which survives removals of the app) in case the app was removed and reinstalled.
@@ -81,6 +97,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                     if !dcContext.open(passphrase: secret) {
                         logger.error("Failed to open database for account \(accountId)")
                     }
+                } catch KeychainError.accessError(let message, let status) {
+                    logger.error("Keychain error. \(message). Error status: \(status)")
+                    return
                 } catch KeychainError.unhandledError(let message, let status) {
                     logger.error("Keychain error. \(message). Error status: \(status)")
                 } catch {
@@ -93,8 +112,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
            fatalError("Could not initialize a new account.")
         }
 
-        logger.info("➡️ didFinishLaunchingWithOptions")
-
         window = UIWindow(frame: UIScreen.main.bounds)
         guard let window = window else {
             fatalError("window was nil in app delegate")
@@ -153,11 +170,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
             registerForNotifications()
         }
 
-        let webPCoder = SDImageWebPCoder.shared
-        SDImageCodersManager.shared.addCoder(webPCoder)
-        let svgCoder = SDImageSVGKCoder.shared
-        SDImageCodersManager.shared.addCoder(svgCoder)
-        return true
+        launchOptions = nil
+        appFullyInitialized = true
     }
 
     // `open` is called when an url should be opened by Delta Chat.
@@ -209,6 +223,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     func applicationProtectedDataDidBecomeAvailable(_ application: UIApplication) {
         logger.info("➡️ applicationProtectedDataDidBecomeAvailable")
+        if !appFullyInitialized {
+            continueDidFinishLaunchingWithOptions()
+        }
     }
 
     func applicationProtectedDataWillBecomeUnavailable(_ application: UIApplication) {