notif: Push dispatch down into code that really uses it.

There isn't any meaningful abstraction boundary being drawn by hiding
`dispatch` from this code and passing it these applications of it
instead.  Simplify by just passing it `dispatch`, as we often do
elsewhere.

Probably what this is really saying is that this code all belongs on
the action-creator side; perhaps another time.

Author: gnprice

src/notification/index.js

@@ -8,6 +8,7 @@ import config from '../config';
 import { registerPush, unregisterPush } from '../api';
 import { logErrorRemotely } from '../utils/logging';
 import { doNarrow } from '../message/messagesActions';
+import { saveTokenPush, deleteTokenPush } from './notificationActions';
 
 const getGroupNarrowFromNotificationData = (data: NotificationGroup, usersById: UserIdMap = {}) => {
   const userIds = data.pm_users.split(',');
@@ -98,58 +99,50 @@ export class NotificationListener {
   }
 }
 
-const getTokenIOS = (auth: Auth, saveTokenPush: (pushToken: string) => void) => {
+const getTokenIOS = (auth: Auth, dispatch: Dispatch) => {
   NotificationsIOS.addEventListener('remoteNotificationsRegistered', async deviceToken => {
     await registerPush(auth, deviceToken);
-    saveTokenPush(deviceToken);
+    dispatch(saveTokenPush(deviceToken));
   });
   NotificationsIOS.addEventListener('remoteNotificationsRegistrationFailed', (error: string) => {
     logErrorRemotely(new Error(error), 'Failed to register iOS push token');
   });
   NotificationsIOS.requestPermissions();
 };
 
-const getTokenAndroid = (
-  auth: Auth,
-  oldToken: string | null,
-  saveTokenPush: (pushToken: string) => void,
-) => {
+const getTokenAndroid = (auth: Auth, oldToken: string | null, dispatch: Dispatch) => {
   if (auth.apiKey !== '' && oldToken === null) {
     NotificationsAndroid.refreshToken();
   }
   NotificationsAndroid.setRegistrationTokenUpdateListener(async deviceToken => {
     try {
       await registerPush(auth, deviceToken);
-      saveTokenPush(deviceToken);
+      dispatch(saveTokenPush(deviceToken));
     } catch (e) {
       logErrorRemotely(e, 'Failed to register GCM');
     }
   });
 };
 
-export const getNotificationToken = (
-  auth: Auth,
-  oldToken: string | null,
-  saveTokenPush: (pushToken: string) => void,
-) => {
+export const getNotificationToken = (auth: Auth, oldToken: string | null, dispatch: Dispatch) => {
   if (Platform.OS === 'ios') {
-    getTokenIOS(auth, saveTokenPush);
+    getTokenIOS(auth, dispatch);
   } else {
-    getTokenAndroid(auth, oldToken, saveTokenPush);
+    getTokenAndroid(auth, oldToken, dispatch);
   }
 };
 
 export const tryStopNotifications = async (
   auth: Auth,
   token: string | null,
-  callback: () => void,
+  dispatch: Dispatch,
 ) => {
   if (token !== null) {
     try {
       await unregisterPush(auth, token);
     } catch (e) {
       logErrorRemotely(e, 'failed to unregister Push token');
     }
-    callback();
+    dispatch(deleteTokenPush());
   }
 };

src/notification/notificationActions.js

@@ -19,15 +19,11 @@ export const saveTokenPush = (pushToken: string): SaveTokenPushAction => ({
 export const initNotifications = () => (dispatch: Dispatch, getState: GetState) => {
   const auth = getAuth(getState());
   const pushToken = getPushToken(getState());
-  getNotificationToken(auth, pushToken, token => {
-    dispatch(saveTokenPush(token));
-  });
+  getNotificationToken(auth, pushToken, dispatch);
 };
 
 export const tryStopNotifications = () => async (dispatch: Dispatch, getState: GetState) => {
   const auth = getAuth(getState());
   const pushToken = getPushToken(getState());
-  innerStopNotifications(auth, pushToken, () => {
-    dispatch(deleteTokenPush());
-  });
+  innerStopNotifications(auth, pushToken, dispatch);
 };