Merge branch 'timezone-fix' into release-v4.48.5

Author: benma

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## v4.48.5
+- Bundle BitBox02 firmware version v9.23.2
+- iOS: fix wrong timezone when confirming time on BitBox02 (it would always show the time in UTC)
+
 ## v4.48.4
 - macOS: fix potential USB communication issue with BitBox02 bootloaders <v1.1.2 and firmwares <v9.23.1
 

backend/mobileserver/Makefile

@@ -5,6 +5,6 @@ build-android:
 	# androidapi version should match minSdkVersion in frontends/android/BitBoxApp/app/build.gradle
 	ANDROID_HOME=${ANDROID_SDK_ROOT} gomobile bind -x -a -glflags="-mod=readonly" -ldflags="-s -w" -target android -androidapi 24 .
 build-ios:
-	gomobile bind -x -a -glflags="-mod=readonly" -ldflags="-s -w" -target ios,iossimulator .
+	gomobile bind -x -a -glflags="-mod=readonly" -tags="timetzdata" -ldflags="-s -w" -target ios,iossimulator .
 clean:
 	rm -f mobileserver.aar mobileserver-sources.jar

backend/mobileserver/fixtimezone_android.go

@@ -0,0 +1,42 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build android
+
+package mobileserver
+
+import (
+	"os/exec"
+	"strings"
+	"time"
+)
+
+// fixTimezone sets the local timezone on Android. This is a workaround to the bug that on Android,
+// time.Local is hard-coded to UTC. See https://github.com/golang/go/issues/20455.
+//
+// We need the correct timezone to be able to send the `time.Now().Zone()` offset to the BitBox02.
+// Without it, the BitBox02 will always display UTC time instad of local time.
+//
+// This fix is copied from https://github.com/golang/go/issues/20455#issuecomment-342287698.
+func fixTimezone() {
+	out, err := exec.Command("/system/bin/getprop", "persist.sys.timezone").Output()
+	if err != nil {
+		return
+	}
+	z, err := time.LoadLocation(strings.TrimSpace(string(out)))
+	if err != nil {
+		return
+	}
+	time.Local = z
+}

backend/mobileserver/fixtimezone_ios.go

@@ -0,0 +1,59 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build ios
+
+package mobileserver
+
+/*
+#cgo CFLAGS: -x objective-c
+#cgo LDFLAGS: -framework Foundation
+#import <Foundation/Foundation.h>
+const char* getSystemTimeZone() {
+    NSTimeZone *timeZone = [NSTimeZone systemTimeZone];
+    NSString *timeZoneName = [timeZone name];
+    return [timeZoneName UTF8String];
+}
+*/
+import "C"
+
+import (
+	"strings"
+	"time"
+)
+
+func getSystemTimeZone() string {
+	tz := C.getSystemTimeZone()
+	return C.GoString(tz)
+}
+
+// fixTimezone sets the local timezone on iOS. This is a workaround to the bug that on iOS,
+// time.Local is hard-coded to UTC. See https://github.com/golang/go/issues/20797.
+//
+// We need the correct timezone to be able to send the `time.Now().Zone()` offset to the BitBox02.
+// Without it, the BitBox02 will always display UTC time instead of local time.
+//
+// This fix is copied from https://github.com/anyproto/anytype-heart/pull/775/ (referenced in the
+// above issue).
+func fixTimezone() {
+	tzName := strings.TrimSpace(getSystemTimeZone())
+	if len(tzName) == 0 {
+		return
+	}
+	z, err := time.LoadLocation(tzName)
+	if err != nil {
+		return
+	}
+	time.Local = z
+}

backend/mobileserver/fixtimezone_skip.go

@@ -0,0 +1,19 @@
+// Copyright 2025 Shift Crypto AG
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//go:build !ios && !android
+
+package mobileserver
+
+func fixTimezone() {}

backend/mobileserver/mobileserver.go

@@ -17,11 +17,7 @@ package mobileserver
 import (
 	"io"
 	"log"
-	"os/exec"
-	"runtime"
-	"strings"
 	"sync"
-	"time"
 
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/bridgecommon"
 	"github.com/BitBoxSwiss/bitbox-wallet-app/backend/devices/usb"
@@ -34,29 +30,6 @@ var (
 	once sync.Once
 )
 
-// fixTimezone sets the local timezone on Android. This is a workaround to the bug that on Android,
-// time.Local is hard-coded to UTC. See https://github.com/golang/go/issues/20455.
-//
-// We need the correct timezone to be able to send the `time.Now().Zone()` offset to the BitBox02.
-// Without it, the BitBox02 will always display UTC time instad of local time.
-//
-// This fix is copied from https://github.com/golang/go/issues/20455#issuecomment-342287698.
-func fixTimezone() {
-	if runtime.GOOS != "android" {
-		// Only run the fix on Android.
-		return
-	}
-	out, err := exec.Command("/system/bin/getprop", "persist.sys.timezone").Output()
-	if err != nil {
-		return
-	}
-	z, err := time.LoadLocation(strings.TrimSpace(string(out)))
-	if err != nil {
-		return
-	}
-	time.Local = z
-}
-
 func init() {
 	fixTimezone()
 }