From 3828d558fa2e365be5623cba59aa1fb413030ac6 Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Wed, 29 May 2019 10:55:04 -0700
Subject: [PATCH] update naming of inbox

---
 enzevalos_iphone/DataHandler.swift           | 6 ++++--
 enzevalos_iphone/Folder+CoreDataClass.swift  | 8 +++++++-
 enzevalos_iphone/MailHandler.swift           | 2 +-
 enzevalos_iphone/PLists/enzevalos-Info.plist | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/enzevalos_iphone/DataHandler.swift b/enzevalos_iphone/DataHandler.swift
index effea58a..d30a19b8 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 eb002287..7f64e91d 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 b39a8561..a28094a6 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 95f31ab1..6b3b7c57 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>
-- 
GitLab