Skip to content

fix: Android prevent crash when cleaning up uninitialized SDK on destroy #1871

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

Merged
nan-li merged 2 commits into from
Dec 10, 2025
Merged

fix: Android prevent crash when cleaning up uninitialized SDK on destroy #1871

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba298b6
fix: prevent crash when cleaning up uninitialized SDK on destroy
nan-li Dec 5, 2025
c6f5770
don't catch and simplify methods
nan-li Dec 9, 2025
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
13 changes: 6 additions & 7 deletions android/src/main/java/com/onesignal/rnonesignalandroid/RNOneSignal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,15 @@ public void onClick(INotificationClickEvent event) {
};

private void removeObservers() {
if(!oneSignalInitDone) {
Copy link

@abdulraqeeb33 abdulraqeeb33 Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also can we try a test for this?

Logging.debug("OneSignal React-Native SDK not initialized yet. Could not remove observers.", null);
return;
}

this.removePermissionObserver();
this.removePushSubscriptionObserver();
this.removeUserStateObserver();
}

private void removeHandlers() {
if (hasAddedInAppMessageClickListener) {
OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
hasAddedInAppMessageClickListener = false;
Expand Down Expand Up @@ -212,7 +215,6 @@ public RNOneSignal(ReactApplicationContext reactContext) {

// Clean up previous instance if it exists (handles reload scenario)
if (currentInstance != null && currentInstance != this) {
currentInstance.removeHandlers();
currentInstance.removeObservers();
}
currentInstance = this;
Expand All @@ -226,7 +228,6 @@ public String getName() {

@Override
public void onHostDestroy() {
removeHandlers();
removeObservers();
}

Expand All @@ -238,7 +239,6 @@ public void onHostResume() {}

@Override
public void onCatalystInstanceDestroy() {
removeHandlers();
removeObservers();
Copy link

@abdulraqeeb33 abdulraqeeb33 Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same thing here.

}

Expand All @@ -254,15 +254,14 @@ public void initialize(String appId) {
return;
}

oneSignalInitDone = true;

if (context == null) {
// in some cases, especially when react-native-navigation is installed,
// the activity can be null, so we can initialize with the context instead
context = mReactApplicationContext.getApplicationContext();
}

OneSignal.initWithContext(context, appId);
oneSignalInitDone = true;
}

@ReactMethod
Expand Down
Loading