refactor: Make notification handling more consistent

* no need for async for handlePendingNotifications * proper name for the event handler * handlePendingNotifications() in iOS the same as Android
zulip · Mar 31, 2018 · b58ff87 · b58ff87
1 parent 339e0bd
commit b58ff87
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/utils/notifications.android.js b/src/utils/notifications.android.js
@@ -30,7 +30,7 @@ export const refreshNotificationToken = () => {
   NotificationsAndroid.refreshToken();
 };
 
-export const handlePendingNotifications = async (notificationData: Object, actions: Actions) => {
+export const handlePendingNotifications = (notificationData: Object, actions: Actions) => {
   if (!notificationData || !notificationData.getData) {
     return;
   }

diff --git a/src/utils/notifications.ios.js b/src/utils/notifications.ios.js
@@ -18,11 +18,11 @@ const onPushRegistered = async (
 };
 
 export const addNotificationListener = (notificationHandler: (notification: Object) => void) => {
-  NotificationsIOS.addEventListener('notification', notificationHandler);
+  NotificationsIOS.addEventListener('notificationOpened', notificationHandler);
 };
 
 export const removeNotificationListener = (notificationHandler: (notification: Object) => void) => {
-  NotificationsIOS.removeEventListener('notification', notificationHandler);
+  NotificationsIOS.removeEventListener('notificationOpened', notificationHandler);
 };
 
 export const initializeNotifications = (
@@ -40,17 +40,16 @@ export const initializeNotifications = (
 
 export const refreshNotificationToken = () => {};
 
-export const handlePendingNotifications = async (notificationData: Object, actions: Actions) => {
-  config.startup.notification = notificationData;
+export const handlePendingNotifications = (notificationData: Object, actions: Actions) => {
   if (!notificationData || !notificationData.getData) {
     return;
   }
 
   const data = notificationData.getData();
-  if (!data || !data.custom || !data.custom.data) {
-    return;
+  config.startup.notification = data;
+  if (data) {
+    actions.doNarrow(getNarrowFromNotificationData(data), data.zulip_message_id);
   }
-  actions.doNarrow(getNarrowFromNotificationData(data), data.zulip_message_id);
 };
 
 export const handleInitialNotification = async (actions: Actions) => {