X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreircuser.cpp;h=4dd946ead319d6d4ed5bdf9d5f79fea6495515ed;hp=79f5d38afc0d26663981260b49ae519b555656a0;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=04315f46a16fc3627218377071e008b6b9744992

diff --git a/src/core/coreircuser.cpp b/src/core/coreircuser.cpp
index 79f5d38a..4dd946ea 100644
--- a/src/core/coreircuser.cpp
+++ b/src/core/coreircuser.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,11 +19,24 @@
  ***************************************************************************/
 
 #include "coreircuser.h"
+#include "corenetwork.h"
 
 CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(hostmask, network)
 {
 #ifdef HAVE_QCA2
     _cipher = 0;
+
+    // Get the cipher key from CoreNetwork if present
+    CoreNetwork *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
 }
 
@@ -31,6 +44,15 @@ CoreIrcUser::CoreIrcUser(const QString &hostmask, Network *network) : IrcUser(ho
 CoreIrcUser::~CoreIrcUser()
 {
 #ifdef HAVE_QCA2
+    // 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.
+    CoreNetwork *coreNetwork = qobject_cast<CoreNetwork *>(network());
+    if (coreNetwork && _cipher) {
+        coreNetwork->storeChannelCipherKey(nick().toLower(), _cipher->key());
+    }
+
     delete _cipher;
 #endif
 }
@@ -46,11 +68,4 @@ Cipher *CoreIrcUser::cipher() const
 }
 
 
-void CoreIrcUser::setEncrypted(bool e)
-{
-    Q_UNUSED(e);
-    // TODO
-}
-
-
 #endif