From 00dea64316dc4a2d6ca88934473ee9bd9d51eb4e Mon Sep 17 00:00:00 2001
From: Oliver Wiese <oliver.wiese@fu-berlin.de>
Date: Thu, 19 Mar 2020 16:43:19 +0100
Subject: [PATCH] compare with dev branch
---
enzevalos_iphone/FolderViewController.swift | 13 ++++++++++++-
enzevalos_iphone/KeyRecord+CoreDataProperties.swift | 3 ---
enzevalos_iphone/MailHandler.swift | 1 +
enzevalos_iphone/Onboarding.swift | 8 +-------
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/enzevalos_iphone/FolderViewController.swift b/enzevalos_iphone/FolderViewController.swift
index bde8ef9e..3d05cf54 100644
--- a/enzevalos_iphone/FolderViewController.swift
+++ b/enzevalos_iphone/FolderViewController.swift
@@ -85,9 +85,15 @@ class FolderViewController: UITableViewController {
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
+ navigationController?.isToolbarHidden = false
tableView.reloadData()
}
+
+ override func viewWillDisappear(_ animated: Bool){
+ navigationController?.isToolbarHidden = true
+ }
+
override func numberOfSections(in tableView: UITableView) -> Int {
var count = 0
@@ -190,7 +196,12 @@ class FolderViewController: UITableViewController {
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if sectionType(indexPath) == .inbox {
- performSegue(withIdentifier: "showInboxSegue", sender: nil)
+ if let coord = AppDelegate.getAppDelegate().inboxCoordinator {
+ coord.pushInbox()
+ } else {
+ // If new inbox is not available...
+ performSegue(withIdentifier: "showInboxSegue", sender: nil)
+ }
} else if sectionType(indexPath) == .mails {
performSegue(withIdentifier: "readFolderMailSegue", sender: getMails()[indexPath.row])
} else {
diff --git a/enzevalos_iphone/KeyRecord+CoreDataProperties.swift b/enzevalos_iphone/KeyRecord+CoreDataProperties.swift
index c967a909..c2166ee2 100644
--- a/enzevalos_iphone/KeyRecord+CoreDataProperties.swift
+++ b/enzevalos_iphone/KeyRecord+CoreDataProperties.swift
@@ -90,6 +90,3 @@ extension KeyRecord {
return request
}
}
-
-
-
diff --git a/enzevalos_iphone/MailHandler.swift b/enzevalos_iphone/MailHandler.swift
index 3c03e32d..d900c05c 100644
--- a/enzevalos_iphone/MailHandler.swift
+++ b/enzevalos_iphone/MailHandler.swift
@@ -985,6 +985,7 @@ class MailHandler {
completionCallback(MailServerConnectionError.NoData)
return
}
+ folder.lastUpdate = Date()
if folder.mailsOfFolder.count > 0 {
self.loadMailsByNum(folder: folder, completionCallback: completionCallback, multipleMails: false)
} else {
diff --git a/enzevalos_iphone/Onboarding.swift b/enzevalos_iphone/Onboarding.swift
index 328db8ab..424775b6 100644
--- a/enzevalos_iphone/Onboarding.swift
+++ b/enzevalos_iphone/Onboarding.swift
@@ -27,7 +27,7 @@ class Onboarding: NSObject {
super.init()
}
static var textDelegate = TextFieldDelegate.init()
- static let defaultColor = UIColor.red
+ static let defaultColor = UIColor.darkGray
static let textColor = UIColor.white
static var mailaddress = UITextField.init()
static var username = UITextField.init()
@@ -77,13 +77,7 @@ class Onboarding: NSObject {
private static var currentIMAP: MailSession?
private static var currentSMTP: MailSession?
-
-
static func onboarding(_ errorCode: MailServerConnectionError? = nil) -> UIViewController {
-
-
-
-
password.isSecureTextEntry = true
doWhenDone = checkIMAPConfig
startTimeView = Date()
--
GitLab