x

Author: zoom-ua

go/bind/keybase.go

@@ -288,6 +288,7 @@ func Init(homeDir, mobileSharedHome, logFile, runModeStr string,
 	kbCtx = libkb.NewGlobalContext()
 	kbCtx.Init()
 	kbCtx.SetProofServices(externals.NewProofServices(kbCtx))
+	kbCtx.AddLogoutHook(accountCacheLogoutHook{}, "notifications/accountCache")
 
 	var suffix string
 	if isIPad {

go/bind/notifications.go

@@ -31,6 +31,18 @@ var (
 	multipleAccountsCached *bool
 )
 
+// accountCacheLogoutHook implements libkb.LogoutHook. It clears the cached
+// result of hasMultipleLoggedInAccounts so that the next background
+// notification recomputes it against the post-logout account list.
+type accountCacheLogoutHook struct{}
+
+func (accountCacheLogoutHook) OnLogout(_ libkb.MetaContext) error {
+	multipleAccountsMtx.Lock()
+	multipleAccountsCached = nil
+	multipleAccountsMtx.Unlock()
+	return nil
+}
+
 func hasMultipleLoggedInAccounts(ctx context.Context) bool {
 	multipleAccountsMtx.Lock()
 	defer multipleAccountsMtx.Unlock()
@@ -260,8 +272,11 @@ func HandleBackgroundNotification(strConvID, body, serverMessageBody, sender str
 			// Return nil (not an error) so Android does not treat this as failure and show a fallback notification.
 			return nil
 		}
-		pusher.DisplayChatNotification(&chatNotification)
+		// Add to cache before displaying so that any concurrent goroutine that
+		// reaches the second check while DisplayChatNotification is running will
+		// see the entry and bail out rather than displaying a duplicate.
 		seenNotifications.Add(dupKey, struct{}{})
+		pusher.DisplayChatNotification(&chatNotification)
 		if len(pushID) > 0 {
 			mp.AckNotificationSuccess(ctx, []string{pushID})
 		}

shared/constants/platform-specific/push.native.tsx

@@ -205,11 +205,15 @@ export const initPushListener = () => {
 
   storeRegistry.getState('push').dispatch.initialPermissionsCheck()
 
-  // When current-user.uid changes, run pending push if it was for this account
+  // Second half of the account-switch-for-notification flow: when the uid
+  // changes (i.e. login completes after a switch initiated in handlePush in
+  // constants/push.native.tsx), replay the pending notification for the new
+  // account if it was addressed to them.
   storeRegistry.getStore('current-user').subscribe((s, old) => {
     if (s.uid === old.uid) return
     const pushState = storeRegistry.getState('push')
     const pending = pushState.pendingPushNotification
+    if (!pending) return
     const forUid = (pending as {forUid?: string}).forUid
     if (!forUid || forUid !== s.uid) return
     pushState.dispatch.clearPendingPushNotification()

shared/constants/push.desktop.tsx

@@ -15,6 +15,7 @@ export const usePushState = Z.createZustand<State>(() => {
     checkPermissions: async () => {
       return Promise.resolve(false)
     },
+    clearPendingPushNotification: () => {},
     deleteToken: () => {},
     handlePush: () => {},
     initialPermissionsCheck: () => {},

shared/constants/push.native.tsx

@@ -162,6 +162,10 @@ export const usePushState = Z.createZustand<State>((set, get) => {
                 logger.info('[Push] account has no stored secret, cannot switch')
                 return
               }
+              // Store the notification and trigger an account switch. We do NOT
+              // process the notification here — execution continues once the uid
+              // changes, picked up by the subscriber in
+              // constants/platform-specific/push.native.tsx (initPushListener).
               logger.info('[Push] switching to account for notification tap')
               set(s => {
                 s.pendingPushNotification = notification

shared/login/relogin/index.desktop.tsx

@@ -32,7 +32,7 @@ const Login = (props: Props) => {
   }
 
   const userRows = props.users
-    .concat({hasStoredSecret: false, username: other})
+    .concat({hasStoredSecret: false, uid: '', username: other})
     .map(u => <UserRow user={u.username} key={u.username} hasStoredSecret={u.hasStoredSecret} />)
 
   const selectedIdx = props.users.findIndex(u => u.username === props.selectedUser)