From db232d82f71b05f14f3cf61f0c9ca8fc88ba762e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?= Date: Tue, 4 Feb 2020 09:13:27 +0100 Subject: [PATCH] [expo-notifications] Smaller fixes (#6790) # Why, How Whilst preparing https://github.com/expo/expo/pull/6773 I noticed two commits that don't belong to that PR. So I created a separate one to make the other one simpler to review. # Test Plan Code compiles. --- .../expo/modules/notifications/tokens/PushTokenModule.java | 4 ++-- .../ios/EXNotifications/EXPushTokenModule.m | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/expo-notifications/android/src/main/java/expo/modules/notifications/tokens/PushTokenModule.java b/packages/expo-notifications/android/src/main/java/expo/modules/notifications/tokens/PushTokenModule.java index 10d39d5b5ac6a..147e4fc5cbccd 100644 --- a/packages/expo-notifications/android/src/main/java/expo/modules/notifications/tokens/PushTokenModule.java +++ b/packages/expo-notifications/android/src/main/java/expo/modules/notifications/tokens/PushTokenModule.java @@ -41,12 +41,12 @@ public String getName() { @Override public void onCreate(ModuleRegistry moduleRegistry) { + mEventEmitter = moduleRegistry.getModule(EventEmitter.class); + // Register the module as a listener in PushTokenManager singleton module. // Deregistration happens in onDestroy callback. mPushTokenManager = moduleRegistry.getSingletonModule("PushTokenManager", PushTokenManager.class); mPushTokenManager.addListener(this); - - mEventEmitter = moduleRegistry.getModule(EventEmitter.class); } @Override diff --git a/packages/expo-notifications/ios/EXNotifications/EXPushTokenModule.m b/packages/expo-notifications/ios/EXNotifications/EXPushTokenModule.m index ef7ca013f8e7e..43325a6390e33 100644 --- a/packages/expo-notifications/ios/EXNotifications/EXPushTokenModule.m +++ b/packages/expo-notifications/ios/EXNotifications/EXPushTokenModule.m @@ -5,7 +5,7 @@ #import -static const NSString *onDevicePushTokenEventName = @"onDevicePushToken"; +static NSString * const onDevicePushTokenEventName = @"onDevicePushToken"; @interface EXPushTokenModule () @@ -57,7 +57,7 @@ - (void)setModuleRegistry:(UMModuleRegistry *)moduleRegistry - (NSArray *)supportedEvents { - return @[(NSString *)onDevicePushTokenEventName]; + return @[onDevicePushTokenEventName]; } - (void)startObserving @@ -102,7 +102,7 @@ - (void)onDidRegisterWithDeviceToken:(NSData *)devicePushToken } if (_isBeingObserved) { - [_eventEmitter sendEventWithName:(NSString *)onDevicePushTokenEventName + [_eventEmitter sendEventWithName:onDevicePushTokenEventName body:@{ @"devicePushToken": stringToken }]; } }