Fix/665 watch app (openhab#666)

* remove deprecated files Signed-off-by: weak <[email protected]> * fix crash on watchOS Signed-off-by: weak <[email protected]>
DanielGlaas · Apr 11, 2022 · a134f78 · a134f78
1 parent 6755d40
commit a134f78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 156 deletions.
diff --git a/BuildTools/.swiftlint.yml b/BuildTools/.swiftlint.yml
@@ -31,7 +31,6 @@ excluded:
   - ../fastlane
   - ../BuildTools
   - ../OpenHABCore/.build
-  - ../openHABIntents/AutoGenerated
 
 nesting:
     type_level: 2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- Fix watch app (#665)
+
 ## [Version 2.4.46, Build 1580410506] - 2022-04-09Z
 
 - Fix intents (#657)

diff --git a/OpenHABCore/Sources/OpenHABCore/Util/ServerCertificateManager.swift b/OpenHABCore/Sources/OpenHABCore/Util/ServerCertificateManager.swift
@@ -66,7 +66,12 @@ public class ServerCertificateManager: ServerTrustManager, ServerTrustEvaluating
     }
 
     func getPersistensePath() -> URL {
+        #if os(watchOS)
+        let documentsDirectory = NSSearchPathForDirectoriesInDomains(.documentDirectory, .userDomainMask, true)[0]
+        return URL(fileURLWithPath: documentsDirectory).appendingPathComponent("trustedCertificates")
+        #else
         FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.es.spaphone.openhab")!.appendingPathComponent("trustedCertificates")
+        #endif
     }
 
     public func saveTrustedCertificates() {

diff --git a/openHABIntents/AutoGenerated/OpenHABOpenHABGetItemStateIntent.swift b/openHABIntents/AutoGenerated/OpenHABOpenHABGetItemStateIntent.swift