diff --git a/Changelog.md b/Changelog.md index dff90791..c40901d9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -10,6 +10,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ### Fixed * GODT-677 Windows IE: global import settings not fit in window. +* GODT-794 Congo fails to update to Danube * GODT-749 Don't force PGP/Inline when sending plaintext messages. * GODT-764 Fix deadlock in integration tests for Import-Export. * GODT-662 Do not resume paused transfer progress after dismissing cancel popup. diff --git a/internal/frontend/qml/GuiIE.qml b/internal/frontend/qml/GuiIE.qml index ff88d509..8c2409a1 100644 --- a/internal/frontend/qml/GuiIE.qml +++ b/internal/frontend/qml/GuiIE.qml @@ -276,6 +276,10 @@ Item { winMain.dialogExport.hide() } } + + onUpdateFinished : { + winMain.dialogUpdate.finished(hasError) + } } function folderIcon(folderName, folderType) { // translations diff --git a/internal/updates/sync.go b/internal/updates/sync.go index 96572483..9bc55853 100644 --- a/internal/updates/sync.go +++ b/internal/updates/sync.go @@ -45,7 +45,7 @@ func syncFolders(localPath, updatePath string) (err error) { } func removeMissing(folderToCleanPath, itemsToKeepPath string) (err error) { - log.Debug("remove missing") + log.WithField("from", folderToCleanPath).Debug("Remove missing.") // Create list of files. existingRelPaths := map[string]bool{} err = filepath.Walk(itemsToKeepPath, func(keepThis string, _ os.FileInfo, walkErr error) error { @@ -56,7 +56,7 @@ func removeMissing(folderToCleanPath, itemsToKeepPath string) (err error) { if walkErr != nil { return walkErr } - log.Debug("path to keep ", relPath) + log.WithField("path", relPath).Trace("Keep the path.") existingRelPaths[relPath] = true return nil }) @@ -95,12 +95,18 @@ func removeMissing(folderToCleanPath, itemsToKeepPath string) (err error) { } func restoreFromBackup(backupDir, localPath string) { - log.Error("recovering from ", backupDir, " to ", localPath) - _ = copyRecursively(backupDir, localPath) + log.WithField("from", backupDir). + WithField("to", localPath). + Error("recovering") + if err := copyRecursively(backupDir, localPath); err != nil { + log.WithField("from", backupDir). + WithField("to", localPath). + Error("Not able to recover.") + } } func createBackup(srcFile, dstDir string) (err error) { - log.Debug("backup ", srcFile, " in ", dstDir) + log.WithField("from", srcFile).WithField("to", dstDir).Debug("Create backup") if err = mkdirAllClear(dstDir); err != nil { return } diff --git a/internal/updates/updates.go b/internal/updates/updates.go index cdd11fe6..6c63f99a 100644 --- a/internal/updates/updates.go +++ b/internal/updates/updates.go @@ -107,7 +107,7 @@ func NewImportExport(updateTempDir string) *Updates { versionFileBaseName: "current_version_ie", updateFileBaseName: "ie/ie_upgrade", linuxFileBaseName: "ie/protonmail-import-export-app", - macAppBundleName: "Import-Export app.app", + macAppBundleName: "ProtonMail Import-Export app.app", } } @@ -328,10 +328,15 @@ func (u *Updates) StartUpgrade(currentStatus chan<- Progress) { // nolint[funlen localPath = filepath.Dir(localPath) // .app updatePath := filepath.Join(u.updateTempDir, u.macAppBundleName) - log.Warn("localPath ", localPath) - log.Warn("updatePath ", updatePath) + log.WithField("local", localPath). + WithField("update", updatePath). + Info("Syncing folders..") status.Err = syncFolders(localPath, updatePath) if status.Err != nil { + log.WithField("from", localPath). + WithField("to", updatePath). + WithError(status.Err). + Error("Sync failed.") return } status.UpdateDescription(InfoRestartApp)