Merge branch 'master' into RateLimiting

Author: bznein

CHANGELOG.md

@@ -9,6 +9,8 @@
 - Display the hide amount button by default and remove its settings
 - Linux: add support for Wayland
 - Fix the copy buttons in the Pocket order confirmation page
+- Android: handle device disconnect while the app is in the background
+- Improve send result view show relevant infos and options to make a new transaction or go back
 
 # 4.46.3
 - Fix camera access on linux

backend/backend.go

@@ -192,6 +192,8 @@ type Backend struct {
 
 	devices map[string]device.Interface
 
+	usbManager *usb.Manager
+
 	accountsAndKeystoreLock locker.Locker
 	accounts                AccountsList
 	// keystore is nil if no keystore is connected.
@@ -611,13 +613,14 @@ func (backend *Backend) OnDeviceUninit(f func(string)) {
 // Start starts the background services. It returns a channel of events to handle by the library
 // client.
 func (backend *Backend) Start() <-chan interface{} {
-	usb.NewManager(
+	backend.usbManager = usb.NewManager(
 		backend.arguments.MainDirectoryPath(),
 		backend.arguments.BitBox02DirectoryPath(),
 		backend.socksProxy,
 		backend.environment.DeviceInfos,
 		backend.Register,
-		backend.Deregister).Start()
+		backend.Deregister)
+	backend.usbManager.Start()
 
 	httpClient, err := backend.socksProxy.GetHTTPClient()
 	if err != nil {
@@ -637,6 +640,13 @@ func (backend *Backend) Start() <-chan interface{} {
 	return backend.events
 }
 
+// UsbUpdate triggers a scan of the USB devices to detect connects/disconnects.
+func (backend *Backend) UsbUpdate() {
+	if backend.usbManager != nil {
+		backend.usbManager.Update()
+	}
+}
+
 // DevicesRegistered returns a map of device IDs to device of registered devices.
 func (backend *Backend) DevicesRegistered() map[string]device.Interface {
 	return backend.devices

backend/bridgecommon/bridgecommon.go

@@ -359,3 +359,13 @@ func Shutdown() {
 		log.Info("Shutdown called, but backend not running")
 	}
 }
+
+// UsbUpdate wraps backend.UsbUpdate.
+func UsbUpdate() {
+	mu.RLock()
+	defer mu.RUnlock()
+	if globalBackend == nil {
+		return
+	}
+	globalBackend.UsbUpdate()
+}

backend/devices/usb/manager.go

@@ -86,6 +86,8 @@ type Manager struct {
 	onRegister   func(device.Interface) error
 	onUnregister func(string)
 
+	updateCh chan struct{}
+
 	socksProxy socksproxy.SocksProxy
 
 	log *logrus.Entry
@@ -111,6 +113,7 @@ func NewManager(
 		deviceInfos:       deviceInfos,
 		onRegister:        onRegister,
 		onUnregister:      onUnregister,
+		updateCh:          make(chan struct{}),
 		socksProxy:        socksProxy,
 
 		log: logging.Get().WithGroup("manager"),
@@ -255,8 +258,19 @@ func (manager *Manager) checkIfRemoved(deviceID string) bool {
 	return true
 }
 
+// Update triggers a scan of the USB devices to detect connects/disconnects.
+func (manager *Manager) Update() {
+	go func() {
+		manager.updateCh <- struct{}{}
+	}()
+}
+
 func (manager *Manager) listen() {
 	for {
+		select {
+		case <-manager.updateCh:
+		case <-time.After(time.Second):
+		}
 		for deviceID, device := range manager.devices {
 			// Check if device was removed.
 			if manager.checkIfRemoved(deviceID) {
@@ -310,11 +324,11 @@ func (manager *Manager) listen() {
 				manager.log.WithError(err).Error("Failed to execute on-register")
 			}
 		}
-		time.Sleep(time.Second)
 	}
 }
 
 // Start listens for inserted/removed devices forever.
 func (manager *Manager) Start() {
 	go manager.listen()
+	manager.Update()
 }

backend/mobileserver/mobileserver.go

@@ -155,6 +155,11 @@ func UsingMobileDataChanged() {
 	bridgecommon.UsingMobileDataChanged()
 }
 
+// UsbUpdate exposes `bridgecommon.UsbUpdate` to Java/Kotlin.
+func UsbUpdate() {
+	bridgecommon.UsbUpdate()
+}
+
 type goLogHook struct {
 }
 

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/GoService.java

@@ -5,12 +5,18 @@
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.os.Binder;
 import android.os.Build;
 import android.os.IBinder;
+import android.hardware.usb.UsbManager;
 
 import androidx.core.app.NotificationCompat;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.lifecycle.ViewModelStoreOwner;
 
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -31,6 +37,20 @@ public class GoService extends Service {
 
     private final int notificationId = 8;
 
+    private ViewModelStoreOwner viewModelStoreOwner;
+
+    private final BroadcastReceiver usbStateReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (viewModelStoreOwner != null && UsbManager.ACTION_USB_DEVICE_DETACHED.equals(action)) {
+                GoViewModel viewModel = new ViewModelProvider(viewModelStoreOwner).get(GoViewModel.class);
+                viewModel.setDevice(null);
+                Mobileserver.usbUpdate();
+            }
+        }
+    };
+
     @Override
     public void onCreate() {
         Util.log("GoService onCreate()");
@@ -68,12 +88,26 @@ public void onCreate() {
         // focus. This is needed to avoid timeouts when the backend is polling the BitBox for e.g.
         // an address verification.
         startForeground(notificationId, notification);
+
+        // Register USB broadcast receiver to detect USB disconnects, even while the app is in the
+        // background.
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            registerReceiver(usbStateReceiver, filter, Context.RECEIVER_EXPORTED);
+        } else {
+            registerReceiver(usbStateReceiver, filter);
+        }
+
         Util.log("GoService onCreate completed");
     }
 
     @Override
     public void onDestroy() {
         Util.log("GoService onDestroy()");
+        super.onDestroy();
+        unregisterReceiver(usbStateReceiver);
         // It would be nice to call MobileServer.shutdown() here, but that function
         // is currently incomplete and can lead to unpredictable results.
     }
@@ -98,6 +132,10 @@ GoService getService() {
         }
     }
 
+    public void setViewModelStoreOwner(ViewModelStoreOwner owner) {
+        this.viewModelStoreOwner = owner;
+    }
+
     @Override
     public IBinder onBind(Intent intent) {
         return binder;

frontends/android/BitBoxApp/app/src/main/java/ch/shiftcrypto/bitboxapp/MainActivity.java

@@ -88,6 +88,7 @@ public void onServiceConnected(ComponentName className,
                                        IBinder service) {
             GoService.GoServiceBinder binder = (GoService.GoServiceBinder) service;
             goService = binder.getService();
+            goService.setViewModelStoreOwner(MainActivity.this);
             Util.log("Bind connection completed!");
             startServer();
         }

frontends/android/BitBoxApp/build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.0'
+        classpath 'com.android.tools.build:gradle:8.8.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

frontends/android/BitBoxApp/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

frontends/ios/BitBoxApp/BitBoxApp.xcodeproj/project.pbxproj

@@ -15,6 +15,8 @@
 		D700B6032CA2FFAF000496D4 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D765160F2B1F3B1500DC03A9 /* Preview Assets.xcassets */; };
 		D700B6042CA2FFAF000496D4 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D765160C2B1F3B1500DC03A9 /* Assets.xcassets */; };
 		D700B6062CA2FFAF000496D4 /* Mobileserver.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D76518BB2B1F8F7400DC03A9 /* Mobileserver.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		D721B20D2D369EC100767080 /* Bluetooth.swift in Sources */ = {isa = PBXBuildFile; fileRef = D721B20C2D369EC100767080 /* Bluetooth.swift */; };
+		D721B20E2D36A00000767080 /* Bluetooth.swift in Sources */ = {isa = PBXBuildFile; fileRef = D721B20C2D369EC100767080 /* Bluetooth.swift */; };
 		D76516092B1F3B1300DC03A9 /* BitBoxAppApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = D76516082B1F3B1300DC03A9 /* BitBoxAppApp.swift */; };
 		D765160D2B1F3B1500DC03A9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D765160C2B1F3B1500DC03A9 /* Assets.xcassets */; };
 		D76516102B1F3B1500DC03A9 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D765160F2B1F3B1500DC03A9 /* Preview Assets.xcassets */; };
@@ -72,6 +74,7 @@
 		D700B5F82C888CB9000496D4 /* Config.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
 		D700B5F92C986A3C000496D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		D700B60A2CA2FFAF000496D4 /* BitBoxApp Testnet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BitBoxApp Testnet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		D721B20C2D369EC100767080 /* Bluetooth.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bluetooth.swift; sourceTree = "<group>"; };
 		D76516052B1F3B1300DC03A9 /* BitBoxApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BitBoxApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D76516082B1F3B1300DC03A9 /* BitBoxAppApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BitBoxAppApp.swift; sourceTree = "<group>"; };
 		D765160C2B1F3B1500DC03A9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -154,6 +157,7 @@
 				D76516322B1F3D1A00DC03A9 /* WebView.swift */,
 				D765160C2B1F3B1500DC03A9 /* Assets.xcassets */,
 				D765160E2B1F3B1500DC03A9 /* Preview Content */,
+				D721B20C2D369EC100767080 /* Bluetooth.swift */,
 			);
 			path = BitBoxApp;
 			sourceTree = "<group>";
@@ -396,6 +400,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D700B5FD2CA2FFAF000496D4 /* WebView.swift in Sources */,
+				D721B20E2D36A00000767080 /* Bluetooth.swift in Sources */,
 				D700B5FE2CA2FFAF000496D4 /* BitBoxAppApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -405,6 +410,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				D76516332B1F3D1B00DC03A9 /* WebView.swift in Sources */,
+				D721B20D2D369EC100767080 /* Bluetooth.swift in Sources */,
 				D76516092B1F3B1300DC03A9 /* BitBoxAppApp.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

frontends/ios/BitBoxApp/BitBoxApp/BitBoxAppApp.swift

@@ -39,28 +39,35 @@ protocol SetMessageHandlersProtocol {
 }
 
 class GoEnvironment: NSObject, MobileserverGoEnvironmentInterfaceProtocol, UIDocumentInteractionControllerDelegate {
+    private let bluetoothManager: BluetoothManager
+    
+    init(bluetoothManager: BluetoothManager) {
+        self.bluetoothManager = bluetoothManager
+    }
+    
     func getSaveFilename(_ fileName: String?) -> String {
         let tempDirectory = URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true)
         // fileName cannot be nil this is called by Go and Go strings cannot be nil/null.
         let fileURL = tempDirectory.appendingPathComponent(fileName!)
         return fileURL.path
     }
-
+    
     func auth() {
         authenticateUser { success in
             // TODO: enabling auth but entering wrong passcode does not remove auth screen
             MobileserverAuthResult(success)
         }
     }
-
+    
     func detectDarkTheme() -> Bool {
         return UIScreen.main.traitCollection.userInterfaceStyle == .dark
     }
-
+    
     func deviceInfo() -> MobileserverGoDeviceInfoInterfaceProtocol? {
-        // Return an instance conforming to GoserverGoDeviceInfoInterface
-        // Replace 'GoDeviceInfo' with your implementation
-        return nil
+        if !bluetoothManager.isConnected() {
+            return nil
+        }
+        return BluetoothDeviceInfo(bluetoothManager: bluetoothManager)
     }
 
     func nativeLocale() -> String {
@@ -143,6 +150,8 @@ class GoAPI: NSObject, MobileserverGoAPIInterfaceProtocol, SetMessageHandlersPro
 
 @main
 struct BitBoxAppApp: App {
+    @StateObject private var bluetoothManager = BluetoothManager()
+    
     var body: some Scene {
         WindowGroup {
             GridLayout(alignment: .leading) {
@@ -167,7 +176,7 @@ struct BitBoxAppApp: App {
         } catch {
             print("Could not create Application Support directory: \(error)")
         }
-        let goEnvironment = GoEnvironment()
+        let goEnvironment = GoEnvironment(bluetoothManager: bluetoothManager)
         #if TARGET_TESTNET
         let testnet = true;
         #else