diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java index 765c60716..257cb0d51 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java @@ -43,8 +43,8 @@ public class AccessibilityInfoModule extends ReactContextBaseJavaModule public AccessibilityInfoModule(ReactApplicationContext context) { super(context); - mAccessibilityManager = (AccessibilityManager) getReactApplicationContext() - .getSystemService(Context.ACCESSIBILITY_SERVICE); + Context appContext = context.getApplicationContext(); + mAccessibilityManager = (AccessibilityManager) appContext.getSystemService(Context.ACCESSIBILITY_SERVICE); mEnabled = mAccessibilityManager.isTouchExplorationEnabled(); if (Build.VERSION.SDK_INT >= 19) { mTouchExplorationStateChangeListener = new ReactTouchExplorationStateChangeListener(); @@ -92,6 +92,12 @@ public class AccessibilityInfoModule extends ReactContextBaseJavaModule updateAndSendChangeEvent(mAccessibilityManager.isTouchExplorationEnabled()); } + @Override + public void onCatalystInstanceDestroy() { + super.onCatalystInstanceDestroy(); + getReactApplicationContext().removeLifecycleEventListener(this); + } + @Override public void onHostDestroy() { }