Skip to content

fix(android): prevent crash when Promise.reject is called with null error code #1325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivannikcevicc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(android): prevent crash when Promise.reject is called with null error code #1325

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions android/src/main/java/com/bleplx/utils/SafePromise.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,35 @@ public void resolve(@Nullable Object value) {
}
}

public void reject(String code, String message) {
// Safe reject: ensures code is never null
public void reject(@Nullable String code, @Nullable String message) {
if (isFinished.compareAndSet(false, true)) {
promise.reject(code, message);
String safeCode = code != null ? code : "UNKNOWN_ERROR";
String safeMessage = message != null ? message : "No message provided";
promise.reject(safeCode, safeMessage);
}
}

public void reject(String code, Throwable e) {
public void reject(@Nullable String code, Throwable e) {
if (isFinished.compareAndSet(false, true)) {
promise.reject(code, e);
String safeCode = code != null ? code : "UNKNOWN_ERROR";
promise.reject(safeCode, e);
}
}

public void reject(String code, String message, Throwable e) {
public void reject(@Nullable String code, @Nullable String message, Throwable e) {
if (isFinished.compareAndSet(false, true)) {
promise.reject(code, message, e);
String safeCode = code != null ? code : "UNKNOWN_ERROR";
String safeMessage = message != null ? message : "No message provided";
promise.reject(safeCode, safeMessage, e);
}
}

@Deprecated
public void reject(String message) {
public void reject(@Nullable String message) {
if (isFinished.compareAndSet(false, true)) {
promise.reject(message);
String safeMessage = message != null ? message : "No message provided";
promise.reject(safeMessage);
}
}

Expand Down