From 068f5be8073f97fd90ca64e423d88391d160fe89 Mon Sep 17 00:00:00 2001 From: Bob Sun Date: Wed, 15 Feb 2017 16:51:12 +0800 Subject: [PATCH] resolve core data merge conflicts error --- pass/Controllers/PasswordsViewController.swift | 5 +++-- pass/Models/PasswordStore.swift | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pass/Controllers/PasswordsViewController.swift b/pass/Controllers/PasswordsViewController.swift index d51b385..38ad12b 100644 --- a/pass/Controllers/PasswordsViewController.swift +++ b/pass/Controllers/PasswordsViewController.swift @@ -53,6 +53,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV SVProgressHUD.setDefaultMaskType(.black) SVProgressHUD.setDefaultStyle(.light) SVProgressHUD.show(withStatus: "Sync Password Store") + let numberOfUnsyncedPasswords = PasswordStore.shared.getNumberOfUnsyncedPasswords() DispatchQueue.global(qos: .userInitiated).async { [unowned self] in do { try PasswordStore.shared.pullRepository(transferProgressBlock: {(git_transfer_progress, stop) in @@ -60,15 +61,15 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV SVProgressHUD.showProgress(Float(git_transfer_progress.pointee.received_objects)/Float(git_transfer_progress.pointee.total_objects), status: "Pull Remote Repository") } }) - if PasswordStore.shared.getNumberOfUnsyncedPasswords() > 0 { + if numberOfUnsyncedPasswords > 0 { try PasswordStore.shared.pushRepository(transferProgressBlock: {(current, total, bytes, stop) in DispatchQueue.main.async { SVProgressHUD.showProgress(Float(current)/Float(total), status: "Push Remote Repository") } }) } - PasswordStore.shared.updatePasswordEntityCoreData() DispatchQueue.main.async { + PasswordStore.shared.updatePasswordEntityCoreData() self.passwordEntities = PasswordStore.shared.fetchPasswordEntityCoreData() self.reloadTableView(data: self.passwordEntities!) PasswordStore.shared.setAllSynced() diff --git a/pass/Models/PasswordStore.swift b/pass/Models/PasswordStore.swift index 0d18204..3fa68c4 100644 --- a/pass/Models/PasswordStore.swift +++ b/pass/Models/PasswordStore.swift @@ -345,6 +345,7 @@ class PasswordStore { do { try context.execute(deleteRequest) + try context.save() } catch let error as NSError { print(error) }