Merge pull request #214 from Hirobreak/linking2

Linking Stage 2

Author: danieltigse

Cartfile

@@ -17,4 +17,5 @@ github "hackiftekhar/IQKeyboardManager"
 github "Criptext/UIImageView-Letters" ~> 1.1.5
 github "ephread/Instructions" ~> 1.2.0
 github "malcommac/UIWindowTransitions"
-github "airbnb/lottie-ios" "master"
+github "airbnb/lottie-ios" "master"
+github "1024jp/GzipSwift"

Cartfile.resolved

@@ -1,3 +1,4 @@
+github "1024jp/GzipSwift" "4.0.4"
 github "Alamofire/Alamofire" "4.7.3"
 github "CosmicMind/Material" "2.16.4"
 github "CosmicMind/Motion" "1.4.3"

iOS-Email-Client.xcodeproj/project.pbxproj

@@ -138,8 +138,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             UIApplication.shared.registerUserNotificationSettings(settings)
         }
 
-        let linkAccept = UNNotificationAction(identifier: "LINK_ACCEPT", title: "Approve", options: .authenticationRequired)
-        let linkDeny = UNNotificationAction(identifier: "LINK_DENY", title: "Deny", options: .destructive)
+        let linkAccept = UNNotificationAction(identifier: "LINK_ACCEPT", title: "Approve", options: .foreground)
+        let linkDeny = UNNotificationAction(identifier: "LINK_DENY", title: "Reject", options: .destructive)
         let linkCategory = UNNotificationCategory(identifier: "LINK_DEVICE", actions: [linkAccept, linkDeny], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: "", options: .customDismissAction)
         let notificationCenter = UNUserNotificationCenter.current()
         notificationCenter.setNotificationCategories([linkCategory])
@@ -197,15 +197,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         return snackbarController
     }
 
-    func createSystemLabels(){
-        for systemLabel in SystemLabel.array {
-            let newLabel = Label(systemLabel.description)
-            newLabel.id = systemLabel.id
-            newLabel.color = systemLabel.hexColor
-            newLabel.type = "system"
-            DBManager.store(newLabel)
-        }
-    }
+    
 
     func applicationWillResignActive(_ application: UIApplication) {
         // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
@@ -222,6 +214,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillEnterForeground(_ application: UIApplication) {
         // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background.
         self.triggerRefresh()
+        UNUserNotificationCenter.current().removeAllDeliveredNotifications()
     }
 
     func triggerRefresh(){

iOS-Email-Client/AppDelegate.swift

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "deviceAlert.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "deviceAlert@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "deviceAlert@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOS-Email-Client/Assets.xcassets/device-alert.imageset/Contents.json

@@ -13,6 +13,8 @@ import RealmSwift
 class CreateCustomJSONFileAsyncTask {
 
     let fileURL = CriptextFileManager.getURLForFile(name: "link-device-db")
+    var contacts = [String: Int]()
+    var emails = [Int: Int]()
 
     func start(completion: @escaping ((Error?, URL?) -> Void)){
         try? FileManager.default.removeItem(at: fileURL)
@@ -23,39 +25,51 @@ class CreateCustomJSONFileAsyncTask {
 
     private func createDBFile(completion: @escaping ((Error?, URL?) -> Void)){
         let results = DBManager.retrieveWholeDB()
-        (results["contacts"] as! Results<Contact>).forEach {handleRow($0)}
-        (results["labels"] as! Results<Label>).forEach {handleRow($0)}
-        let emails = results["emails"] as! Results<Email>
-        emails.forEach {handleRow($0)}
-        emails.forEach { (email) in
-            email.toDictionaryLabels().forEach({ (emailLabelDictionary) in
+        results.contacts.enumerated().forEach {
+            contacts[$1.email] = $0 + 1
+            let dictionary = $1.toDictionary(id: $0 + 1)
+            handleRow(dictionary)
+        }
+        results.labels.forEach {handleRow($0.toDictionary())}
+        results.emails.enumerated().forEach {
+            emails[$1.key] = $0 + 1
+            let dictionary = $1.toDictionary(id: $0 + 1)
+            handleRow(dictionary)
+        }
+        results.emails.forEach { (email) in
+            email.toDictionaryLabels(emailsMap: emails).forEach({ (emailLabelDictionary) in
                 guard let jsonString = Utils.convertToJSONString(dictionary: emailLabelDictionary) else {
                     return
                 }
                 writeRowToFile(jsonRow: jsonString)
             })
         }
-        (results["emailContacts"] as! Results<EmailContact>).forEach {handleRow($0)}
-        (results["files"] as! Results<File>).forEach {handleRow($0)}
-        let fileKeys = results["fileKeys"] as! Results<FileKey>
-        fileKeys.forEach { (fileKey) in
-            guard fileKey != fileKeys.last else {
-                handleRow(fileKey, appendNewLine: false)
+        results.emailContacts.enumerated().forEach {
+            guard let emailId = emails[$1.email.key] else {
+                return
+            }
+            handleRow($1.toDictionary(id: $0 + 1, emailId: emailId, contactId: contacts[$1.contact.email]!))
+        }
+        results.files.forEach {
+            guard let emailId = emails[$0.emailId] else {
                 return
             }
-            handleRow(fileKey)
+            handleRow($0.toDictionary(emailId: emailId))
+        }
+        results.fileKeys.forEach {
+            guard let emailId = emails[$0.emailId] else {
+                return
+            }
+            handleRow($0.toDictionary(emailId: emailId))
         }
 
         DispatchQueue.main.async {
             completion(nil, self.fileURL)
         }
     }
 
-    private func handleRow(_ row: Any, appendNewLine: Bool = true){
-        guard let item = row as? CustomDictionary else {
-            return
-        }
-        guard let jsonString = Utils.convertToJSONString(dictionary: item.toDictionary()) else {
+    private func handleRow(_ row: [String: Any], appendNewLine: Bool = true){
+        guard let jsonString = Utils.convertToJSONString(dictionary: row) else {
             return
         }
         writeRowToFile(jsonRow: jsonString, appendNewLine: appendNewLine)

iOS-Email-Client/Assets.xcassets/device-alert.imageset/deviceAlert.png

@@ -221,6 +221,13 @@ class SendMailAsyncTask {
             requestParams["threadId"] = thread
         }
         APIManager.postMailRequest(requestParams, token: myAccount.jwt, queue: queue) { responseData in
+            if case .TooManyRequests = responseData {
+                DispatchQueue.main.async {
+                    self.setEmailAsFailed()
+                    completion(ResponseData.Error(CriptextError(message: "Failed to send e-mail. Email cap reached. It will be sent later.")))
+                }
+                return
+            }
             guard case let .SuccessDictionary(updateData) = responseData else {
                 DispatchQueue.main.async {
                     self.setEmailAsFailed()