Merge pull request #493 from jorgeblacio/link_cancel

Added link and sync cancel.

Author: danieltigse

iOS-Email-Client/Base.lproj/Login.storyboard

@@ -30,12 +30,13 @@ class ComposeViewController: UIViewController {
     let DEFAULT_ATTACHMENTS_HEIGHT = 303
     let MAX_ROWS_BEFORE_CALC_HEIGHT = 3
     let ATTACHMENT_ROW_HEIGHT = 65
-    let MARGIN_TOP = 20
+    let MARGIN_TOP = 5
     let CONTACT_FIELDS_HEIGHT = 90
     let ENTER_LINE_HEIGHT : CGFloat = 28.0
     let TOOLBAR_MARGIN_HEIGHT = 25
     let COMPOSER_MIN_HEIGHT = 150
     let PASSWORD_POPUP_HEIGHT = 295
+    let ATTACHMENT_BUTTON_HEIGHT = 32.0
 
     @IBOutlet weak var fromField: UILabel!
     @IBOutlet weak var fromButton: UIButton!
@@ -189,7 +190,7 @@ class ComposeViewController: UIViewController {
 
         let activityButton = MIBadgeButton(type: .custom)
         activityButton.badgeString = ""
-        activityButton.frame = CGRect(x:14, y:8, width:18, height:32)
+        activityButton.frame = CGRect(x:14, y:8, width:18, height: ATTACHMENT_BUTTON_HEIGHT)
         activityButton.imageEdgeInsets = UIEdgeInsets(top: 2, left: 2, bottom: 5, right: 2)
         activityButton.badgeEdgeInsets = UIEdgeInsets(top: 5, left: 12, bottom: 0, right: 13)
         activityButton.tintColor = Icon.enabled.color
@@ -1130,7 +1131,8 @@ extension ComposeViewController: RichEditorDelegate {
         let diff = cgheight - composerEditorHeight
         let offset = self.scrollView.contentOffset
 
-        if CGFloat(height + CONTACT_FIELDS_HEIGHT + TOOLBAR_MARGIN_HEIGHT) > self.toolbarView.frame.origin.y {
+        let calcHeight = self.attachmentButtonContainerView.layer.borderWidth + CGFloat(ATTACHMENT_BUTTON_HEIGHT)
+        if CGFloat(height + CONTACT_FIELDS_HEIGHT + TOOLBAR_MARGIN_HEIGHT) + calcHeight > self.toolbarView.frame.origin.y {
             var newOffset = CGPoint(x: offset.x, y: offset.y + ENTER_LINE_HEIGHT)
             if diff == -ENTER_LINE_HEIGHT  {
                 newOffset = CGPoint(x: offset.x, y: offset.y - ENTER_LINE_HEIGHT)
@@ -1146,7 +1148,7 @@ extension ComposeViewController: RichEditorDelegate {
         }
 
         composerEditorHeight = cgheight
-        self.editorHeightConstraint.constant = cgheight + composerKeyboardOffset
+        self.editorHeightConstraint.constant = cgheight + self.attachmentButtonContainerView.layer.borderWidth + CGFloat(ATTACHMENT_BUTTON_HEIGHT) + composerKeyboardOffset
     }
 
     func richEditor(_ editor: RichEditorView, contentDidChange content: String) {

iOS-Email-Client/Controllers/ComposeViewController.swift

@@ -67,6 +67,7 @@ class ConnectUploadViewController: UIViewController{
     }
 
     override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
+        APIManager.linkCancel(token: self.myAccount.jwt, recipientId: self.myAccount.username, domain: self.myAccount.domain ?? Env.plainDomain, completion: {_ in })
         super.dismiss(animated: flag, completion: completion)
         scheduleWorker.cancel()
         WebSocketManager.sharedInstance.delegate = mailboxDelegate

iOS-Email-Client/Controllers/ConnectUploadViewController.swift

@@ -535,7 +535,7 @@ extension InboxViewController: WebSocketManagerDelegate {
             self.handleLinkStart(linkData: data, account: account)
         case .LinkDismiss( _, _), .SyncDismiss( _, _):
             let topView = self.getTopView().presentedViewController
-            if(topView is SignInVerificationUIPopover){
+            if(topView is SignInVerificationUIPopover || topView is GenericDualAnswerUIPopover){
                 topView?.dismiss(animated: false, completion: nil)
             }
         case .NewEvent(let username, let domain):

iOS-Email-Client/Controllers/InboxViewController.swift

@@ -93,9 +93,12 @@ class ConnectDeviceViewController: UIViewController{
         UIApplication.shared.isIdleTimerDisabled = false
         socket?.close()
         scheduleWorker.cancel()
-        cleanData()
-        presentingViewController?.navigationController?.popToRootViewController(animated: false)
-        dismiss(animated: true, completion: nil)
+        guard let myAccount = account else {
+            presentingViewController?.navigationController?.popToRootViewController(animated: false)
+            dismiss(animated: true, completion: nil)
+            return
+        }
+        goToMailbox(myAccount.compoundKey)
     }
 
     func cleanData(){

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

@@ -49,6 +49,9 @@ class LoginDeviceViewController: UIViewController{
     }
 
     @IBAction func backButtonPress(_ sender: Any) {
+        if(loginData.jwt != nil){
+            APIManager.linkCancel(token: loginData.jwt!, recipientId: loginData.username, domain: loginData.domain, completion: {_ in })
+        }
         self.navigationController?.popToRootViewController(animated: true)
     }
 

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

@@ -276,6 +276,10 @@ class SettingsGeneralViewController: UIViewController{
         popover.rightOption = String.localize("CONTINUE")
         popover.onResponse = { [weak self] accept in
             guard accept else {
+                guard let weakSelf = self else {
+                    return
+                }
+                APIManager.syncCancel(token: weakSelf.myAccount.jwt, completion: {_ in})
                 return
             }
             self?.showManualSyncPopup()

iOS-Email-Client/Controllers/SettingsGeneralViewController.swift

@@ -545,6 +545,36 @@ class APIManager: SharedAPI {
         }
     }
 
+    class func linkCancel(token: String, recipientId: String, domain: String, completion: @escaping ((ResponseData) -> Void)) {
+        let url = "\(self.baseUrl)/link/cancel"
+        let headers = [
+            "Authorization": "Bearer \(token)",
+            versionHeader: apiVersion,
+            language: Env.language
+        ]
+        let params = [
+            "recipientId": recipientId,
+            "domain": domain
+            ] as [String : Any]
+        Alamofire.request(url, method: .post, parameters: params, encoding: JSONEncoding.default, headers: headers).responseString { (response) in
+            let responseData = handleResponse(response)
+            completion(responseData)
+        }
+    }
+    
+    class func syncCancel(token: String, completion: @escaping ((ResponseData) -> Void)) {
+        let url = "\(self.baseUrl)/sync/cancel"
+        let headers = [
+            "Authorization": "Bearer \(token)",
+            versionHeader: apiVersion,
+            language: Env.language
+        ]
+        Alamofire.request(url, method: .post, parameters: nil, encoding: JSONEncoding.default, headers: headers).responseString { (response) in
+            let responseData = handleResponse(response)
+            completion(responseData)
+        }
+    }
+    
     class func getNews(code: String, completion: @escaping ((ResponseData) -> Void)) {
         let url = "https://news.criptext.com/news/\(NSLocale.preferredLanguages.first!)/\(code)"
         Alamofire.request(url, method: .get, parameters: nil, encoding: JSONEncoding.default, headers: nil).responseJSON { (response) in