Safety methods

Snesnopic · May 27, 2024 · a94eee5 · a94eee5
1 parent 047e75d
commit a94eee5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/Morser/Model/VibrationEngine.swift b/Morser/Model/VibrationEngine.swift
@@ -144,6 +144,9 @@ class VibrationEngine: ObservableObject {
 
     // Function to stop reading Morse code
     func stopReading() {
+        #if os(watchOS)
+        WatchCommunicationManager.shared.sendStopRequest()
+        #endif
         morseCodeIndex = 0
         morseCodeString = ""
         vibrationTimer?.invalidate()

diff --git a/Morser/Model/WatchConnectivityProvider.swift b/Morser/Model/WatchConnectivityProvider.swift
@@ -50,17 +50,19 @@ class WatchConnectivityProvider: NSObject, ObservableObject, WCSessionDelegate {
     }
     @MainActor func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any] = [:]) {
         if let action = userInfo["action"] as? String, action == "vibrate", let message = userInfo["message"] as? String {
-            print("\(message)")
-            DispatchQueue.main.async {
-                if VibrationEngine.shared.engine == nil {
-                    do {
-                        VibrationEngine.shared.engine = try CHHapticEngine()
-                    } catch {
-                        print(error)
+            let maxDate = userInfo["maxDate"] as? Date
+            if maxDate! >= .now {
+                DispatchQueue.main.async {
+                    if VibrationEngine.shared.engine == nil {
+                        do {
+                            VibrationEngine.shared.engine = try CHHapticEngine()
+                        } catch {
+                            print(error)
+                        }
                     }
+                    VibrationEngine.shared.readMorseCode(morseCode: message.morseCode())
                 }
-                VibrationEngine.shared.readMorseCode(morseCode: message.morseCode())
-             }
+            }
         }
     }
 

diff --git a/MorserWatch Watch App/WatchCommunicationManager.swift b/MorserWatch Watch App/WatchCommunicationManager.swift
@@ -22,7 +22,11 @@ class WatchCommunicationManager: NSObject, WCSessionDelegate, ObservableObject {
     }
 
     func sendVibrationRequest(_ message: String) {
-        WCSession.default.transferUserInfo(["action": "vibrate", "message": message])
+        WCSession.default.transferUserInfo(["action": "vibrate", "message": message, "maxDate": Date.now.addingTimeInterval(3)])
+    }
+
+    func sendStopRequest() {
+        WCSession.default.transferUserInfo(["action": "stop"])
     }
     func session(_ session: WCSession, didReceiveUserInfo userInfo: [String: Any] = [:]) {
         print(userInfo)