cmake: avoid de-duplication of user's CXXFLAGS

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

diff --git a/src/core/coreircchannel.cpp b/src/core/coreircchannel.cpp
index 99d1881..7f9acd3 100644 (file)
--- a/src/core/coreircchannel.cpp
+++ b/src/core/coreircchannel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,29 +19,45 @@
  ***************************************************************************/
 
 #include "coreircchannel.h"
+
 #include "corenetwork.h"
 
-INIT_SYNCABLE_OBJECT(CoreIrcChannel)
-CoreIrcChannel::CoreIrcChannel(const QString &channelname, Network *network)
-    : IrcChannel(channelname, network),
-    _receivedWelcomeMsg(false)
+CoreIrcChannel::CoreIrcChannel(const QString& channelname, Network* network)
+    : IrcChannel(channelname, network)
+    , _receivedWelcomeMsg(false)
 {
 #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(channelname);
+        if (!key.isEmpty()) {
+            setEncrypted(cipher()->setKey(key));
+        }
+    }
 #endif
 }
 
-
 CoreIrcChannel::~CoreIrcChannel()
 {
 #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.
+    auto* coreNetwork = qobject_cast<CoreNetwork*>(network());
+    if (coreNetwork && _cipher) {
+        coreNetwork->storeChannelCipherKey(name(), _cipher->key());
+    }
+
     delete _cipher;
 #endif
 }
 
-
 #ifdef HAVE_QCA2
-Cipher *CoreIrcChannel::cipher() const
+Cipher* CoreIrcChannel::cipher() const
 {
     if (!_cipher)
         _cipher = new Cipher();
@@ -49,9 +65,10 @@ Cipher *CoreIrcChannel::cipher() const
     return _cipher;
 }
 
-
 void CoreIrcChannel::setEncrypted(bool e)
 {
+    IrcChannel::setEncrypted(e);
+
     if (!Cipher::neededFeaturesAvailable())
         return;
 
@@ -59,10 +76,9 @@ void CoreIrcChannel::setEncrypted(bool e)
         if (topic().isEmpty())
             return;
 
-        QByteArray decrypted = cipher()->decryptTopic(topic().toAscii());
+        QByteArray decrypted = cipher()->decryptTopic(topic().toLatin1());
         setTopic(decodeString(decrypted));
     }
 }
 
-
 #endif