Clean up declarations in ClientSideEncryption

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

diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h
index 664e92ad30b9443d66a42c9b2e34235c09a673fa..1783ebba5ce432b37dc9b9022dd778442740bf82 100644 (file)
--- a/src/libsync/clientsideencryption.h
+++ b/src/libsync/clientsideencryption.h
@@ -119,48 +119,46 @@ public:
     class PKey;
 
     ClientSideEncryption();
-    void initialize(const AccountPtr &account);
 
-private:
-    void generateKeyPair(const AccountPtr &account);
-    void generateCSR(const AccountPtr &account, PKey keyPair);
-    void sendSignRequestCSR(const AccountPtr &account, PKey keyPair, const QByteArray &csrContent);
-    void encryptPrivateKey(const AccountPtr &account);
+    QByteArray _privateKey;
+    QSslKey _publicKey;
+    QSslCertificate _certificate;
+    QString _mnemonic;
+    bool _newMnemonicGenerated = false;
 
-public:
+signals:
+    void initializationFinished(bool isNewMnemonicGenerated = false);
+
+public slots:
+    void initialize(const AccountPtr &account);
     void forgetSensitiveData(const AccountPtr &account);
 
 private slots:
+    void generateKeyPair(const AccountPtr &account);
+    void encryptPrivateKey(const AccountPtr &account);    
+
     void publicKeyFetched(QKeychain::Job *incoming);
     void privateKeyFetched(QKeychain::Job *incoming);
     void mnemonicKeyFetched(QKeychain::Job *incoming);
 
-signals:
-    void initializationFinished(bool isNewMnemonicGenerated = false);
-
-private:
     void getPrivateKeyFromServer(const AccountPtr &account);
     void getPublicKeyFromServer(const AccountPtr &account);
     void fetchAndValidatePublicKeyFromServer(const AccountPtr &account);
     void decryptPrivateKey(const AccountPtr &account, const QByteArray &key);
 
     void fetchFromKeyChain(const AccountPtr &account);
-
-    [[nodiscard]] bool checkPublicKeyValidity(const AccountPtr &account) const;
-    [[nodiscard]] bool checkServerPublicKeyValidity(const QByteArray &serverPublicKeyString) const;
     void writePrivateKey(const AccountPtr &account);
     void writeCertificate(const AccountPtr &account);
     void writeMnemonic(const AccountPtr &account);
 
-    bool isInitialized = false;
+private:
+    void generateCSR(const AccountPtr &account, PKey keyPair);
+    void sendSignRequestCSR(const AccountPtr &account, PKey keyPair, const QByteArray &csrContent);
 
-public:
-    //QSslKey _privateKey;
-    QByteArray _privateKey;
-    QSslKey _publicKey;
-    QSslCertificate _certificate;
-    QString _mnemonic;
-    bool _newMnemonicGenerated = false;
+    [[nodiscard]] bool checkPublicKeyValidity(const AccountPtr &account) const;
+    [[nodiscard]] bool checkServerPublicKeyValidity(const QByteArray &serverPublicKeyString) const;
+
+    bool isInitialized = false;
 };
 
 /* Generates the Metadata for the folder */