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

Fix pull to sync bug caused by manipulating core date in background thread

Browse source
This commit is contained in:
Bob Sun 2017-03-29 22:59:30 -07:00
parent ba20d084e4
commit b85358a0b8
No known key found for this signature in database
GPG key ID: 1F86BA2052FED3B4
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pass/Models/PasswordStore.swift
View file

@ -302,10 +302,11 @@ class PasswordStore {
} }
storeRepository = try GTRepository(url: storeURL) storeRepository = try GTRepository(url: storeURL)
gitCredential = credential gitCredential = credential
self.updatePasswordEntityCoreData()
Defaults[.lastSyncedTime] = Date() Defaults[.lastSyncedTime] = Date()
DispatchQueue.main.async {
NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil) NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil)
self.updatePasswordEntityCoreData()
}
} }
func pullRepository(transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void) throws { func pullRepository(transferProgressBlock: @escaping (UnsafePointer<git_transfer_progress>, UnsafeMutablePointer<ObjCBool>) -> Void) throws {
@ -318,12 +319,13 @@ class PasswordStore {
] ]
let remote = try GTRemote(name: "origin", in: storeRepository!) let remote = try GTRemote(name: "origin", in: storeRepository!)
try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock) try storeRepository?.pull((storeRepository?.currentBranch())!, from: remote, withOptions: options, progress: transferProgressBlock)
Defaults[.lastSyncedTime] = Date()
DispatchQueue.main.async {
self.setAllSynced() self.setAllSynced()
self.updatePasswordEntityCoreData() self.updatePasswordEntityCoreData()
Defaults[.lastSyncedTime] = Date()
NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil) NotificationCenter.default.post(name: .passwordStoreUpdated, object: nil)
} }
}
private func updatePasswordEntityCoreData() { private func updatePasswordEntityCoreData() {
deleteCoreData(entityName: "PasswordEntity") deleteCoreData(entityName: "PasswordEntity")