@@ -180,9 +180,7 @@ private void removeObservers() {
180180 this .removePermissionObserver ();
181181 this .removePushSubscriptionObserver ();
182182 this .removeUserStateObserver ();
183- }
184183
185- private void removeHandlers () {
186184 if (hasAddedInAppMessageClickListener ) {
187185 OneSignal .getInAppMessages ().removeClickListener (rnInAppClickListener );
188186 hasAddedInAppMessageClickListener = false ;
@@ -217,7 +215,6 @@ public RNOneSignal(ReactApplicationContext reactContext) {
217215
218216 // Clean up previous instance if it exists (handles reload scenario)
219217 if (currentInstance != null && currentInstance != this ) {
220- currentInstance .removeHandlers ();
221218 currentInstance .removeObservers ();
222219 }
223220 currentInstance = this ;
@@ -231,12 +228,7 @@ public String getName() {
231228
232229 @ Override
233230 public void onHostDestroy () {
234- try {
235- removeHandlers ();
236- removeObservers ();
237- } catch (Exception e ) {
238- Logging .debug ("OneSignal SDK not fully initialized. Could not remove handlers/observers: " + e .getMessage (), null );
239- }
231+ removeObservers ();
240232 }
241233
242234 @ Override
@@ -247,12 +239,7 @@ public void onHostResume() {}
247239
248240 @ Override
249241 public void onCatalystInstanceDestroy () {
250- try {
251- removeHandlers ();
252- removeObservers ();
253- } catch (Exception e ) {
254- Logging .debug ("OneSignal SDK not fully initialized. Could not remove handlers/observers: " + e .getMessage (), null );
255- }
242+ removeObservers ();
256243 }
257244
258245 // OneSignal namespace methods
0 commit comments