Skip to content

Commit 3948c99

Browse files
runway-github[bot]dawnseeker8
runway-github[bot]
and
dawnseeker8
authored
chore(runway): cherry-pick fix: fix app crash importing ledger cp-7.79.0 (#30664)
- fix: fix app crash importing ledger cp-7.79.0 (#30522) <!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until this PR meets the canonical Definition of Ready For Review in `docs/readme/ready-for-review.md`. In short: the template must be materially complete (not just section titles present), all status checks must be currently passing, and the only expected follow-up commits must be reviewer-driven. --> ## **Description** Patch react-native-ble-plx to guard against null reject codes in SafePromise.java. When BLE operations fail with a null error code, React Native's @nonnull promise reject path throws a native NullPointerException, crashing the app during Ledger connect or Select Account pagination on Android. Substitutes a stable fallback code (BleError) while preserving the existing error message payload. Fixes #30491 The proper fix will require update the react-native-ble-plx library in accounts repo. <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: Patch react-native-ble-plx to prevent nullPointerException throw from native code to crash the app. ## **Related issues** Fixes: #30491 ## **Manual testing steps** Test plan On Android (e.g. Samsung Galaxy S22, Android 16), add a hardware wallet account via Ledger Verify the app does not crash when connecting Ledger Verify pagination in the Select Account interface works without crashing Verify selecting an account completes successfully Smoke test other BLE flows (if applicable) to confirm no regressions ```gherkin Feature: my feature name Scenario: user [verb for user action] Given [describe expected initial app state] When user [verb for user action] Then [describe expected outcome] ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> ## **Pre-merge author checklist** <!-- Every checklist item must be consciously assessed before marking this PR as "Ready for review". A checked box means you deliberately considered that responsibility, not that you literally performed every action listed. Unchecked boxes are ambiguous: they are not an implicit "N/A" and they are not a silent "skip". See `docs/readme/ready-for-review.md` for the full checklist semantics. --> - [x] I've followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I've included tests if applicable - [x] I've documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I've applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. #### Performance checks (if applicable) - [x] I've tested on Android - Ideally on a mid-range device; emulator is acceptable - [x] I've tested with a power user scenario - Use these [power-user SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93) to import wallets with many accounts and tokens - [x] I've instrumented key operations with Sentry traces for production performance metrics - See [`trace()`](/app/util/trace.ts) for usage and [`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274) for an example For performance guidelines and tooling, see the [Performance Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers). ## **Pre-merge reviewer checklist** <!-- Reviewer checklist items follow the same semantics as the author checklist: an unchecked box is ambiguous, a checked box means the reviewer consciously assessed that responsibility. See `docs/readme/ready-for-review.md`. --> - [x] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [x] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > Small, localized native guard in a vendored BLE dependency; low blast radius beyond BLE error handling on Android. > > **Overview** > Adds a **Yarn patch** for `react-native-ble-plx@3.4.0` so Android no longer hard-crashes when BLE promise rejections use a **null** error code. > > The patch updates `SafePromise.java` to route all `reject` overloads through `safeCode()`, substituting **`BleError`** when the code is null while keeping the original message (and throwable) intact. **`package.json`** resolutions/dependencies and **`yarn.lock`** now resolve the dependency to the patched artifact instead of plain `3.4.0`. > > This targets Ledger connect / Select Account pagination failures on Android where React Native’s `@NonNull` reject path would otherwise throw a native `NullPointerException`. > > <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit c20f067. Bugbot is set up for automated code reviews on this repo. Configure [here](https://www.cursor.com/dashboard/bugbot).</sup> <!-- /CURSOR_SUMMARY --> [f48a706](f48a706) Co-authored-by: Xiaoming Wang <7315988+dawnseeker8@users.noreply.github.com>
1 parent f7bbb91 commit 3948c99

3 files changed

Lines changed: 63 additions & 3 deletions

File tree

‎.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
diff --git a/android/src/main/java/com/bleplx/utils/SafePromise.java b/android/src/main/java/com/bleplx/utils/SafePromise.java
2+
index 0203473c88dacf979340c324829871af83cf6d02..35c475e3c33cc882b1322ce6a9d811e6522269d2 100644
3+
--- a/android/src/main/java/com/bleplx/utils/SafePromise.java
4+
+++ b/android/src/main/java/com/bleplx/utils/SafePromise.java
5+
@@ -7,6 +7,21 @@ import java.util.concurrent.atomic.AtomicBoolean;
6+
import javax.annotation.Nullable;
7+
8+
public class SafePromise {
9+
+ /**
10+
+ * Fallback non-null reject code used when callers (e.g. BlePlxModule) pass
11+
+ * {@code null} as the code argument. React Native's PromiseImpl.reject is
12+
+ * annotated @NonNull on its code parameter; passing null triggers a
13+
+ * NullPointerException ("Parameter specified as non-null is null") on the
14+
+ * native modules thread, which crashes the host app. Substituting a stable
15+
+ * non-null string preserves the existing error-message payload (already
16+
+ * carried in the second argument) while keeping the reject path safe.
17+
+ */
18+
+ private static final String DEFAULT_REJECT_CODE = "BleError";
19+
+
20+
+ private static String safeCode(String code) {
21+
+ return code != null ? code : DEFAULT_REJECT_CODE;
22+
+ }
23+
+
24+
private Promise promise;
25+
private AtomicBoolean isFinished = new AtomicBoolean();
26+
27+
@@ -22,19 +37,19 @@ public class SafePromise {
28+
29+
public void reject(String code, String message) {
30+
if (isFinished.compareAndSet(false, true)) {
31+
- promise.reject(code, message);
32+
+ promise.reject(safeCode(code), message);
33+
}
34+
}
35+
36+
public void reject(String code, Throwable e) {
37+
if (isFinished.compareAndSet(false, true)) {
38+
- promise.reject(code, e);
39+
+ promise.reject(safeCode(code), e);
40+
}
41+
}
42+
43+
public void reject(String code, String message, Throwable e) {
44+
if (isFinished.compareAndSet(false, true)) {
45+
- promise.reject(code, message, e);
46+
+ promise.reject(safeCode(code), message, e);
47+
}
48+
}
49+

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@
218218
"@metamask/keyring-api@npm:^22.0.0": "23.1.0",
219219
"@metamask/bridge-status-controller@npm:^71.0.0": "patch:@metamask/bridge-status-controller@npm%3A71.1.0#~/.yarn/patches/@metamask-bridge-status-controller-npm-71.1.0-6140a0bdf3.patch",
220220
"react-native-quick-base64@npm:^2.0.5": "patch:react-native-quick-base64@npm%3A2.2.0#~/.yarn/patches/react-native-quick-base64-npm-2.2.0-9083eb316a.patch",
221-
"@metamask/permission-controller": "^13.1.1"
221+
"@metamask/permission-controller": "^13.1.1",
222+
"react-native-ble-plx@npm:3.4.0": "patch:react-native-ble-plx@npm%3A3.4.0#~/.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch"
222223
},
223224
"dependencies": {
224225
"@braze/react-native-sdk": "patch:@braze/react-native-sdk@npm%3A19.1.0#~/.yarn/patches/@braze-react-native-sdk-npm-19.1.0-076-reactmoduleinfo.patch",
@@ -472,7 +473,7 @@
472473
"react-native-aes-crypto-forked": "patch:react-native-aes-crypto-forked@https%3A//github.com/MetaMask/react-native-aes-crypto-forked.git%23397d5db5250e8e7408294807965b5b9fd4ca6a25#~/.yarn/patches/react-native-aes-crypto-forked-https-9ebec3d485.patch",
473474
"react-native-animatable": "^1.3.3",
474475
"react-native-background-timer": "2.1.1",
475-
"react-native-ble-plx": "3.4.0",
476+
"react-native-ble-plx": "patch:react-native-ble-plx@npm%3A3.4.0#~/.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch",
476477
"react-native-blob-util": "^0.19.9",
477478
"react-native-branch": "^5.6.2",
478479
"react-native-browser-polyfill": "0.1.2",

‎yarn.lock‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35558,7 +35558,7 @@ __metadata:
3555835558
react-native-aes-crypto-forked: "patch:react-native-aes-crypto-forked@https%3A//github.com/MetaMask/react-native-aes-crypto-forked.git%23397d5db5250e8e7408294807965b5b9fd4ca6a25#~/.yarn/patches/react-native-aes-crypto-forked-https-9ebec3d485.patch"
3555935559
react-native-animatable: "npm:^1.3.3"
3556035560
react-native-background-timer: "npm:2.1.1"
35561-
react-native-ble-plx: "npm:3.4.0"
35561+
react-native-ble-plx: "patch:react-native-ble-plx@npm%3A3.4.0#~/.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch"
3556235562
react-native-blob-util: "npm:^0.19.9"
3556335563
react-native-branch: "npm:^5.6.2"
3556435564
react-native-browser-polyfill: "npm:0.1.2"
@@ -39956,6 +39956,16 @@ __metadata:
3995639956
languageName: node
3995739957
linkType: hard
3995839958

39959+
"react-native-ble-plx@patch:react-native-ble-plx@npm%3A3.4.0#~/.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch":
39960+
version: 3.4.0
39961+
resolution: "react-native-ble-plx@patch:react-native-ble-plx@npm%3A3.4.0#~/.yarn/patches/react-native-ble-plx-npm-3.4.0-401e8b3343.patch::version=3.4.0&hash=9771b9"
39962+
peerDependencies:
39963+
react: "*"
39964+
react-native: "*"
39965+
checksum: 10/36cbf29185b6b397b1f07192f2c818264e0249c94e7f37dc2b46565aadc4b43b81c2bbc5c60fa3cece014846f297b2cb9baae04002de35f1ed0a1075b4d2cb07
39966+
languageName: node
39967+
linkType: hard
39968+
3995939969
"react-native-blob-util@npm:^0.19.9":
3996039970
version: 0.19.9
3996139971
resolution: "react-native-blob-util@npm:0.19.9"

0 commit comments

Comments
 (0)