@@ -170,17 +170,6 @@ private void removeObservers() {
170170 return ;
171171 }
172172
173- this .removePermissionObserver ();
174- this .removePushSubscriptionObserver ();
175- this .removeUserStateObserver ();
176- }
177-
178- private void removeHandlers () {
179- if (!oneSignalInitDone ) {
180- Logging .debug ("OneSignal React-Native SDK not initialized yet. Could not remove handlers." , null );
181- return ;
182- }
183-
184173 OneSignal .getInAppMessages ().removeClickListener (rnInAppClickListener );
185174 hasAddedInAppMessageClickListener = false ;
186175 OneSignal .getInAppMessages ().removeLifecycleListener (rnInAppLifecycleListener );
@@ -189,6 +178,10 @@ private void removeHandlers() {
189178 hasAddedNotificationClickListener = false ;
190179 OneSignal .getNotifications ().removeForegroundLifecycleListener (this );
191180 hasAddedNotificationForegroundListener = false ;
181+
182+ this .removePermissionObserver ();
183+ this .removePushSubscriptionObserver ();
184+ this .removeUserStateObserver ();
192185 }
193186
194187 private void sendEvent (String eventName , Object params ) {
@@ -213,12 +206,7 @@ public String getName() {
213206
214207 @ Override
215208 public void onHostDestroy () {
216- try {
217- removeHandlers ();
218- removeObservers ();
219- } catch (Exception e ) {
220- Logging .debug ("OneSignal SDK not fully initialized. Could not remove handlers/observers: " + e .getMessage (), null );
221- }
209+ removeObservers ();
222210 }
223211
224212 @ Override
@@ -229,12 +217,7 @@ public void onHostResume() {}
229217
230218 @ Override
231219 public void onCatalystInstanceDestroy () {
232- try {
233- removeHandlers ();
234- removeObservers ();
235- } catch (Exception e ) {
236- Logging .debug ("OneSignal SDK not fully initialized. Could not remove handlers/observers: " + e .getMessage (), null );
237- }
220+ removeObservers ();
238221 }
239222
240223 // OneSignal namespace methods
0 commit comments