From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Tue, 15 Nov 2022 14:31:27 +0000 (+0100)
Subject: Differentiate between E2EE not being enabled at all vs. E2EE being enabled already... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~100^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=70468be5e54e8dafe4a440808a175a9b4b3ea1dd;p=nextcloud-desktop.git

Differentiate between E2EE not being enabled at all vs. E2EE being enabled already through another device in account settings message

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/accountsettings.cpp b/src/gui/accountsettings.cpp
index 221aaa9ca..bf00276c6 100644
--- a/src/gui/accountsettings.cpp
+++ b/src/gui/accountsettings.cpp
@@ -1486,6 +1486,16 @@ void AccountSettings::initializeE2eEncryption()
 
         auto *const actionEnableE2e = addActionToEncryptionMessage(tr("Set up encryption"), e2EeUiActionEnableEncryptionId);
         connect(actionEnableE2e, &QAction::triggered, this, &AccountSettings::slotE2eEncryptionGenerateKeys);
+
+        connect(_accountState->account()->e2e(), &ClientSideEncryption::initializationFinished, this, [this] {
+            if (!_accountState->account()->e2e()->_publicKey.isNull()) {
+                _ui->encryptionMessage->setText(tr("End-to-End encryption has been enabled on this account with another device."
+                                                   "<br>"
+                                                   "It can be enabled on this device by entering your mnemonic."));
+            }
+        });
+        _accountState->account()->setE2eEncryptionKeysGenerationAllowed(false);
+        _accountState->account()->e2e()->initialize(_accountState->account());
     }
 }