Remove unnecessary changes.

Signed-off-by: alex-z <blackslayer4@gmail.com>
nextcloud · Oct 28, 2022 · fbe05e2 · fbe05e2
1 parent 0774af6
commit fbe05e2
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 55 deletions.
diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
@@ -253,41 +253,20 @@ void AccountSettings::slotE2eEncryptionMnemonicReady()
 
 void AccountSettings::slotE2eEncryptionGenerateKeys()
 {
-    if (_accountState->account()->e2e()->_publicKey.isNull()) {
-       // displayMnemonicLoadingDialog();
-    }
-    const auto foundEnableEncryptionActionIt = std::find_if(std::cbegin(_ui->encryptionMessage->actions()), std::cend(_ui->encryptionMessage->actions()), [](const QAction *action) {
-        return action->property(e2eUiActionIdKey).toString() == e2EeUiActionEnableEncryptionId;
-    });
-    if (foundEnableEncryptionActionIt != std::cend(_ui->encryptionMessage->actions())) {
-        (*foundEnableEncryptionActionIt)->setText(tr("Generating mnemonic..."));
-        (*foundEnableEncryptionActionIt)->setEnabled(false);
-    }
     connect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, &AccountSettings::slotE2eEncryptionInitializationFinished);
     _accountState->account()->setE2eEncryptionKeysGenerationAllowed(true);
     _accountState->account()->e2e()->initialize(_accountState->account());
 }
 
 void AccountSettings::slotE2eEncryptionInitializationFinished(bool isNewMnemonicGenerated)
 {
-    if (_mnemonicLoadingDialog) {
-        _mnemonicLoadingDialog->close();
-    }
     disconnect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, &AccountSettings::slotE2eEncryptionInitializationFinished);
     if (!_accountState->account()->e2e()->_mnemonic.isEmpty()) {
         removeActionFromEncryptionMessage(e2EeUiActionEnableEncryptionId);
         slotE2eEncryptionMnemonicReady();
         if (isNewMnemonicGenerated) {
             displayMnemonic(_accountState->account()->e2e()->_mnemonic);
         }
-    } else {
-        const auto foundEnableEncryptionActionIt = std::find_if(std::cbegin(_ui->encryptionMessage->actions()), std::cend(_ui->encryptionMessage->actions()), [](const QAction *action) {
-            return action->property(e2eUiActionIdKey).toString() == e2EeUiActionEnableEncryptionId;
-        });
-        if (foundEnableEncryptionActionIt != std::cend(_ui->encryptionMessage->actions())) {
-            (*foundEnableEncryptionActionIt)->setText(tr("Enable encryption"));
-            (*foundEnableEncryptionActionIt)->setEnabled(true);
-        }
     }
 }
 
@@ -1002,37 +981,6 @@ void AccountSettings::displayMnemonic(const QString &mnemonic)
     widget.exec();
 }
 
-void AccountSettings::displayMnemonicLoadingDialog()
-{
-    if (_mnemonicLoadingDialog) {
-        return;
-    }
-    _mnemonicLoadingDialog = new QDialog;
-    Ui_Dialog ui;
-    ui.setupUi(_mnemonicLoadingDialog);
-    _mnemonicLoadingDialog->setWindowTitle(tr("End-to-End encryption mnemonic"));
-    _mnemonicLoadingDialog->setAttribute(Qt::WA_DeleteOnClose);
-    if (auto buttonBox = _mnemonicLoadingDialog->findChild<QDialogButtonBox *>(QStringLiteral("buttonBox"))) {
-        buttonBox->clear();
-    }
-    ui.label->setText(
-        tr("To protect your Cryptographic Identity, we encrypt it with a mnemonic of 12 dictionary words. "
-           "Please note these down and keep them safe. "
-           "They will be needed to add other devices to your account (like your mobile phone or laptop)."));
-    QFont monoFont(QStringLiteral("Monospace"));
-    monoFont.setStyleHint(QFont::TypeWriter);
-    ui.lineEdit->setFont(monoFont);
-    ui.lineEdit->setText(tr("Generating mnemonic..."));
-    ui.lineEdit->setReadOnly(true);
-
-    ui.lineEdit->setStyleSheet(QStringLiteral("QLineEdit{ color: black; background: lightgrey; border-style: inset;}"));
-
-    ui.lineEdit->focusWidget();
-    ui.lineEdit->setAlignment(Qt::AlignCenter);
-
-    _mnemonicLoadingDialog->open();
-}
-
 void AccountSettings::showConnectionLabel(const QString &message, QStringList errors)
 {
     const QString errStyle = QLatin1String("color:#ffffff; background-color:#bb4d4d;padding:5px;"

diff --git a/src/gui/accountsettings.h b/src/gui/accountsettings.h
@@ -114,7 +114,6 @@ protected slots:
 
 private:
     void displayMnemonic(const QString &mnemonic);
-    void displayMnemonicLoadingDialog();
     void showConnectionLabel(const QString &message,
         QStringList errors = QStringList());
     bool event(QEvent *) override;
@@ -139,8 +138,6 @@ protected slots:
     QAction *_toggleSignInOutAction;
     QAction *_addAccountAction;
 
-    QPointer<QDialog> _mnemonicLoadingDialog = nullptr;
-
     bool _menuShown;
 };