Merge pull request #150 from Hirobreak/present

Multiple Fixes

Author: GianniCarlo

Cartfile

@@ -15,4 +15,5 @@ github "Criptext/MIBadgeButton-Swift" ~> 0.8
 github "cjwirth/RichEditorView"
 github "hackiftekhar/IQKeyboardManager"
 github "Criptext/UIImageView-Letters" ~> 1.1.5
-github "ephread/Instructions" ~> 1.2.0
+github "ephread/Instructions" ~> 1.2.0
+github "malcommac/UIWindowTransitions"

Cartfile.resolved

@@ -12,6 +12,7 @@ github "cjwirth/RichEditorView" "5.0.0"
 github "danieltigse/CLTokenInputView" "2.7.0"
 github "ephread/Instructions" "1.2.0"
 github "hackiftekhar/IQKeyboardManager" "v6.1.1"
+github "malcommac/UIWindowTransitions" "0.1.1"
 github "misterwell/MMMaterialDesignSpinner" "0.2.5"
 github "realm/realm-cocoa" "v3.7.5"
 github "rs/SDWebImage" "4.4.2"

iOS-Email-Client.xcodeproj/project.pbxproj

@@ -211,6 +211,7 @@
 		7CCC82F12125E83F00D33F84 /* Protobuf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CD4A43A21111DE400A40C74 /* Protobuf.framework */; };
 		7CCC82F22125E83F00D33F84 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41F3A277207C6470004BDF90 /* Fabric.framework */; };
 		7CCC82F32125E83F00D33F84 /* Crashlytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41F3A275207C6466004BDF90 /* Crashlytics.framework */; };
+		7CCC82F72126155F00D33F84 /* UIWindowTransitions.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CCC82F62126155D00D33F84 /* UIWindowTransitions.framework */; };
 		7CD4A43221111DCF00A40C74 /* GoogleToolboxForMac.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CD4A42B21111DCD00A40C74 /* GoogleToolboxForMac.framework */; };
 		7CD4A43321111DCF00A40C74 /* FirebaseCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CD4A42C21111DCD00A40C74 /* FirebaseCore.framework */; };
 		7CD4A43421111DCF00A40C74 /* FirebaseAnalytics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CD4A42D21111DCE00A40C74 /* FirebaseAnalytics.framework */; };
@@ -457,6 +458,7 @@
 		7CC44BE120FD583A004BF759 /* CreateCustomJSONFileTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateCustomJSONFileTests.swift; sourceTree = "<group>"; };
 		7CC44BF020FEE1ED004BF759 /* AESCipherTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AESCipherTests.swift; sourceTree = "<group>"; };
 		7CCA060C210B687200BC4CEF /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
+		7CCC82F62126155D00D33F84 /* UIWindowTransitions.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIWindowTransitions.framework; path = Carthage/Build/iOS/UIWindowTransitions.framework; sourceTree = "<group>"; };
 		7CD4A42B21111DCD00A40C74 /* GoogleToolboxForMac.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = GoogleToolboxForMac.framework; sourceTree = "<group>"; };
 		7CD4A42C21111DCD00A40C74 /* FirebaseCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseCore.framework; sourceTree = "<group>"; };
 		7CD4A42D21111DCE00A40C74 /* FirebaseAnalytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = FirebaseAnalytics.framework; sourceTree = "<group>"; };
@@ -501,6 +503,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				7CCC82F72126155F00D33F84 /* UIWindowTransitions.framework in Frameworks */,
 				7C1E82BE2116A122007CA853 /* Instructions.framework in Frameworks */,
 				41C9CC9720781CFB00B8994F /* UIImageView_Letters.framework in Frameworks */,
 				41F3A276207C6466004BDF90 /* Crashlytics.framework in Frameworks */,
@@ -560,6 +563,7 @@
 		2962C69A939AA368B015D288 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				7CCC82F62126155D00D33F84 /* UIWindowTransitions.framework */,
 				7C1E82BF2116A12B007CA853 /* InstructionsAppExtensions.framework */,
 				7C1E82BD2116A122007CA853 /* Instructions.framework */,
 				7CD4A4442111268900A40C74 /* libc++.tbd */,
@@ -1122,6 +1126,7 @@
 				"$(SRCROOT)/Carthage/Build/iOS/UIImageView_Letters.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/Motion.framework",
 				"$(SRCROOT)/Carthage/Build/iOS/Instructions.framework",
+				"$(SRCROOT)/Carthage/Build/iOS/UIWindowTransitions.framework",
 			);
 			name = "Run Script Framework";
 			outputPaths = (
@@ -1145,6 +1150,7 @@
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/UIImageView_Letters.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Motion.framework",
 				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/Instructions.framework",
+				"$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/UIWindowTransitions.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

iOS-Email-Client/Controllers/ComposeViewController.swift

@@ -34,7 +34,7 @@ class ComposeViewController: UIViewController {
     let ENTER_LINE_HEIGHT : CGFloat = 28.0
     let TOOLBAR_MARGIN_HEIGHT = 25
     let COMPOSER_MIN_HEIGHT = 150
-    let PASSWORD_POPUP_HEIGHT = 406
+    let PASSWORD_POPUP_HEIGHT = 335
 
     @IBOutlet weak var toField: CLTokenInputView!
     @IBOutlet weak var ccField: CLTokenInputView!

iOS-Email-Client/Controllers/EmailSetPasswordViewController.swift

@@ -14,6 +14,7 @@ protocol EmailSetPasswordDelegate {
 }
 
 class EmailSetPasswordViewController: BaseUIPopover {
+    let MIN_PASS_LENGTH = 3
     @IBOutlet weak var passwordTextField: TextField!
     @IBOutlet weak var repeatPasswordTextField: TextField!
     @IBOutlet weak var noPasswordMessageLabel: UILabel!
@@ -58,11 +59,13 @@ class EmailSetPasswordViewController: BaseUIPopover {
     @IBAction func onSetPress(_ sender: Any) {
         let passwordEnabled = passwordTextField.isEnabled
         let password = passwordTextField.text!
-        guard (!passwordEnabled || (password.count > 4 && password == repeatPasswordTextField.text)) else {
-            if(password.count > 4){
-                repeatPasswordTextField.detail = "Passwords don’t match"
+        guard (!passwordEnabled || (password.count >= MIN_PASS_LENGTH && password == repeatPasswordTextField.text)) else {
+            repeatPasswordTextField.detail = ""
+            passwordTextField.detail = ""
+            if (password.count >= MIN_PASS_LENGTH) {
+                repeatPasswordTextField.detail = "Passphrases do not  match"
             } else {
-                passwordTextField.detail = "Use at least 5 characters"
+                passwordTextField.detail = "Use at least 3 characters"
             }
             return
         }

iOS-Email-Client/Controllers/InboxViewController.swift

@@ -772,23 +772,33 @@ extension InboxViewController: InboxTableViewCellDelegate, UITableViewDelegate {
 
     func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
 
-        guard mailboxData.selectedLabel != SystemLabel.trash.id else {
+        guard mailboxData.selectedLabel != SystemLabel.trash.id && mailboxData.selectedLabel != SystemLabel.spam.id && mailboxData.selectedLabel != SystemLabel.draft.id else {
             return []
         }
 
         let trashAction = UITableViewRowAction(style: UITableViewRowActionStyle.normal, title: "         ") { (action, index) in
             let thread = self.mailboxData.threads[indexPath.row]
-            DBManager.setLabelsForEmail(thread.lastEmail, labels: [SystemLabel.trash.id])
-            self.mailboxData.threads.remove(at: indexPath.row)
-            self.tableView.deleteRows(at: [indexPath], with: .fade)
-            self.updateBadges()
-            self.showNoThreadsView(self.mailboxData.reachedEnd && self.mailboxData.threads.isEmpty)
+            self.moveSingleThreadTrash(threadId: thread.threadId)
         }
 
         trashAction.backgroundColor = UIColor(patternImage: #imageLiteral(resourceName: "trash-action"))
 
         return [trashAction];
     }
+
+    func moveSingleThreadTrash(threadId: String){
+        let eventData = EventData.Peer.ThreadLabels(threadIds: [threadId], labelsAdded: [SystemLabel.trash.description], labelsRemoved: [])
+        
+        APIManager.postPeerEvent(["params": eventData.asDictionary(), "cmd": Event.Peer.threadsLabels.rawValue], token: myAccount.jwt) { (error) in
+            guard error == nil else {
+                self.showAlert("Something went wrong", message: "Unable to set labels. Please try again", style: .alert)
+                return
+            }
+            DBManager.addRemoveLabelsForThreads(threadId, addedLabelIds: [SystemLabel.trash.id], removedLabelIds: [], currentLabel: self.mailboxData.selectedLabel)
+            self.removeThreads(threadIds: [threadId])
+        }
+    }
+    
 
     func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
         return indexPath.row != mailboxData.threads.count && !mailboxData.isCustomEditing && !mailboxData.searchMode
@@ -900,7 +910,10 @@ extension InboxViewController {
                 continue
             }
             indexesToRemove.append(IndexPath(row: index, section: 0))
-            mailboxData.threads.remove(at: index)
+        }
+        let sortedIndexPaths = indexesToRemove.sorted(by: {$0.row > $1.row})
+        for path in sortedIndexPaths {
+            mailboxData.threads.remove(at: path.row)
         }
         tableView.deleteRows(at: indexesToRemove, with: .left)
         updateBadges()
@@ -1048,9 +1061,9 @@ extension InboxViewController: ComposerSendMailDelegate {
         reloadIfSentMailbox(email: email)
         let sendMailAsyncTask = SendMailAsyncTask(account: myAccount, email: email)
         sendMailAsyncTask.start { data in
-            guard let key = data as? Int,
+            guard let key = data,
                 let newEmail = DBManager.getMail(key: key) else {
-                self.showAlert("Network Error", message: "Unable to send email. Don't worry, it will be automatically resend.", style: .alert)
+                self.showAlert("Network Error", message: "Unable to send email. Don't worry, it will be automatically resent.", style: .alert)
                 self.hideSnackbar()
                 return
             }

iOS-Email-Client/Controllers/Login/CreatingAccountViewController.swift

@@ -9,6 +9,7 @@
 import Foundation
 import SignalProtocolFramework
 import FirebaseMessaging
+import UIWindowTransitions
 
 class CreatingAccountViewController: UIViewController{
 
@@ -131,10 +132,11 @@ class CreatingAccountViewController: UIViewController{
         }
         delegate.createSystemLabels()
         let mailboxVC = delegate.initMailboxRootVC(nil, activeAccount)
-        present(mailboxVC, animated: true) { [weak self] in
-            delegate.replaceRootViewController(mailboxVC)
-            self?.removeFromParentViewController()
-        }
+        var options = UIWindow.TransitionOptions()
+        options.direction = .toTop
+        options.duration = 0.4
+        options.style = .easeOut
+        UIApplication.shared.keyWindow?.setRootViewController(mailboxVC, options: options)
     }
 
     func animateProgress(_ value: Double, _ duration: Double, completion: @escaping () -> Void){