lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

resolve core data merge conflicts error

Browse source
This commit is contained in:
Bob Sun 2017-02-15 16:51:12 +08:00
parent 9eb5f57b80
commit 068f5be807
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pass/Controllers/PasswordsViewController.swift
View file

@ -53,6 +53,7 @@ class PasswordsViewController: UIViewController, UITableViewDataSource, UITableV
SVProgressHUD.setDefaultMaskType(.black) SVProgressHUD.setDefaultMaskType(.black)
SVProgressHUD.setDefaultStyle(.light) SVProgressHUD.setDefaultStyle(.light)
SVProgressHUD.show(withStatus: "Sync Password Store") SVProgressHUD.show(withStatus: "Sync Password Store")
let numberOfUnsyncedPasswords = PasswordStore.shared.getNumberOfUnsyncedPasswords()
DispatchQueue.global(qos: .userInitiated).async { [unowned self] in DispatchQueue.global(qos: .userInitiated).async { [unowned self] in
do { do {
try PasswordStore.shared.pullRepository(transferProgressBlock: {(git_transfer_progress, stop) in 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") 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 try PasswordStore.shared.pushRepository(transferProgressBlock: {(current, total, bytes, stop) in
DispatchQueue.main.async { DispatchQueue.main.async {
SVProgressHUD.showProgress(Float(current)/Float(total), status: "Push Remote Repository") SVProgressHUD.showProgress(Float(current)/Float(total), status: "Push Remote Repository")
} }
}) })
} }
PasswordStore.shared.updatePasswordEntityCoreData()
DispatchQueue.main.async { DispatchQueue.main.async {
PasswordStore.shared.updatePasswordEntityCoreData()
self.passwordEntities = PasswordStore.shared.fetchPasswordEntityCoreData() self.passwordEntities = PasswordStore.shared.fetchPasswordEntityCoreData()
self.reloadTableView(data: self.passwordEntities!) self.reloadTableView(data: self.passwordEntities!)
PasswordStore.shared.setAllSynced() PasswordStore.shared.setAllSynced()

1
pass/Models/PasswordStore.swift
View file

@ -345,6 +345,7 @@ class PasswordStore {
do { do {
try context.execute(deleteRequest) try context.execute(deleteRequest)
try context.save()
} catch let error as NSError { } catch let error as NSError {
print(error) print(error)
} }