From 4550a139b66828490b3e514365b5aed44ad31055 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Fri, 18 Sep 2020 12:34:43 +1000
Subject: [PATCH] Force users to re-register on new PN server

---
 .../Push Notifications/LokiPushNotificationManager.swift  | 8 ++++----
 SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift  | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift b/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift
index ce5ed26de..0a4667cb3 100644
--- a/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift	
+++ b/SignalServiceKit/src/Loki/Push Notifications/LokiPushNotificationManager.swift	
@@ -26,7 +26,7 @@ public final class LokiPushNotificationManager : NSObject {
         let hexEncodedToken = token.toHexString()
         let userDefaults = UserDefaults.standard
         let oldToken = userDefaults[.deviceToken]
-        let lastUploadTime = userDefaults[.lastDeviceTokenUpload]
+        let lastUploadTime = userDefaults[.lastDeviceTokenUpload2]
         let isUsingFullAPNs = userDefaults[.isUsingFullAPNs]
         let now = Date().timeIntervalSince1970
         guard isForcedUpdate || hexEncodedToken != oldToken || now - lastUploadTime > tokenExpirationInterval else {
@@ -45,7 +45,7 @@ public final class LokiPushNotificationManager : NSObject {
                 return print("[Loki] Couldn't register device token due to error: \(json["message"] as? String ?? "nil").")
             }
             userDefaults[.deviceToken] = hexEncodedToken
-            userDefaults[.lastDeviceTokenUpload] = now
+            userDefaults[.lastDeviceTokenUpload2] = now
             userDefaults[.isUsingFullAPNs] = false
             return
         }
@@ -71,7 +71,7 @@ public final class LokiPushNotificationManager : NSObject {
         let hexEncodedToken = token.toHexString()
         let userDefaults = UserDefaults.standard
         let oldToken = userDefaults[.deviceToken]
-        let lastUploadTime = userDefaults[.lastDeviceTokenUpload]
+        let lastUploadTime = userDefaults[.lastDeviceTokenUpload2]
         let now = Date().timeIntervalSince1970
         guard isForcedUpdate || hexEncodedToken != oldToken || now - lastUploadTime > tokenExpirationInterval else {
             print("[Loki] Device token hasn't changed or expired; no need to re-upload.")
@@ -89,7 +89,7 @@ public final class LokiPushNotificationManager : NSObject {
                 return print("[Loki] Couldn't register device token due to error: \(json["message"] as? String ?? "nil").")
             }
             userDefaults[.deviceToken] = hexEncodedToken
-            userDefaults[.lastDeviceTokenUpload] = now
+            userDefaults[.lastDeviceTokenUpload2] = now
             userDefaults[.isUsingFullAPNs] = true
             return
         }
diff --git a/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift b/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift
index 2fc7eaf0a..7f12840ba 100644
--- a/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift
+++ b/SignalServiceKit/src/Loki/Utilities/LKUserDefaults.swift
@@ -19,7 +19,9 @@ public enum LKUserDefaults {
     }
 
     public enum Double : Swift.String {
+        /// - Note: Deprecated
         case lastDeviceTokenUpload = "lastDeviceTokenUploadTime"
+        case lastDeviceTokenUpload2 = "lastDeviceTokenUpload2"
     }
 
     public enum Int: Swift.String {