Merge pull request #228 from Hirobreak/register

fix register for notification

Author: danieltigse

iOS-Email-Client/AppDelegate.swift

@@ -137,7 +137,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 UIUserNotificationSettings(types: [.alert, .sound, .badge], categories: nil)
             UIApplication.shared.registerUserNotificationSettings(settings)
         }
-        
+        UIApplication.shared.registerForRemoteNotifications()
         UNUserNotificationCenter.current().setNotificationCategories([setupLinkDeviceNotification(), setupNewEmailNotification()])
     }
 
@@ -149,9 +149,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func setupNewEmailNotification() -> UNNotificationCategory {
         let emailMark = UNNotificationAction(identifier: "EMAIL_MARK", title: "Mark as Read", options: .authenticationRequired)
-        let emailReply = UNNotificationAction(identifier: "EMAIL_REPLY", title: "Reply", options: .foreground)
         let emailTrash = UNNotificationAction(identifier: "EMAIL_TRASH", title: "Delete", options: .destructive)
-        return UNNotificationCategory(identifier: "OPEN_THREAD", actions: [emailMark, emailReply, emailTrash], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: "", options: .customDismissAction)
+        return UNNotificationCategory(identifier: "OPEN_THREAD", actions: [emailMark, emailTrash], intentIdentifiers: [], hiddenPreviewsBodyPlaceholder: "", options: .customDismissAction)
     }
 
     func logout(manually: Bool = false){

iOS-Email-Client/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.12</string>
+	<string>1.0.14</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

iOS-Email-Client/Managers/WebSocketManager.swift

@@ -16,7 +16,7 @@ protocol WebSocketManagerDelegate {
 final class WebSocketManager: NSObject {
     static let sharedInstance = WebSocketManager()
     var delegate : WebSocketManagerDelegate?
-    var socket : WebSocket!
+    var socket : WebSocket?
     var myAccount : Account?
     var shouldReconnect = true
     let SOCKET_URL = Env.socketURL
@@ -29,12 +29,13 @@ final class WebSocketManager: NSObject {
         shouldReconnect = true
         myAccount = account
         socket = WebSocket("\(SOCKET_URL)?token=\(account.jwt)", subProtocol: "criptext-protocol")
-        socket.delegate = self
+        socket?.delegate = self
     }
 
     func reconnect(){
         shouldReconnect = true
-        guard socket.readyState != .open && socket.readyState != .connecting,
+        guard let mySocket = socket,
+            mySocket.readyState != .open && mySocket.readyState != .connecting,
             let account = self.myAccount else {
             return
         }
@@ -43,15 +44,15 @@ final class WebSocketManager: NSObject {
 
     func pause() {
         shouldReconnect = false
-        socket.event.close = {_,_,_ in }
-        socket.close()
+        socket?.event.close = {_,_,_ in }
+        socket?.close()
     }
 
     func close(){
         shouldReconnect = false
         myAccount = nil
-        socket.event.close = {_,_,_ in }
-        socket.close()
+        socket?.event.close = {_,_,_ in }
+        socket?.close()
     }
 }