fix(mobile): fix ledger on android (#837)

tonkeeper · May 9, 2024 · 484bb5a · 484bb5a
1 parent c268e96
commit 484bb5a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/packages/mobile/src/ledger/useBluetoothAvailable.ts b/packages/mobile/src/ledger/useBluetoothAvailable.ts
@@ -4,6 +4,7 @@ import {
   showBluetoothPoweredOffAlert,
 } from '$utils/bluetoothPermissions';
 import TransportBLE from '@ledgerhq/react-native-hw-transport-ble';
+import { delay } from '@tonkeeper/core';
 import { isIOS } from '@tonkeeper/uikit';
 import { useEffect, useState } from 'react';
 import { Observable } from 'rxjs';
@@ -14,20 +15,30 @@ export const useBluetoothAvailable = () => {
   useEffect(() => {
     const subscription = new Observable(TransportBLE.observeState).subscribe({
       next: async (event) => {
-        setAvailable(event.available);
-
         if (event.type === 'Unauthorized') {
           console.log('Bluetooth Unauthorized');
           if (isIOS) {
             showBluetoothPermissionsAlert();
-          } else {
-            await checkAndRequestAndroidBluetooth();
           }
         }
         if (event.type === 'PoweredOff') {
           console.log('Bluetooth Powered Off');
           showBluetoothPoweredOffAlert();
         }
+
+        if (event.type === 'PoweredOn') {
+          if (isIOS) {
+            setAvailable(event.available);
+          } else {
+            try {
+              await delay(1000);
+              const granted = await checkAndRequestAndroidBluetooth();
+              setAvailable(granted);
+            } catch {
+              setAvailable(false);
+            }
+          }
+        }
       },
       complete: () => {},
       error: () => {},

diff --git a/patches/react-native-ble-plx+2.0.3.patch b/patches/react-native-ble-plx+2.0.3.patch
@@ -0,0 +1,21 @@
+diff --git a/node_modules/react-native-ble-plx/android/src/main/java/com/polidea/reactnativeble/BleClientManager.java b/node_modules/react-native-ble-plx/android/src/main/java/com/polidea/reactnativeble/BleClientManager.java
+index 48f946d..d97919d 100644
+--- a/node_modules/react-native-ble-plx/android/src/main/java/com/polidea/reactnativeble/BleClientManager.java
++++ b/node_modules/react-native-ble-plx/android/src/main/java/com/polidea/reactnativeble/BleClientManager.java
+@@ -925,6 +925,16 @@ public class BleClientManager extends ReactContextBaseJavaModule {
+         );
+     }
+
++    @ReactMethod
++    public void addListener(String eventName) {
++      // Keep: Required for RN built in Event Emitter Calls.  
++    }
++
++    @ReactMethod
++    public void removeListeners(int count) {
++      // Keep: Required for RN built in Event Emitter Calls.
++    }
++
+     private void sendEvent(@NonNull Event event, @Nullable Object params) {
+         getReactApplicationContext()
+                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)