Merge branch 'PN-without-preview' of https://github.com/RyanRory/loki-messenger-ios into PN-with-preview

Signal/src/AppDelegate.m

@@ -587,7 +587,9 @@ static BOOL isInternalTestVersion = NO;
     }
 
     OWSLogInfo(@"Registered for push notifications with token: %@.", deviceToken);
-    [LKPushNotificationManager.shared registerWithToken:deviceToken];
+    //TODO: For normal push notification test
+    [LKPushNotificationManager.shared registerWithToken:deviceToken pubkey:self.tsAccountManager.localNumber];
+//    [LKPushNotificationManager.shared registerWithToken:deviceToken];
 //    [self.pushRegistrationManager didReceiveVanillaPushToken:deviceToken];
 }
 
@@ -1552,6 +1554,10 @@ static BOOL isInternalTestVersion = NO;
     __IOS_AVAILABLE(10.0)__TVOS_AVAILABLE(10.0)__WATCHOS_AVAILABLE(3.0)__OSX_AVAILABLE(10.14)
 {
     OWSLogInfo(@"");
+    if (notification.request.content.userInfo[@"remote"]) {
+        OWSLogInfo(@"[Loki] Ignore remote notifications when app is foreground.");
+        return;
+    }
     [AppReadiness runNowOrWhenAppDidBecomeReady:^() {
         // We need to respect the in-app notification sound preference. This method, which is called
         // for modern UNUserNotification users, could be a place to do that, but since we'd still

Signal/src/Loki/Utilities/LokiPushNotificationManager.swift

@@ -15,11 +15,16 @@ final class LokiPushNotificationManager : NSObject {
         let userDefaults = UserDefaults.standard
         let oldToken = userDefaults[.deviceToken]
         let lastUploadTime = userDefaults[.lastDeviceTokenUpload]
+        let applyNormalNotification = userDefaults[.applyNormalNotification]
         let now = Date().timeIntervalSince1970
         if hexEncodedToken == oldToken && now - lastUploadTime < 2 * 24 * 60 * 60  {
             print("[Loki] Device token hasn't changed; no need to upload.")
             return
         }
+        if applyNormalNotification {
+            print("[Loki] Using normal notification; no need to upload.")
+            return
+        }
         // Send token to Loki server
         let parameters = [ "token" : hexEncodedToken ]
         #if DEBUG
@@ -36,6 +41,35 @@ final class LokiPushNotificationManager : NSObject {
             }
             userDefaults[.deviceToken] = hexEncodedToken
             userDefaults[.lastDeviceTokenUpload] = now
+            userDefaults[.applyNormalNotification] = false
+        }, failure: { _, error in
+            print("[Loki] Couldn't register device token.")
+        })
+    }
+    
+    @objc(registerWithToken: pubkey:)
+    func register(with token: Data, pubkey: String) {
+        let hexEncodedToken = token.map { String(format: "%02.2hhx", $0) }.joined()
+        let userDefaults = UserDefaults.standard
+        let now = Date().timeIntervalSince1970
+        // Send token to Loki server
+        let parameters = [ "token" : hexEncodedToken,
+                           "pubKey": pubkey]
+        #if DEBUG
+        let url = URL(string: "https://dev.apns.getsession.org/register")!
+        #else
+        let url = URL(string: "https://live.apns.getsession.org/register")!
+        #endif
+        let request = TSRequest(url: url, method: "POST", parameters: parameters)
+        request.allHTTPHeaderFields = [ "Content-Type" : "application/json" ]
+        TSNetworkManager.shared().makeRequest(request, success: { _, response in
+            guard let json = response as? JSON else { return }
+            guard json["code"] as? Int != 0 else {
+                return print("[Loki] An error occured during device token registration: \(json["message"] as? String ?? "nil").")
+            }
+            userDefaults[.deviceToken] = hexEncodedToken
+            userDefaults[.lastDeviceTokenUpload] = now
+            userDefaults[.applyNormalNotification] = true
         }, failure: { _, error in
             print("[Loki] Couldn't register device token.")
         })

Signal/src/UserInterface/Notifications/AppNotifications.swift

@@ -642,7 +642,8 @@ class NotificationActionHandler {
 
     func showThread(userInfo: [AnyHashable: Any]) throws -> Promise<Void> {
         guard let threadId = userInfo[AppNotificationUserInfoKey.threadId] as? String else {
-            throw NotificationError.failDebug("threadId was unexpectedly nil")
+            return showHomePage()
+//            throw NotificationError.failDebug("threadId was unexpectedly nil")
         }
 
         // If this happens when the the app is not, visible we skip the animation so the thread
@@ -652,6 +653,11 @@ class NotificationActionHandler {
         signalApp.presentConversationAndScrollToFirstUnreadMessage(forThreadId: threadId, animated: shouldAnimate)
         return Promise.value(())
     }
+    
+    func showHomePage() -> Promise<Void> {
+        signalApp.showHomeView()
+        return Promise.value(())
+    }
 
     private func markAsRead(thread: TSThread) -> Promise<Void> {
         return dbConnection.readWritePromise { transaction in

SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift

@@ -8,6 +8,7 @@ public enum LKUserDefaults {
         case hasViewedSeed
         /// Whether the device was unlinked as a slave device (used to notify the user on the landing screen).
         case wasUnlinked
+        case applyNormalNotification
     }
 
     public enum Date : Swift.String {

SignalServiceKit/src/Messages/TypingIndicatorMessage.swift

@@ -104,6 +104,11 @@ public class TypingIndicatorMessage: TSOutgoingMessage {
     public override func shouldBeSaved() -> Bool {
         return false
     }
+    
+    @objc
+    public override var ttl: UInt32 {
+        return UInt32(5 * kMinuteInMs)
+    }
 
     @objc
     public override var debugDescription: String {