chore: Trift Bridge 3.4.2 changelog.

Migration of message flags was incomplete, leading to incorrect state
after migration.

https://github.com/ProtonMail/gluon/pull/388

Changelog.md

@@ -3,6 +3,20 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
+## Trift Bridge 3.4.2
+
+### Fixed
+* GODT-2902: Do not check for changed values. Related to GODT-2857.
+
+
+## Trift Bridge 3.4.1
+
+### Fixed
+* GODT-2859: Trigger user resync while updating from 3.4.0 to 3.4.1.
+* GODT-2833: Fix migration of message flags.
+* GODT-2759: Use examine rather than select for fetching.
+
+
 ## Trift Bridge 3.4.0
 
 ### Added

Makefile

@@ -11,7 +11,7 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=3.4.0+git
+BRIDGE_APP_VERSION?=3.4.2+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG

go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/ProtonMail/gluon v0.16.1-0.20230706110757-a9327fb18611
+	github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/ProtonMail/go-proton-api v0.4.1-0.20230727082922-9115b4750ec7
 	github.com/ProtonMail/gopenpgp/v2 v2.7.1-proton

go.sum

@@ -23,8 +23,8 @@ github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs
 github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo=
 github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk=
 github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g=
-github.com/ProtonMail/gluon v0.16.1-0.20230706110757-a9327fb18611 h1:QVydPr/+pgz5xihc2ujNNV+qnq3oTidIXvF0PgkcY6U=
+github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4 h1:Uq2v2NYEtlTaK2WTh9BMph2Kv51JxMgvTkd7CjGPYc8=
-github.com/ProtonMail/gluon v0.16.1-0.20230706110757-a9327fb18611/go.mod h1:Og5/Dz1MiGpCJn51XujZwxiLG7WzvvjE5PRpZBQmAHo=
+github.com/ProtonMail/gluon v0.16.1-0.20230901124123-075229a92cc4/go.mod h1:Og5/Dz1MiGpCJn51XujZwxiLG7WzvvjE5PRpZBQmAHo=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4=
 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4=
 github.com/ProtonMail/go-crypto v0.0.0-20230321155629-9a39f2531310/go.mod h1:8TI4H3IbrackdNgv+92dI+rhpCaLqM0IfpgCgenFvRE=

internal/bridge/debug.go

@@ -230,7 +230,7 @@ func (bridge *Bridge) DebugDownloadFailedMessages(
 }
 
 func clientGetMessageIDs(client *goimapclient.Client, mailbox string) (map[string]imap.FlagSet, error) {
-	status, err := client.Select(mailbox, false)
+	status, err := client.Select(mailbox, true)
 	if err != nil {
 		return nil, err
 	}

internal/bridge/migration.go

@@ -0,0 +1,55 @@
+// Copyright (c) 2023 Proton AG
+//
+// This file is part of Proton Mail Bridge.
+//
+// Proton Mail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Proton Mail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Proton Mail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package bridge
+
+import (
+	"strings"
+
+	"github.com/ProtonMail/gluon/reporter"
+	"github.com/ProtonMail/proton-bridge/v3/internal/vault"
+	"github.com/sirupsen/logrus"
+)
+
+func (bridge *Bridge) databaseResyncNeeded() bool {
+	if strings.HasPrefix(bridge.lastVersion.String(), "3.4.0") &&
+		strings.HasPrefix(bridge.curVersion.String(), "3.4.1") {
+		logrus.WithFields(logrus.Fields{
+			"lastVersion": bridge.lastVersion.String(),
+			"currVersion": bridge.curVersion.String(),
+		}).Warning("Database re-synchronisation needed")
+		return true
+	}
+	return false
+}
+
+func (bridge *Bridge) migrateUser(vault *vault.User) {
+	if bridge.databaseResyncNeeded() {
+		if err := bridge.reporter.ReportMessage("Database need to be re-sync for migration."); err != nil {
+			logrus.WithError(err).Error("Failed to report database re-sync for migration.")
+		}
+		if err := vault.ClearSyncStatus(); err != nil {
+			logrus.WithError(err).Error("Failed reset to SyncStatus.")
+			if err2 := bridge.reporter.ReportMessageWithContext("Failed to reset SyncStatus for Database migration.",
+				reporter.Context{
+					"error": err,
+				}); err2 != nil {
+				logrus.WithError(err2).Error("Failed to report reset SyncStatus error.")
+			}
+		}
+	}
+}

internal/bridge/user.go

@@ -524,6 +524,9 @@ func (bridge *Bridge) addUserWithVault(
 		return fmt.Errorf("failed to get Statistics directory: %w", err)
 	}
 
+	// re-set SyncStatus if database need to be re-synced for migration.
+	bridge.migrateUser(vault)
+
 	user, err := user.New(
 		ctx,
 		vault,