Rename Token to APNS Key

LoopFollow/Remote/Settings/RemoteSettingsView.swift

@@ -23,7 +23,7 @@ struct RemoteSettingsView: View {
         case user
         case deviceToken
         case sharedSecret
-        case token
+        case apnsKey
         case teamId
         case keyId
         case bundleId
@@ -88,8 +88,8 @@ struct RemoteSettingsView: View {
                             .disabled(true)
 
                         VStack(alignment: .leading) {
-                            Text("Token")
-                            TextEditor(text: $viewModel.token)
+                            Text("APNS Key")
+                            TextEditor(text: $viewModel.apnsKey)
                                 .frame(height: 100)
                                 .autocapitalization(.none)
                                 .disableAutocorrection(true)
@@ -97,7 +97,7 @@ struct RemoteSettingsView: View {
                                     RoundedRectangle(cornerRadius: 8)
                                         .stroke(Color.gray.opacity(0.5), lineWidth: 1)
                                 )
-                                .focused($focusedField, equals: .token)
+                                .focused($focusedField, equals: .apnsKey)
                         }
 
                         HStack {

LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift

@@ -16,7 +16,7 @@ class RemoteSettingsViewModel: ObservableObject {
     @Published var deviceToken: String
     @Published var sharedSecret: String
     @Published var productionEnvironment: Bool
-    @Published var token: String
+    @Published var apnsKey: String
     @Published var teamId: String
     @Published var keyId: String
     @Published var bundleId: String
@@ -35,7 +35,7 @@ class RemoteSettingsViewModel: ObservableObject {
         self.deviceToken = storage.deviceToken.value
         self.sharedSecret = storage.sharedSecret.value
         self.productionEnvironment = storage.productionEnvironment.value
-        self.token = storage.token.value
+        self.apnsKey = storage.apnsKey.value
         self.teamId = storage.teamId.value
         self.keyId = storage.keyId.value
         self.bundleId = storage.bundleId.value
@@ -68,8 +68,8 @@ class RemoteSettingsViewModel: ObservableObject {
             .sink { [weak self] in self?.storage.productionEnvironment.value = $0 }
             .store(in: &cancellables)
 
-        $token
-            .sink { [weak self] in self?.storage.token.value = $0 }
+        $apnsKey
+            .sink { [weak self] in self?.storage.apnsKey.value = $0 }
             .store(in: &cancellables)
 
         $teamId

LoopFollow/Storage/Storage.swift

@@ -15,6 +15,7 @@ class Storage {
     var sharedSecret = StorageValue<String>(key: "sharedSecret", default: "")
     var productionEnvironment = StorageValue<Bool>(key: "productionEnvironment", default: true)
     var token = StorageValue<String>(key: "token", default: "")
+    var apnsKey = StorageValue<String>(key: "apnsKey", default: "")
     var teamId = StorageValue<String>(key: "teamId", default: "")
     var keyId = StorageValue<String>(key: "keyId", default: "")
     var bundleId = StorageValue<String>(key: "bundleId", default: "")
@@ -27,5 +28,9 @@ class Storage {
 
     static let shared = Storage()
 
-    private init() {}
+    private init() {
+        if apnsKey.value.isEmpty && !token.value.isEmpty {
+            apnsKey = token // Migrate the old `token` value to `apnsKey` TODO: Remove this code later on.
+        }
+    }
 }

LoopFollow/ViewControllers/MainViewController.swift

@@ -58,7 +58,7 @@ class MainViewController: UIViewController, UITableViewDataSource, ChartViewDele
     
     // Vars for NS Pull
     var mmol = false as Bool
-    var token = UserDefaultsRepository.token.value as String
+    var apnsKey = UserDefaultsRepository.token.value as String
     var defaults : UserDefaults?
     let consoleLogging = true
     var timeofLastBGUpdate = 0 as TimeInterval