Allow hyphens in device ids, for compatibility with gsconnect

albertvaka · albertvaka · commit 8fd173f2d682 · 2025-03-05T15:49:50.000+01:00
diff --git a/KDE Connect/KDE Connect/Swift Backend/DeviceInfo.swift b/KDE Connect/KDE Connect/Swift Backend/DeviceInfo.swift
@@ -61,7 +61,7 @@ class DeviceInfo: NSObject {
     }
 
     // swiftlint:disable:next force_try
-    private static let validDeviceIdRegex = try! NSRegularExpression(pattern: "^[a-zA-Z0-9_]{32,38}$")
+    private static let validDeviceIdRegex = try! NSRegularExpression(pattern: "^[a-zA-Z0-9_-]{32,38}$")
 
     static func isValidDeviceId(deviceId: String) -> Bool {
         let range = NSRange(location: 0, length: deviceId.utf16.count)

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ class DeviceInfo: NSObject {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// swiftlint:disable:next force_try`
`64`		`- private static let validDeviceIdRegex = try! NSRegularExpression(pattern: "^[a-zA-Z0-9_]{32,38}$")`
	`64`	`+ private static let validDeviceIdRegex = try! NSRegularExpression(pattern: "^[a-zA-Z0-9_-]{32,38}$")`
`65`	`65`
`66`	`66`	`static func isValidDeviceId(deviceId: String) -> Bool {`
`67`	`67`	`let range = NSRange(location: 0, length: deviceId.utf16.count)`