diff --git a/enzevalos_iphone/ContactHandler.swift b/enzevalos_iphone/ContactHandler.swift index 9366e2f0b047b9ef7ad2490af920d459e70d4f0d..35f37d2205e573fbd091dc92667ffb28b13174ff 100644 --- a/enzevalos_iphone/ContactHandler.swift +++ b/enzevalos_iphone/ContactHandler.swift @@ -47,7 +47,7 @@ class ContactHandler { func findContacts(update: Bool) { // TODO: Move to background thread? - if update, let frp = try? PersitentDataProvider.dataProvider.lookUp(entityName: AddressRecord.entityName, sorting: ["email": true], equalPredicates: nil, differentPredicates: ["phoneBookID": "nil"], inPredicates: nil, propertiesToFetch: ["email", "phoneBookID", "displayname", "image"]), let addresses = frp.fetchedObjects as? [AddressRecord]{ // ["phoneBookID": "nil"] + if update, let frp = try? PersistentDataProvider.dataProvider.lookUp(entityName: AddressRecord.entityName, sorting: ["email": true], equalPredicates: nil, differentPredicates: ["phoneBookID": "nil"], inPredicates: nil, propertiesToFetch: ["email", "phoneBookID", "displayname", "image"]), let addresses = frp.fetchedObjects as? [AddressRecord]{ // ["phoneBookID": "nil"] let contacts = self.findContactsBy(ids: addresses.map({($0.phoneBookID ?? "")})) for addr in addresses { var hit = false @@ -71,13 +71,13 @@ class ContactHandler { } } do { - try PersitentDataProvider.dataProvider.save(taskContext: frp.managedObjectContext) + try PersistentDataProvider.dataProvider.save(taskContext: frp.managedObjectContext) } catch { print("Can not store updates!") } } - if let frp = try? PersitentDataProvider.dataProvider.lookUp(entityName: AddressRecord.entityName, sorting: ["email": true], equalPredicates: ["phoneBookID": "nil"], differentPredicates: nil, inPredicates: nil, propertiesToFetch: ["email", "phoneBookID", "displayname", "image"]), let addresses = frp.fetchedObjects as? [AddressRecord]{ // ["phoneBookID": "nil"] + if let frp = try? PersistentDataProvider.dataProvider.lookUp(entityName: AddressRecord.entityName, sorting: ["email": true], equalPredicates: ["phoneBookID": "nil"], differentPredicates: nil, inPredicates: nil, propertiesToFetch: ["email", "phoneBookID", "displayname", "image"]), let addresses = frp.fetchedObjects as? [AddressRecord]{ // ["phoneBookID": "nil"] for addr in addresses { if let contact = self.findContactBy(email: addr.email).first { addr.phoneBookID = contact.identifier @@ -92,7 +92,7 @@ class ContactHandler { } } do { - try PersitentDataProvider.dataProvider.save(taskContext: frp.managedObjectContext) + try PersistentDataProvider.dataProvider.save(taskContext: frp.managedObjectContext) } catch { print("Can not store updates!") } diff --git a/enzevalos_iphone/MailComparison.swift b/enzevalos_iphone/MailComparison.swift index ccddbf54a1ab42ddd1b2d687fb77360aa4382c63..90f348eb32a327ab9caa87465604a3533dc38841 100644 --- a/enzevalos_iphone/MailComparison.swift +++ b/enzevalos_iphone/MailComparison.swift @@ -68,7 +68,7 @@ extension String { looks if the mail address of the sender is already known ***/ public func compareSenderToContacts() -> ResultCompareSenderToContacts { - guard let inboxMails = PersitentDataProvider.dataProvider.fetchedMailResultsController.fetchedObjects else { + guard let inboxMails = PersistentDataProvider.dataProvider.fetchedMailResultsController.fetchedObjects else { let contacts = ContactHandler().findContactBy(email: self) if contacts.count > 0 { return ResultCompareSenderToContacts.isContact diff --git a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SenderViewChildren/SmallContactListView.swift b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SenderViewChildren/SmallContactListView.swift index f3debe73daeba037dfb30a854c3263e99f7d32e6..9c8b20ec7d5054cb25c867c0d59866f6c6c1bb6f 100644 --- a/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SenderViewChildren/SmallContactListView.swift +++ b/enzevalos_iphone/SwiftUI/Read/Tabbed Views/SenderViewChildren/SmallContactListView.swift @@ -43,7 +43,6 @@ struct SmallContactListView <C: DisplayContact>: View { } Spacer() Image(systemName: "chevron.right") - } } } } diff --git a/enzevalos_iphone/persistentData/AddressRecord.swift b/enzevalos_iphone/persistentData/AddressRecord.swift index 4148aa7dae58bf648ad5a3edbd46b65eac00d0a4..a43ac022d2f79f3e5de4a29727ce1d547750ebd2 100644 --- a/enzevalos_iphone/persistentData/AddressRecord.swift +++ b/enzevalos_iphone/persistentData/AddressRecord.swift @@ -208,12 +208,3 @@ extension AddressRecord: DisplayContact { } } } - -extension AddressRecord { - var mcoAddress: MCOAddress { - get { - let name = displayname ?? email - return MCOAddress.init(displayName: name, mailbox: email) - } - } -}