review comments

protocol/messenger.go

@@ -3639,6 +3639,30 @@ func (m *Messenger) handleRetrievedMessages(chatWithMessages map[transport.Filte
 	return m.saveDataAndPrepareResponse(messageState)
 }
 
+func (m *Messenger) deleteNotification(response *MessengerResponse, installationID string) error {
+	notification, err := m.persistence.GetActivityCenterNotificationByID(types.FromHex(installationID))
+	if err != nil {
+		return err
+	}
+
+	if notification != nil {
+		updatedAt := m.GetCurrentTimeInMillis()
+		notification.UpdatedAt = updatedAt
+		notification.Deleted = true
+		// we shouldn't sync deleted notification here,
+		// as the same user on different devices will receive the same message(CommunityCancelRequestToJoin) ?
+		err = m.persistence.DeleteActivityCenterNotificationByID(types.FromHex(installationID), updatedAt)
+		if err != nil {
+			m.logger.Error("failed to delete notification from Activity Center", zap.Error(err))
+			return err
+		}
+
+		// sending signal to client to remove the activity center notification from UI
+		response.AddActivityCenterNotification(notification)
+	}
+	return nil
+}
+
 func (m *Messenger) saveDataAndPrepareResponse(messageState *ReceivedMessageState) (*MessengerResponse, error) {
 	var err error
 	var contactsToSave []*Contact
@@ -3679,44 +3703,27 @@ func (m *Messenger) saveDataAndPrepareResponse(messageState *ReceivedMessageStat
 		}
 
 		if installation.Enabled {
-			// // Delete AC notif since the installation is now enabled
-			notification, err := m.persistence.GetActivityCenterNotificationByID(types.FromHex(id))
+			// Delete AC notif since the installation is now enabled
+			err = m.deleteNotification(messageState.Response, id)
 			if err != nil {
+				m.logger.Error("error deleting notification", zap.Error(err))
 				return false
 			}
-
-			if notification != nil {
-				updatedAt := m.GetCurrentTimeInMillis()
-				notification.UpdatedAt = updatedAt
-				notification.Deleted = true
-				// we shouldn't sync deleted notification here,
-				// as the same user on different devices will receive the same message(CommunityCancelRequestToJoin) ?
-				err = m.persistence.DeleteActivityCenterNotificationByID(types.FromHex(id), updatedAt)
-				if err != nil {
-					m.logger.Error("failed to delete notification from Activity Center", zap.Error(err))
-					return false
-				}
-
-				// sending signal to client to remove the activity center notification from UI
-				messageState.Response.AddActivityCenterNotification(notification)
-			}
-		} else {
+		} else if id != m.installationID {
 			// Add activity center notification when we receive a new installation
-			if id != m.installationID {
-				notification := &ActivityCenterNotification{
-					ID:             types.FromHex(id),
-					Type:           ActivityCenterNotificationTypeNewInstallationReceived,
-					InstallationID: id,
-					Timestamp:      m.getTimesource().GetCurrentTime(),
-					Read:           false,
-					Deleted:        false,
-					UpdatedAt:      m.GetCurrentTimeInMillis(),
-				}
+			notification := &ActivityCenterNotification{
+				ID:             types.FromHex(id),
+				Type:           ActivityCenterNotificationTypeNewInstallationReceived,
+				InstallationID: id,
+				Timestamp:      m.getTimesource().GetCurrentTime(),
+				Read:           false,
+				Deleted:        false,
+				UpdatedAt:      m.GetCurrentTimeInMillis(),
+			}
 
-				err = m.addActivityCenterNotification(messageState.Response, notification, nil)
-				if err != nil {
-					return false
-				}
+			err = m.addActivityCenterNotification(messageState.Response, notification, nil)
+			if err != nil {
+				return false
 			}
 		}
 

protocol/messenger_pairing_and_syncing.go

@@ -35,26 +35,11 @@ func (m *Messenger) EnableInstallationAndSync(request *requests.EnableInstallati
 	}
 
 	// Delete AC notif
-	notification, err := m.persistence.GetActivityCenterNotificationByID(types.FromHex(request.InstallationID))
+	err = m.deleteNotification(response, request.InstallationID)
 	if err != nil {
 		return nil, err
 	}
 
-	if notification != nil {
-		updatedAt := m.GetCurrentTimeInMillis()
-		notification.UpdatedAt = updatedAt
-		notification.Deleted = true
-		// we shouldn't sync deleted notification here,
-		// as the same user on different devices will receive the same message(CommunityCancelRequestToJoin) ?
-		err = m.persistence.DeleteActivityCenterNotificationByID(types.FromHex(request.InstallationID), updatedAt)
-		if err != nil {
-			m.logger.Error("failed to delete notification from Activity Center", zap.Error(err))
-			return nil, err
-		}
-
-		// sending signal to client to remove the activity center notification from UI
-		response.AddActivityCenterNotification(notification)
-	}
 	return response, nil
 }