GODT-1978: Don't install the same update twice

internal/bridge/bridge.go

@@ -73,9 +73,14 @@ type Bridge struct {
 
 	// updater is the bridge's updater.
 	updater   Updater
-	curVersion *semver.Version
 	installCh chan installJob
 
+	// curVersion is the current version of the bridge,
+	// newVersion is the version that was installed by the updater.
+	curVersion     *semver.Version
+	newVersion     *semver.Version
+	newVersionLock safe.RWMutex
+
 	// focusService is used to raise the bridge window when needed.
 	focusService *focus.Service
 
@@ -241,8 +246,11 @@ func newBridge(
 		imapEventCh: imapEventCh,
 
 		updater:   updater,
+		installCh: make(chan installJob),
+
 		curVersion:     curVersion,
-		installCh:  make(chan installJob, 1),
+		newVersion:     curVersion,
+		newVersionLock: safe.NewRWMutex(),
 
 		focusService: focusService,
 		autostarter:  autostarter,

internal/bridge/updates.go

@@ -21,6 +21,7 @@ import (
 	"context"
 
 	"github.com/ProtonMail/proton-bridge/v2/internal/events"
+	"github.com/ProtonMail/proton-bridge/v2/internal/safe"
 	"github.com/ProtonMail/proton-bridge/v2/internal/updater"
 	"github.com/sirupsen/logrus"
 )
@@ -86,14 +87,10 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) {
 		})
 
 	default:
+		safe.RLock(func() {
+			if version.Version.GreaterThan(bridge.newVersion) {
 				log.Info("An update is available")
 
-		bridge.publish(events.UpdateAvailable{
-			Version:    version,
-			Compatible: true,
-			Silent:     true,
-		})
-
 				select {
 				case bridge.installCh <- installJob{version: version, silent: true}:
 					log.Info("The update will be installed silently")
@@ -102,6 +99,8 @@ func (bridge *Bridge) handleUpdate(version updater.VersionInfo) {
 					log.Info("An update is already being installed")
 				}
 			}
+		}, bridge.newVersionLock)
+	}
 }
 
 type installJob struct {
@@ -110,12 +109,19 @@ type installJob struct {
 }
 
 func (bridge *Bridge) installUpdate(ctx context.Context, job installJob) {
+	safe.Lock(func() {
 		log := logrus.WithFields(logrus.Fields{
 			"version": job.version.Version,
 			"current": bridge.curVersion,
 			"channel": bridge.vault.GetUpdateChannel(),
 		})
 
+		bridge.publish(events.UpdateAvailable{
+			Version:    job.version,
+			Compatible: true,
+			Silent:     job.silent,
+		})
+
 		bridge.publish(events.UpdateInstalling{
 			Version: job.version,
 			Silent:  job.silent,
@@ -136,5 +142,8 @@ func (bridge *Bridge) installUpdate(ctx context.Context, job installJob) {
 				Version: job.version,
 				Silent:  job.silent,
 			})
+
+			bridge.newVersion = job.version.Version
 		}
+	}, bridge.newVersionLock)
 }

internal/events/update.go

@@ -109,5 +109,5 @@ type UpdateForced struct {
 }
 
 func (event UpdateForced) String() string {
-	return fmt.Sprintf("UpdateForced")
+	return "UpdateForced"
 }