Browse Source

Removed unnecessary remote settings

Jonas Björkert 1 year ago
parent
commit
ba67ad7169

+ 10 - 2
LoopFollow/Remote/PushNotificationManager.swift

@@ -103,16 +103,24 @@ class PushNotificationManager {
         print("Push message to send: \(message)")
 
         var missingFields = [String]()
-        if deviceToken.isEmpty { missingFields.append("deviceToken") }
         if sharedSecret.isEmpty { missingFields.append("sharedSecret") }
         if apnsKey.isEmpty { missingFields.append("token") }
         if teamId.isEmpty { missingFields.append("teamId") }
         if keyId.isEmpty { missingFields.append("keyId") }
         if user.isEmpty { missingFields.append("user") }
+
+        if !missingFields.isEmpty {
+            let errorMessage = "Missing required fields, check your remote settings: \(missingFields.joined(separator: ", "))"
+            print(errorMessage)
+            completion(false, errorMessage)
+            return
+        }
+
+        if deviceToken.isEmpty { missingFields.append("deviceToken") }
         if bundleId.isEmpty { missingFields.append("bundleId") }
 
         if !missingFields.isEmpty {
-            let errorMessage = "Missing required fields: \(missingFields.joined(separator: ", "))"
+            let errorMessage = "Missing required data, verify that you are using the latest version of Trio: \(missingFields.joined(separator: ", "))"
             print(errorMessage)
             completion(false, errorMessage)
             return

+ 0 - 24
LoopFollow/Remote/Settings/RemoteSettingsView.swift

@@ -65,16 +65,6 @@ struct RemoteSettingsView: View {
                 if viewModel.remoteType == .trc {
                     Section(header: Text("Trio Remote Control Settings")) {
                         HStack {
-                            Text("Device Token")
-                            TextField("Enter Device Token", text: $viewModel.deviceToken)
-                                .autocapitalization(.none)
-                                .disableAutocorrection(true)
-                                .focused($focusedField, equals: .deviceToken)
-                                .multilineTextAlignment(.trailing)
-                                .disabled(true)
-                        }
-
-                        HStack {
                             Text("Shared Secret")
                             TextField("Enter Shared Secret", text: $viewModel.sharedSecret)
                                 .autocapitalization(.none)
@@ -83,10 +73,6 @@ struct RemoteSettingsView: View {
                                 .multilineTextAlignment(.trailing)
                         }
 
-                        Toggle("Production Environment", isOn: $viewModel.productionEnvironment)
-                            .padding(.vertical, 5)
-                            .disabled(true)
-
                         HStack {
                             Text("APNS Key ID")
                             TextField("Enter APNS Key ID", text: $viewModel.keyId)
@@ -117,16 +103,6 @@ struct RemoteSettingsView: View {
                                 .focused($focusedField, equals: .teamId)
                                 .multilineTextAlignment(.trailing)
                         }
-
-                        HStack {
-                            Text("Bundle ID")
-                            TextField("Enter Bundle ID", text: $viewModel.bundleId)
-                                .autocapitalization(.none)
-                                .disableAutocorrection(true)
-                                .focused($focusedField, equals: .bundleId)
-                                .multilineTextAlignment(.trailing)
-                        }
-                        .disabled(true)
                     }
 
                     // Guardrails Section

+ 0 - 18
LoopFollow/Remote/Settings/RemoteSettingsViewModel.swift

@@ -13,13 +13,10 @@ import HealthKit
 class RemoteSettingsViewModel: ObservableObject {
     @Published var remoteType: RemoteType
     @Published var user: String
-    @Published var deviceToken: String
     @Published var sharedSecret: String
-    @Published var productionEnvironment: Bool
     @Published var apnsKey: String
     @Published var teamId: String
     @Published var keyId: String
-    @Published var bundleId: String
 
     @Published var maxBolus: HKQuantity
     @Published var maxCarbs: HKQuantity
@@ -32,13 +29,10 @@ class RemoteSettingsViewModel: ObservableObject {
     init() {
         self.remoteType = storage.remoteType.value
         self.user = storage.user.value
-        self.deviceToken = storage.deviceToken.value
         self.sharedSecret = storage.sharedSecret.value
-        self.productionEnvironment = storage.productionEnvironment.value
         self.apnsKey = storage.apnsKey.value
         self.teamId = storage.teamId.value
         self.keyId = storage.keyId.value
-        self.bundleId = storage.bundleId.value
         self.maxBolus = storage.maxBolus.value
         self.maxCarbs = storage.maxCarbs.value
         self.maxProtein = storage.maxProtein.value
@@ -56,18 +50,10 @@ class RemoteSettingsViewModel: ObservableObject {
             .sink { [weak self] in self?.storage.user.value = $0 }
             .store(in: &cancellables)
 
-        $deviceToken
-            .sink { [weak self] in self?.storage.deviceToken.value = $0 }
-            .store(in: &cancellables)
-
         $sharedSecret
             .sink { [weak self] in self?.storage.sharedSecret.value = $0 }
             .store(in: &cancellables)
 
-        $productionEnvironment
-            .sink { [weak self] in self?.storage.productionEnvironment.value = $0 }
-            .store(in: &cancellables)
-
         $apnsKey
             .sink { [weak self] in self?.storage.apnsKey.value = $0 }
             .store(in: &cancellables)
@@ -80,10 +66,6 @@ class RemoteSettingsViewModel: ObservableObject {
             .sink { [weak self] in self?.storage.keyId.value = $0 }
             .store(in: &cancellables)
 
-        $bundleId
-            .sink { [weak self] in self?.storage.bundleId.value = $0 }
-            .store(in: &cancellables)
-
         $maxBolus
             .sink { [weak self] in self?.storage.maxBolus.value = $0 }
             .store(in: &cancellables)