core: Remove slots from storage APIs

[quassel.git] / src / core / coreircuser.cpp

diff --git a/src/core/coreircuser.cpp b/src/core/coreircuser.cpp
index 00b5979..55a5941 100644 (file)
--- a/src/core/coreircuser.cpp
+++ b/src/core/coreircuser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,34 +15,56 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreircuser.h"
 
-CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(hostmask, network) {
+#include "corenetwork.h"
+
+CoreIrcUser::CoreIrcUser(const QString& hostmask, Network* network)
+    : IrcUser(hostmask, network)
+{
 #ifdef HAVE_QCA2
-  _cipher = 0;
+    _cipher = nullptr;
+
+    // Get the cipher key from CoreNetwork if present
+    auto* coreNetwork = qobject_cast<CoreNetwork*>(network);
+    if (coreNetwork) {
+        QByteArray key = coreNetwork->readChannelCipherKey(nick().toLower());
+        if (!key.isEmpty()) {
+            if (!_cipher) {
+                _cipher = new Cipher();
+            }
+            setEncrypted(_cipher->setKey(key));
+        }
+    }
 #endif
 }
 
-CoreIrcUser::~CoreIrcUser() {
+CoreIrcUser::~CoreIrcUser()
+{
 #ifdef HAVE_QCA2
-  delete _cipher;
+    // Store the cipher key in CoreNetwork, including empty keys if a cipher
+    // exists. There is no need to store the empty key if no cipher exists; no
+    // key was present when instantiating and no key was set during the
+    // channel's lifetime.
+    auto* coreNetwork = qobject_cast<CoreNetwork*>(network());
+    if (coreNetwork && _cipher) {
+        coreNetwork->storeChannelCipherKey(nick().toLower(), _cipher->key());
+    }
+
+    delete _cipher;
 #endif
 }
 
 #ifdef HAVE_QCA2
-Cipher *CoreIrcUser::cipher() const {
-  if(!_cipher)
-    _cipher = new Cipher();
-
-  return _cipher;
-}
+Cipher* CoreIrcUser::cipher() const
+{
+    if (!_cipher)
+        _cipher = new Cipher();
 
-void CoreIrcUser::setEncrypted(bool e) {
-  Q_UNUSED(e);
-  // TODO
+    return _cipher;
 }
 
 #endif