From: Kevin Ottens Date: Tue, 8 Dec 2020 16:09:24 +0000 (+0100) Subject: Set the account state after E2EE is setup in the GUI X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~21^2~468^2~30 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=596bfab6e13de192c7c09f38fe6540b2e7e022a4;p=nextcloud-desktop.git Set the account state after E2EE is setup in the GUI Otherwise we would not display the E2EE message if the account was connected before the creation of the settings dialog. This was likely caused by the delayed creation of the settings dialog. Signed-off-by: Kevin Ottens --- diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp index d6cc97e25..59e016831 100644 --- a/src/gui/accountsettings.cpp +++ b/src/gui/accountsettings.cpp @@ -192,14 +192,6 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) /*QColor color = palette().highlight().color(); _ui->quotaProgressBar->setStyleSheet(QString::fromLatin1(progressBarStyleC).arg(color.name()));*/ - _ui->connectLabel->setText(tr("No account configured.")); - - connect(_accountState, &AccountState::stateChanged, this, &AccountSettings::slotAccountStateChanged); - slotAccountStateChanged(); - - connect(&_userInfo, &UserInfo::quotaUpdated, - this, &AccountSettings::slotUpdateQuota); - // Connect E2E stuff connect(this, &AccountSettings::requestMnemonic, _accountState->account()->e2e(), &ClientSideEncryption::slotRequestMnemonic); connect(_accountState->account()->e2e(), &ClientSideEncryption::showMnemonic, this, &AccountSettings::slotShowMnemonic); @@ -216,6 +208,14 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent) _ui->encryptionMessage->hide(); } + _ui->connectLabel->setText(tr("No account configured.")); + + connect(_accountState, &AccountState::stateChanged, this, &AccountSettings::slotAccountStateChanged); + slotAccountStateChanged(); + + connect(&_userInfo, &UserInfo::quotaUpdated, + this, &AccountSettings::slotUpdateQuota); + customizeStyle(); }