Merge pull request #486 from jorgeblacio/email_more_menu_fix

Fixed missing FW option on email detail, and a file attachment bug.

Author: danieltigse

iOS-Email-Client/Controllers/ComposeViewController.swift

@@ -602,11 +602,6 @@ class ComposeViewController: UIViewController {
     }
 
     @IBAction func didPressAttachment(_ sender: UIButton) {
-        //derpo
-        guard fileManager.registeredFiles.count < 5 else {
-            self.showAlert(String.localize("ATTACHMENT_CAP"), message: String.localize("ATTACHMENT_CAP_SIZE"), style: .alert)
-            return
-        }
         self.showAttachmentDrawer(true)
     }
 

iOS-Email-Client/Interfaces/EmailMoreOptionsInterface.swift

@@ -69,7 +69,7 @@ class EmailMoreOptionsInterface: MoreOptionsViewInterface {
     var delegate: EmailMoreOptionsInterfaceDelegate?
 
     init(email: Email) {
-        options = [.reply, .replyAll, .delete, .mark]
+        options = [.reply, .replyAll, .forward, .delete, .mark]
         optionsCount = 4
         if (email.isSpam) {
             options.append(.notSpam)

iOS-Email-Client/Managers/CriptextFileManager.swift

@@ -42,7 +42,8 @@ class CriptextFileManager {
             return false
         }
         let fileSize = Int(truncating: fileAttributes[.size] as! NSNumber)
-        guard self.availableSize(addedSize: fileSize) else {
+        guard self.availableSize(addedSize: fileSize),
+            fileSize != 0 else {
             self.delegate?.fileError(message: String.localize("EXCEEDS_MAX_SIZE", arguments: File.prettyPrintSize(size: MAX_SIZE)))
             return false
         }