Merge branch 'drop-v'

benma · benma · commit c59b9fc5e4a3 · 2025-05-12T12:06:41.000+02:00
diff --git a/frontends/ios/BitBoxApp/BitBoxApp/Bluetooth.swift b/frontends/ios/BitBoxApp/BitBoxApp/Bluetooth.swift
@@ -498,7 +498,10 @@ class BluetoothDeviceInfo: NSObject, MobileserverGoDeviceInfoInterfaceProtocol {
     }
 
     func serial() -> String {
-        return "v" + productInfo.version
+        // BitBox delivers the version with the `v` prefix, and adding it manually here can be
+        // dropped at some point. Only testing firmwares before the first release did not include
+        // the prefix.
+        return productInfo.version.hasPrefix("v") ? productInfo.version : "v" + productInfo.version
     }
 
     func usagePage() -> Int {

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,10 @@ class BluetoothDeviceInfo: NSObject, MobileserverGoDeviceInfoInterfaceProtocol {`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`func serial() -> String {`
`501`		`- return "v" + productInfo.version`
	`501`	+ // BitBox delivers the version with the `v` prefix, and adding it manually here can be
	`502`	`+ // dropped at some point. Only testing firmwares before the first release did not include`
	`503`	`+ // the prefix.`
	`504`	`+ return productInfo.version.hasPrefix("v") ? productInfo.version : "v" + productInfo.version`
`502`	`505`	`}`
`503`	`506`
`504`	`507`	`func usagePage() -> Int {`