Skip to content

fix: removes listeners when app is reloaded on ios #1878

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
fadi-george merged 3 commits into from
Dec 10, 2025
Merged

fix: removes listeners when app is reloaded on ios #1878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bee391
add same current instance logic for ios event emitter
fadi-george Dec 10, 2025
adc2006
fix formatting
fadi-george Dec 10, 2025
a97f119
clean up remove handlers logic
fadi-george Dec 10, 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
27 changes: 15 additions & 12 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 @@ -178,19 +178,22 @@ private void removeObservers() {
}

private void removeHandlers() {
if (!oneSignalInitDone) {
Logging.debug("OneSignal React-Native SDK not initialized yet. Could not remove handlers.", null);
return;
if (hasAddedInAppMessageClickListener) {
OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
hasAddedInAppMessageClickListener = false;
}
if (hasAddedInAppMessageLifecycleListener) {
OneSignal.getInAppMessages().removeLifecycleListener(rnInAppLifecycleListener);
hasAddedInAppMessageLifecycleListener = false;
}
if (hasAddedNotificationClickListener) {
OneSignal.getNotifications().removeClickListener(rnNotificationClickListener);
hasAddedNotificationClickListener = false;
}
if (hasAddedNotificationForegroundListener) {
OneSignal.getNotifications().removeForegroundLifecycleListener(this);
hasAddedNotificationForegroundListener = false;
}

OneSignal.getInAppMessages().removeClickListener(rnInAppClickListener);
hasAddedInAppMessageClickListener = false;
OneSignal.getInAppMessages().removeLifecycleListener(rnInAppLifecycleListener);
hasAddedInAppMessageLifecycleListener = false;
OneSignal.getNotifications().removeClickListener(rnNotificationClickListener);
hasAddedNotificationClickListener = false;
OneSignal.getNotifications().removeForegroundLifecycleListener(this);
hasAddedNotificationForegroundListener = false;
}

private void sendEvent(String eventName, Object params) {
Expand Down
44 changes: 44 additions & 0 deletions ios/RCTOneSignal/RCTOneSignalEventEmitter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ @implementation RCTOneSignalEventEmitter {
}

static BOOL _didStartObserving = false;
// Static reference to track current instance for cleanup on reload
static RCTOneSignalEventEmitter *_currentInstance = nil;

+ (BOOL)hasSetBridge {
return _didStartObserving;
Expand Down Expand Up @@ -48,6 +50,13 @@ - (instancetype)init {
selector:@selector(emitEvent:)
name:eventName
object:nil];

// Clean up previous instance if it exists (handles reload scenario)
if (_currentInstance != nil && _currentInstance != self) {
[_currentInstance removeHandlers];
[_currentInstance removeObservers];
}
_currentInstance = self;
}

return self;
Expand All @@ -64,6 +73,8 @@ - (void)startObserving {

- (void)stopObserving {
_hasListeners = false;
[self removeHandlers];
[self removeObservers];
}

- (NSArray<NSString *> *)supportedEvents {
Expand Down Expand Up @@ -584,4 +595,37 @@ + (void)sendEventWithName:(NSString *)name withBody:(NSDictionary *)body {
// iOS Stub
}

- (void)removeObservers {
[self removePermissionObserver];
[self removePushSubscriptionObserver];
[self removeUserStateObserver];
}

- (void)removeHandlers {
if (_hasAddedInAppMessageClickListener) {
[OneSignal.InAppMessages removeClickListener:[RCTOneSignal sharedInstance]];
_hasAddedInAppMessageClickListener = false;
}
if (_hasAddedInAppMessageLifecycleListener) {
[OneSignal.InAppMessages
removeLifecycleListener:[RCTOneSignal sharedInstance]];
_hasAddedInAppMessageLifecycleListener = false;
}
if (_hasAddedNotificationClickListener) {
[OneSignal.Notifications removeClickListener:[RCTOneSignal sharedInstance]];
_hasAddedNotificationClickListener = false;
}
if (_hasAddedNotificationForegroundLifecycleListener) {
[OneSignal.Notifications removeForegroundLifecycleListener:self];
_hasAddedNotificationForegroundLifecycleListener = false;
}
}

- (void)removeUserStateObserver {
if (_hasSetUserStateObserver) {
[OneSignal.User removeObserver:[RCTOneSignal sharedInstance]];
_hasSetUserStateObserver = false;
}
}

@end
Loading