chore: Bridge Quebec 3.1.3 changelog

fix(GODT-2616): Silence UID of order report
https://github.com/ProtonMail/gluon/pull/347
2023-05-09 11:36:35 +02:00 · 2023-05-08 10:27:37 +02:00 · 2023-05-08 09:40:53 +02:00 · 2023-04-26 14:00:45 +02:00 · 2023-04-25 13:06:58 +02:00 · 2023-04-25 11:36:21 +02:00
6 changed files with 31 additions and 4 deletions
--- a/Changelog.md
+++ b/Changelog.md
@ -2,6 +2,25 @@

 Changelog [format](http://keepachangelog.com/en/1.0.0/)

+## [Bridge 3.1.3] Quebec
+
+### Changed
+* GODT-2616: Silence UID of order report.
+* GODT-2614: Handle failed update during sync.
+
+
+## [Bridge 3.1.2] Quebec
+
+### Changed
+* GODT-2582 Dedup recovered messages folder.
+
+
+## [Bridge 3.1.1] Quebec
+
+### Fixed
+* GODT-2500: Fix handler passing.
+
+
 ## [Bridge 3.1.0] Quebec

 ### Changed
--- a/2
+++ b/2
@ -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.1.0+git
+BRIDGE_APP_VERSION?=3.1.3+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG
--- a/go.mod
+++ b/go.mod
@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557
 	github.com/Masterminds/semver/v3 v3.2.0
-	github.com/ProtonMail/gluon v0.15.1-0.20230406114115-7eae5cb3ec21
+	github.com/ProtonMail/gluon v0.15.1-0.20230508082626-2467e0b45ed9
 	github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/ProtonMail/go-proton-api v0.4.1-0.20230406143739-c7596e170799
 	github.com/ProtonMail/gopenpgp/v2 v2.5.2
--- a/go.sum
+++ b/go.sum
@ -28,8 +28,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.15.1-0.20230406114115-7eae5cb3ec21 h1:wucP8WmL9iT8TMw32HaUH0dcYFdNBNnQML5JJNy5yn4=
-github.com/ProtonMail/gluon v0.15.1-0.20230406114115-7eae5cb3ec21/go.mod h1:yA4hk6CJw0BMo+YL8Y3ckCYs5L20sysu9xseshwY3QI=
+github.com/ProtonMail/gluon v0.15.1-0.20230508082626-2467e0b45ed9 h1:UwxjrPVOgyLLSVFhnxkpXLItowNzGGacqwVCp01wn6E=
+github.com/ProtonMail/gluon v0.15.1-0.20230508082626-2467e0b45ed9/go.mod h1:yA4hk6CJw0BMo+YL8Y3ckCYs5L20sysu9xseshwY3QI=
 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-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo=
--- a/internal/user/events.go
+++ b/internal/user/events.go
@ -635,6 +635,10 @@ func (user *User) handleCreateMessageEvent(ctx context.Context, message proton.M
 			return nil, err
 		}

+		if update == nil {
+			return nil, nil
+		}
+
 		return []imap.Update{update}, nil
 	}, user.apiUserLock, user.apiAddrsLock, user.apiLabelsLock, user.updateChLock)
 }
--- a/internal/user/sync.go
+++ b/internal/user/sync.go
@ -610,6 +610,10 @@ func (user *User) syncMessages(
 	}, logging.Labels{"sync-stage": "flush"})

 	for flushUpdate := range flushUpdateCh {
+		if flushUpdate.err != nil {
+			return flushUpdate.err
+		}
+
 		if err := vault.SetLastMessageID(flushUpdate.messageID); err != nil {
 			return fmt.Errorf("failed to set last synced message ID: %w", err)
 		}
Author	SHA1	Message	Date
Jakub	71d7deb3b1	chore: Bridge Quebec 3.1.3 changelog	2023-05-09 11:36:35 +02:00
Leander Beernaert	5630b7d2e6	fix(GODT-2616): Silence UID of order report https://github.com/ProtonMail/gluon/pull/347	2023-05-08 10:27:37 +02:00
Leander Beernaert	2ee4893325	fix(GODT-2614): Handle failed update during sync The sync process was getting stuck since we never handled the case where the update to Gluon failed. This caused the flush stage to exist, but the sync process would continue until it eventually gets stuck due to lack of progress.	2023-05-08 09:40:53 +02:00
Jakub	2f7f898cee	fix(GODT-2582): fix hash for changed boundary.	2023-04-26 14:00:45 +02:00
Jakub	8d53ee855b	chore: Bridge Quebec 3.1.2 changelog	2023-04-25 13:06:58 +02:00
Leander Beernaert	ec0db47f32	fix(GODT-2582): Dedup recovered messages folder same code as: * https://github.com/ProtonMail/gluon/pull/338 * https://github.com/ProtonMail/gluon/pull/339	2023-04-25 11:36:21 +02:00
Leander Beernaert	6fcea2ad83	chore: Bridge Quebec 3.1.1 changelog	2023-04-11 14:31:39 +02:00
Leander Beernaert	098f294cac	fix(GODT-2573): Crash on null update Ensure that if we don't produce an update we don't construct an update array with nil values.	2023-04-11 10:36:26 +02:00