Set the account state after E2EE is setup in the GUI
authorKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 8 Dec 2020 16:09:24 +0000 (17:09 +0100)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Tue, 15 Dec 2020 09:59:24 +0000 (10:59 +0100)
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 <kevin.ottens@nextcloud.com>
src/gui/accountsettings.cpp

index d6cc97e25b7d07d0cec583d1ac14397066acdbee..59e01683132c81edb419fdb12dac2158861e3ffb 100644 (file)
@@ -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();
 }