Merge pull request #2258 from nextcloud/have_a_way_to_display_e2ee_mnemonic

Keep the E2EE info message around to allow displaying mnemonic
This commit is contained in:
Kevin Ottens 2020-08-11 15:11:40 +02:00 committed by GitHub
commit c5343e10f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -197,11 +197,15 @@ AccountSettings::AccountSettings(AccountState *accountState, QWidget *parent)
connect(_accountState->account()->e2e(), &ClientSideEncryption::showMnemonic, this, &AccountSettings::slotShowMnemonic);
connect(_accountState->account()->e2e(), &ClientSideEncryption::mnemonicGenerated, this, &AccountSettings::slotNewMnemonicGenerated);
if (_accountState->account()->e2e()->newMnemonicGenerated())
{
if (_accountState->account()->e2e()->newMnemonicGenerated()) {
slotNewMnemonicGenerated();
} else {
_ui->encryptionMessage->hide();
_ui->encryptionMessage->setText(tr("This account supports end-to-end encryption"));
auto *mnemonic = new QAction(tr("Display mnemonic"), this);
connect(mnemonic, &QAction::triggered, this, &AccountSettings::requesetMnemonic);
_ui->encryptionMessage->addAction(mnemonic);
_ui->encryptionMessage->show();
}
connect(UserModel::instance(), &UserModel::addAccount,