Merge branch 'dvor/trying-to-fix-crash-on-startup'

Antidote-for-Tox · Oct 2, 2016 · d8f0c5c · d8f0c5c
2 parents e66b70b + b4a573a
commit d8f0c5c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/Antidote/AppCoordinator.swift b/Antidote/AppCoordinator.swift
@@ -110,19 +110,31 @@ private extension AppCoordinator {
                 successBlock(manager)
             }
             else {
-                let profileName = UserDefaultsManager().lastActiveProfile!
+                let deleteActiveAccountAndRetry: Void -> Void = { [unowned self] in
+                    KeychainManager().deleteActiveAccountData()
+                    self.recreateActiveCoordinator(options: options,
+                                                   manager: manager,
+                                                   skipAuthorizationChallenge: skipAuthorizationChallenge)
+                }
+
+                guard let profileName = UserDefaultsManager().lastActiveProfile else {
+                    deleteActiveAccountAndRetry()
+                    return
+                }
+
                 let path = ProfileManager().pathForProfileWithName(profileName)
-                let configuration = OCTManagerConfiguration.configurationWithBaseDirectory(path)!
+
+                guard let configuration = OCTManagerConfiguration.configurationWithBaseDirectory(path) else {
+                    deleteActiveAccountAndRetry()
+                    return
+                }
 
                 OCTManager.managerWithConfiguration(configuration,
                                                     encryptPassword: password,
                                                     successBlock: successBlock,
-                                                    failureBlock: { [unowned self] _ in
+                                                    failureBlock: { _ in
                     log("Cannot create tox with configuration \(configuration)")
-                    KeychainManager().deleteActiveAccountData()
-                    self.recreateActiveCoordinator(options: options,
-                                                   manager: manager,
-                                                   skipAuthorizationChallenge: skipAuthorizationChallenge)
+                    deleteActiveAccountAndRetry()
                 })
             }
         }

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
+### Fixed
+- Crash on startup that happened on app reinstall.
 
 ## [1.0.0-rc.2] - 2016-10-02
 ### Added