dont sync chats with pending notifications (#2458)

* dont sync chats with pending notifications
* set accepted/dismissed notifications as read
* activate chat if message is sent from us

VERSION

@@ -1 +1 @@
-0.92.1
+0.92.2

protocol/activity_center_persistence.go

@@ -55,7 +55,7 @@ func (db sqlitePersistence) DeleteActivityCenterNotificationForMessage(chatID st
 		}
 
 		inVector := strings.Repeat("?, ", len(ids)-1) + "?"
-		query := "UPDATE activity_center_notifications SET dismissed = 1 WHERE id IN (" + inVector + ")" // nolint: gosec
+		query := "UPDATE activity_center_notifications SET read = 1, dismissed = 1 WHERE id IN (" + inVector + ")" // nolint: gosec
 		_, err = tx.Exec(query, idsArgs...)
 		return err
 	}
@@ -297,6 +297,15 @@ func (db sqlitePersistence) GetToProcessActivityCenterNotificationIds() ([][]byt
 	return db.runActivityCenterIDQuery("SELECT a.id FROM activity_center_notifications a WHERE NOT a.dismissed AND NOT a.accepted")
 }
 
+func (db sqlitePersistence) HasPendingNotificationsForChat(chatID string) (bool, error) {
+	rows, err := db.db.Query("SELECT 1 FROM activity_center_notifications a WHERE a.chat_id = ? NOT a.dismissed AND NOT a.accepted", chatID)
+	if err != nil {
+		return false, err
+	}
+
+	return rows.Next(), nil
+}
+
 func (db sqlitePersistence) GetActivityCenterNotificationsByID(ids []types.HexBytes) ([]*ActivityCenterNotification, error) {
 	idsArgs := make([]interface{}, 0, len(ids))
 	for _, id := range ids {
@@ -362,12 +371,12 @@ func (db sqlitePersistence) ActivityCenterNotifications(currCursor string, limit
 }
 
 func (db sqlitePersistence) DismissAllActivityCenterNotifications() error {
-	_, err := db.db.Exec(`UPDATE activity_center_notifications SET dismissed = 1 WHERE NOT dismissed AND NOT accepted`)
+	_, err := db.db.Exec(`UPDATE activity_center_notifications SET read = 1, dismissed = 1 WHERE NOT dismissed AND NOT accepted`)
 	return err
 }
 
 func (db sqlitePersistence) DismissAllActivityCenterNotificationsFromUser(userPublicKey string) error {
-	_, err := db.db.Exec(`UPDATE activity_center_notifications SET dismissed = 1 WHERE NOT dismissed AND NOT accepted AND author = ?`, userPublicKey)
+	_, err := db.db.Exec(`UPDATE activity_center_notifications SET read = 1, dismissed = 1 WHERE NOT dismissed AND NOT accepted AND author = ?`, userPublicKey)
 	return err
 }
 
@@ -379,7 +388,7 @@ func (db sqlitePersistence) DismissActivityCenterNotifications(ids []types.HexBy
 	}
 
 	inVector := strings.Repeat("?, ", len(ids)-1) + "?"
-	query := "UPDATE activity_center_notifications SET dismissed = 1 WHERE id IN (" + inVector + ")" // nolint: gosec
+	query := "UPDATE activity_center_notifications SET read = 1, dismissed = 1 WHERE id IN (" + inVector + ")" // nolint: gosec
 	_, err := db.db.Exec(query, idsArgs...)
 	return err
 
@@ -404,7 +413,7 @@ func (db sqlitePersistence) AcceptAllActivityCenterNotifications() ([]*ActivityC
 
 	_, notifications, err := db.buildActivityCenterQuery(tx, "", 0, nil, "", "", ActivityCenterNotificationNoType)
 
-	_, err = tx.Exec(`UPDATE activity_center_notifications SET accepted = 1 WHERE NOT accepted AND NOT dismissed`)
+	_, err = tx.Exec(`UPDATE activity_center_notifications SET read = 1, accepted = 1 WHERE NOT accepted AND NOT dismissed`)
 	if err != nil {
 		return nil, err
 	}
@@ -441,7 +450,7 @@ func (db sqlitePersistence) AcceptActivityCenterNotifications(ids []types.HexByt
 	}
 
 	inVector := strings.Repeat("?, ", len(ids)-1) + "?"
-	query := "UPDATE activity_center_notifications SET accepted = 1 WHERE id IN (" + inVector + ")" // nolint: gosec
+	query := "UPDATE activity_center_notifications SET read = 1, accepted = 1 WHERE id IN (" + inVector + ")" // nolint: gosec
 	_, err = tx.Exec(query, idsArgs...)
 	return notifications, err
 }
@@ -469,7 +478,7 @@ func (db sqlitePersistence) AcceptActivityCenterNotificationsForInvitesFromUser(
 		return nil, err
 	}
 
-	_, err = tx.Exec(`UPDATE activity_center_notifications SET accepted = 1 WHERE NOT accepted AND NOT dismissed AND author = ? AND notification_type = ?`, userPublicKey, ActivityCenterNotificationTypeNewPrivateGroupChat)
+	_, err = tx.Exec(`UPDATE activity_center_notifications SET read = 1, accepted = 1 WHERE NOT accepted AND NOT dismissed AND author = ? AND notification_type = ?`, userPublicKey, ActivityCenterNotificationTypeNewPrivateGroupChat)
 
 	if err != nil {
 		return nil, err

protocol/messenger.go

@@ -1894,14 +1894,19 @@ func (m *Messenger) leaveGroupChat(ctx context.Context, response *MessengerRespo
 		if err != nil {
 			return nil, err
 		}
-		_, err = m.dispatchMessage(ctx, common.RawMessage{
+
-			LocalChatID: chat.ID,
+		// shouldBeSynced is false if we got here because a synced client has already
-			Payload:     encodedMessage,
+		// sent the leave group message. In that case we don't need to send it again.
-			MessageType: protobuf.ApplicationMetadataMessage_MEMBERSHIP_UPDATE_MESSAGE,
+		if shouldBeSynced {
-			Recipients:  recipients,
+			_, err = m.dispatchMessage(ctx, common.RawMessage{
-		})
+				LocalChatID: chat.ID,
-		if err != nil {
+				Payload:     encodedMessage,
-			return nil, err
+				MessageType: protobuf.ApplicationMetadataMessage_MEMBERSHIP_UPDATE_MESSAGE,
+				Recipients:  recipients,
+			})
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		chat.updateChatFromGroupMembershipChanges(group)
@@ -2346,10 +2351,17 @@ func (m *Messenger) SyncDevices(ctx context.Context, ensName, photoPath string)
 		}
 
 		if (isPublicChat || chat.OneToOne() || chat.PrivateGroupChat()) && !chat.Active {
-			err := m.syncChatRemoving(ctx, chatID)
+			pending, err := m.persistence.HasPendingNotificationsForChat(chat.ID)
 			if err != nil {
 				return false
 			}
+
+			if !pending {
+				err = m.syncChatRemoving(ctx, chatID)
+				if err != nil {
+					return false
+				}
+			}
 		}
 
 		if (isPublicChat || chat.OneToOne() || chat.PrivateGroupChat() || chat.CommunityChat()) && chat.Active {

protocol/messenger_activity_center.go

@@ -121,6 +121,7 @@ func (m *Messenger) processAcceptedActivityCenterNotifications(ctx context.Conte
 	for i := range notifications {
 		ids[i] = notifications[i].ID
 		notifications[i].Accepted = true
+		notifications[i].Read = true
 	}
 
 	if sync {

protocol/messenger_handler.go

@@ -1209,6 +1209,8 @@ func (m *Messenger) matchChatEntity(chatEntity common.ChatEntity) (*Chat, error)
 
 			chat = CreateOneToOneChat(chatID[:8], pubKey, m.getTimesource())
 		}
+		// if we are the sender, the chat must be active
+		chat.Active = true
 		return chat, nil
 	case chatEntity.GetMessageType() == protobuf.MessageType_ONE_TO_ONE:
 		// It's an incoming private chatEntity. ChatID is calculated from the signature.