yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

GODT-1864: cache migration failure was not notified because of unnecessary reboot.

Browse Source
This commit is contained in:
Xavier Michelon
2022-09-20 16:25:36 +02:00
parent 0630edc626
commit 40fb9de15e
11 changed files with 816 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/frontend/bridge-gui/bridge-gui/QMLBackend.cpp
View File

@ -108,7 +108,7 @@ void QMLBackend::connectGrpcEvents()
connect(client, &GRPCClient::cacheCantMove, this, &QMLBackend::cacheCantMove);
connect(client, &GRPCClient::diskFull, this, &QMLBackend::diskFull);
connect(client, &GRPCClient::cacheLocationChangeSuccess, this, &QMLBackend::cacheLocationChangeSuccess);
connect(client, &GRPCClient::changeLocalCacheFinished, this, &QMLBackend::changeLocalCacheFinished);
connect(client, &GRPCClient::changeLocalCacheFinished, this, &QMLBackend::onChangeLocalCacheFinished);
// login events
connect(client, &GRPCClient::loginUsernamePasswordError, this, &QMLBackend::loginUsernamePasswordError);
@ -324,8 +324,6 @@ void QMLBackend::changePorts(int imapPort, int smtpPort)
//****************************************************************************************************************************************************
void QMLBackend::changeLocalCache(bool enable, QUrl const &path)
{
// if call succeed, app will restart. No need to emit a value change signal, because it will trigger a read-back via gRPC that will fail.
emit hideMainWindow();
app().grpc().changeLocalCache(enable, path);
}
@ -405,3 +403,14 @@ void QMLBackend::onVersionChanged()
emit releaseNotesLinkChanged(releaseNotesLink());
emit landingPageLinkChanged(landingPageLink());
}
//****************************************************************************************************************************************************
///
//****************************************************************************************************************************************************
void QMLBackend::onChangeLocalCacheFinished(bool willRestart)
{
if (willRestart)
emit hideMainWindow();
emit changeLocalCacheFinished();
}

1
internal/frontend/bridge-gui/bridge-gui/QMLBackend.h
View File

@ -169,6 +169,7 @@ public slots: // slot for signals received from QML -> To be forwarded to Bridge
app().grpc().reportBug(description, address, emailClient, includeLogs); } // _ func(description, address, emailClient string, includeLogs bool) `slot:"reportBug"`
void onResetFinished(); // _ func() `slot:"onResetFinished"`
void onVersionChanged(); // _ func() `slot:"onVersionChanged"`
void onChangeLocalCacheFinished(bool willRestart);
signals: // Signals received from the Go backend, to be forwarded to QML
void toggleAutostartFinished(); // _ func() `signal:"toggleAutostartFinished"`