diff --git a/enzevalos_iphone/DataHandler.swift b/enzevalos_iphone/DataHandler.swift index effea58adc6e5cd4b8867d97bfa57e14f2c8b183..d30a19b84d4bca7829a897c051a17a295adea60f 100644 --- a/enzevalos_iphone/DataHandler.swift +++ b/enzevalos_iphone/DataHandler.swift @@ -980,10 +980,12 @@ class DataHandler { } record.addToPersistentMails(mail) mail.folder.addToKeyRecords(record) - if record.newestDate == nil { + let isInbox = mail.folder.path == Folder.inbox.path + + if record.newestDate == nil, isInbox { record.newestDate = mail.date } - if let date = record.newestDate, date.timeIntervalSince(mail.date) < 0 { + if let date = record.newestDate, date.timeIntervalSince(mail.date) < 0, isInbox { // We should update our records... record.newestDate = mail.date } diff --git a/enzevalos_iphone/Folder+CoreDataClass.swift b/enzevalos_iphone/Folder+CoreDataClass.swift index eb00228747ca780a931824839abb5765c099f305..7f64e91d9b9288f84a4be141fc1a4b91e68e4568 100644 --- a/enzevalos_iphone/Folder+CoreDataClass.swift +++ b/enzevalos_iphone/Folder+CoreDataClass.swift @@ -11,6 +11,11 @@ import CoreData @objc(Folder) public class Folder: NSManagedObject { + static var inbox: Folder { + get { + return DataHandler.handler.findFolder(with: UserManager.backendInboxFolderPath) + } + } var name: String { get { @@ -52,7 +57,8 @@ public class Folder: NSManagedObject { guard keyRecords != nil && keyRecords?.count ?? 0 > 0 else { return [] } - return DataHandler.handler.getAllKeyRecords() + let rs = DataHandler.handler.getAllKeyRecords() + return rs } } diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift index b39a85618e2732cb969eee7b32abf2dc99bd7940..a28094a6c4ae1dcf2c775c830c7e1950b8bb1e28 100644 --- a/enzevalos_iphone/MailHandler.swift +++ b/enzevalos_iphone/MailHandler.swift @@ -52,7 +52,7 @@ class MailHandler { var delegate: MailHandlerDelegator? static var INBOX: String { - return "INBOX" + return UserManager.backendInboxFolderPath } private var IMAPSes: MCOIMAPSession? var IMAPSession: MCOIMAPSession? { diff --git a/enzevalos_iphone/PLists/enzevalos-Info.plist b/enzevalos_iphone/PLists/enzevalos-Info.plist index 95f31ab100310e53961c36cca4533cab301c7cea..6b3b7c571352e174e0c620099a021f36c08b57d4 100644 --- a/enzevalos_iphone/PLists/enzevalos-Info.plist +++ b/enzevalos_iphone/PLists/enzevalos-Info.plist @@ -17,7 +17,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.8.22</string> + <string>0.8.23</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -32,7 +32,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.8.22</string> + <string>0.8.23</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSAppTransportSecurity</key>