Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
319 changes: 319 additions & 0 deletions .yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,319 @@
diff --git a/android/src/main/java/com/bleplx/BlePlxModule.java b/android/src/main/java/com/bleplx/BlePlxModule.java
index c73164058dd5eded7ecfc37aed6d7ef068695e74..6bdefe4f479cefc82bfc7f35f56a28ad4688891c 100644
--- a/android/src/main/java/com/bleplx/BlePlxModule.java
+++ b/android/src/main/java/com/bleplx/BlePlxModule.java
@@ -168,7 +168,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -187,7 +187,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -273,7 +273,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -296,7 +296,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -318,7 +318,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -338,7 +338,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -358,7 +358,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -422,7 +422,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -442,7 +442,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -461,7 +461,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -483,7 +483,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -503,7 +503,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}
promise.resolve(jsArray);
} catch (BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}

}
@@ -524,7 +524,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}
promise.resolve(jsCharacteristics);
} catch (BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

@@ -541,7 +541,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}
promise.resolve(jsCharacteristics);
} catch (BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

@@ -561,7 +561,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}
promise.resolve(jsDescriptors);
} catch (BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

@@ -580,7 +580,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}
promise.resolve(jsDescriptors);
} catch (BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

@@ -598,7 +598,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}
promise.resolve(jsDescriptors);
} catch (BleError error) {
- promise.reject(null, errorConverter.toJs(error));
+ promise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}

@@ -627,7 +627,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -654,7 +654,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -680,7 +680,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
});
}
@@ -706,7 +706,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -732,7 +732,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -757,7 +757,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -788,7 +788,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -818,7 +818,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -848,7 +848,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError error) {
- safePromise.reject(null, errorConverter.toJs(error));
+ safePromise.reject(error.errorCode.name(), errorConverter.toJs(error));
}
}
);
@@ -878,7 +878,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
}, new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
@@ -906,7 +906,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
@@ -932,7 +932,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
@@ -956,7 +956,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
});
}
@@ -988,7 +988,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
@@ -1019,7 +1019,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
@@ -1048,7 +1048,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
@@ -1075,7 +1075,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
new OnErrorCallback() {
@Override
public void onError(BleError bleError) {
- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
}
}
);
@@ -1101,7 +1101,7 @@ public class BlePlxModule extends ReactContextBaseJavaModule {
if(this.bleAdapter == null){
BleError bleError = new BleError(BleErrorCode.BluetoothManagerDestroyed, String.format("BleManager cannot call the %s function because BleManager has been destroyed", functionName), null);

- promise.reject(null, errorConverter.toJs(bleError));
+ promise.reject(bleError.errorCode.name(), errorConverter.toJs(bleError));
return false;
}

2 changes: 1 addition & 1 deletion packages/transport-native-bluetooth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"@trezor/transport": "workspace:*",
"react-native-ble-plx": "3.5.0"
"react-native-ble-plx": "patch:react-native-ble-plx@npm%3A3.5.0#~/.yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch"
},
"devDependencies": {
"@trezor/type-utils": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion suite-native/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
"react": "19.1.0",
"react-intl": "^7.1.11",
"react-native": "0.81.4",
"react-native-ble-plx": "3.5.0",
"react-native-ble-plx": "patch:react-native-ble-plx@npm%3A3.5.0#~/.yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch",
"react-native-edge-to-edge": "1.7.0",
"react-native-gesture-handler": "2.29.0",
"react-native-keyboard-controller": "1.19.2",
Expand Down
14 changes: 12 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11264,7 +11264,7 @@ __metadata:
react: "npm:19.1.0"
react-intl: "npm:^7.1.11"
react-native: "npm:0.81.4"
react-native-ble-plx: "npm:3.5.0"
react-native-ble-plx: "patch:react-native-ble-plx@npm%3A3.5.0#~/.yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch"
react-native-edge-to-edge: "npm:1.7.0"
react-native-gesture-handler: "npm:2.29.0"
react-native-get-random-values: "npm:^1.11.0"
Expand Down Expand Up @@ -14628,7 +14628,7 @@ __metadata:
dependencies:
"@trezor/transport": "workspace:*"
"@trezor/type-utils": "workspace:*"
react-native-ble-plx: "npm:3.5.0"
react-native-ble-plx: "patch:react-native-ble-plx@npm%3A3.5.0#~/.yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -38479,6 +38479,16 @@ __metadata:
languageName: node
linkType: hard

"react-native-ble-plx@patch:react-native-ble-plx@npm%3A3.5.0#~/.yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch":
version: 3.5.0
resolution: "react-native-ble-plx@patch:react-native-ble-plx@npm%3A3.5.0#~/.yarn/patches/react-native-ble-plx-npm-3.5.0-c98fd0ae25.patch::version=3.5.0&hash=196fdb"
peerDependencies:
react: "*"
react-native: "*"
checksum: 10/40e5ac41b1951ecdaafe052715ad46ef8a87cc746659362d2dd2254730c8a3a9fa41119fd346970a2f077873c3d0b16505dc42d16aa0af494c1f9494568fb077
languageName: node
linkType: hard

"react-native-edge-to-edge@npm:1.6.0":
version: 1.6.0
resolution: "react-native-edge-to-edge@npm:1.6.0"
Expand Down
Loading