Skip to content

fix for https://github.com/wix/react-native-notifications/issues/1071… #1075

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

Open
nhoffmann-fts wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −5
Open

fix for https://github.com/wix/react-native-notifications/issues/1071… #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions lib/android/app/src/main/java/com/wix/reactnativenotifications/fcm/FcmToken.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,24 @@ protected void refreshToken() {
}

protected void sendTokenToJS() {
final ReactInstanceManager instanceManager = ((ReactApplication) mAppContext).getReactNativeHost().getReactInstanceManager();
ReactContext reactContext = instanceManager.getCurrentReactContext();
ReactContext reactContext = null;

if (reactContext == null) {
// If the react context is not available, try to get the current context from the react host (RN0.76).
// Try New Architecture first (ReactHost) - available in RN 0.76+
try {
reactContext = ((ReactApplication) mAppContext).getReactHost().getCurrentReactContext();
} catch (NoSuchMethodError | RuntimeException e) {
// getReactHost() doesn't exist in older RN versions or throws in some cases
// Fall back to Old Architecture (ReactNativeHost)
}

if (reactContext == null) {
try {
final ReactInstanceManager instanceManager = ((ReactApplication) mAppContext).getReactNativeHost().getReactInstanceManager();
reactContext = instanceManager.getCurrentReactContext();
} catch (RuntimeException e) {
// getReactNativeHost() throws RuntimeException in New Architecture
// This is expected, we'll just continue with null reactContext
}
}
// Note: Cannot assume react-context exists cause this is an async dispatched service.
if (reactContext != null && reactContext.hasActiveReactInstance()) {
Expand Down
2 changes: 1 addition & 1 deletion react-native.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
ios: {},
android: {
sourceDir: './lib/android/app',
packageInstance: 'new RNNotificationsPackage(reactNativeHost.getApplication())',
packageInstance: 'new RNNotificationsPackage(getApplication())',
}
},
},
Expand Down