beginning of keys setting

core/account.cpp

@@ -806,6 +806,14 @@ void Core::Account::updateInfo(const Shared::Info& info) {
     //TODO switch case of what kind of entity this info update is about
     //right now it could be only about myself
     vh->uploadVCard(info.getVCardRef());
+    const std::list<Shared::KeyInfo>& keys = info.getActiveKeysRef();
+    for (const Shared::KeyInfo& info : keys) {
+        qDebug() << "An attempt to save key: ";
+        qDebug() << "id:" << info.id;
+        qDebug() << "label:" << info.label;
+        qDebug() << "current device:" << info.currentDevice;
+        qDebug() << "... but it's not implemented yet, ignoring";
+    }
 }
 
 QString Core::Account::getAvatarPath() const {

core/account.h

@@ -67,11 +67,9 @@
 #include "handlers/omemohandler.h"
 #endif
 
-namespace Core
+namespace Core {
-{
 
-class Account : public QObject
+class Account : public QObject {
-{
     Q_OBJECT
     friend class MessageHandler;
     friend class RosterHandler;

core/handlers/rosterhandler.h

@@ -41,8 +41,6 @@
 #include <core/delayManager/manager.h>
 
 namespace Core {
-
-    
 class Account;
     
 class RosterHandler : public QObject {

shared/info.cpp

@@ -1,18 +1,20 @@
-// Squawk messenger. 
+/*
-// Copyright (C) 2019  Yury Gubich <blue@macaw.me>
+ * Squawk messenger.
-// 
+ * Copyright (C) 2019  Yury Gubich <blue@macaw.me>
-// This program is free software: you can redistribute it and/or modify
+ *
-// it under the terms of the GNU General Public License as published by
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or
-// 
+ * (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
+ *
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 
+ * GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
+ *
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "info.h"
 
@@ -21,8 +23,7 @@ Shared::Info::Info(const QString& addr, EntryType tp):
 address(addr),
 vcard(nullptr),
 activeKeys(nullptr),
-    inactiveKeys(nullptr)
+inactiveKeys(nullptr) {
-{
     switch (type) {
     case EntryType::none:
         break;
@@ -42,16 +43,14 @@ Shared::Info::Info():
 address(""),
 vcard(nullptr),
 activeKeys(nullptr),
-    inactiveKeys(nullptr)
+inactiveKeys(nullptr) {}
-{}
 
 Shared::Info::Info(const Shared::Info &other):
 type(other.type),
 address(other.address),
 vcard(nullptr),
 activeKeys(nullptr),
-    inactiveKeys(nullptr)
+inactiveKeys(nullptr) {
-{
     switch (type) {
     case EntryType::none:
         break;
@@ -66,6 +65,47 @@ Shared::Info::Info(const Shared::Info& other):
     }
 }
 
+Shared::Info::Info(Info &&other):
+type(other.type),
+address(other.address),
+vcard(other.vcard),
+activeKeys(other.activeKeys),
+inactiveKeys(other.inactiveKeys) {
+    other.type = EntryType::none;
+}
+
+Shared::Info &Shared::Info::operator=(Info &&other) {
+    type = other.type;
+    address = other.address;
+    vcard = other.vcard;
+    activeKeys = other.activeKeys;
+    inactiveKeys = other.inactiveKeys;
+
+    other.type = EntryType::none;
+
+    return *this;
+}
+
+Shared::Info &Shared::Info::operator=(const Info &other) {
+    type = other.type;
+    address = other.address;
+
+    switch (type) {
+    case EntryType::none:
+        break;
+    case EntryType::contact:
+    case EntryType::ownAccount:
+        vcard = new VCard(other.getVCardRef());
+        activeKeys = new std::list<KeyInfo>(other.getActiveKeysRef());
+        inactiveKeys = new std::list<KeyInfo>(other.getInactiveKeysRef());
+        break;
+    default:
+        throw 351;
+    }
+
+    return *this;
+}
+
 Shared::Info::~Info() {
     turnIntoNone();
 }
@@ -90,9 +130,7 @@ void Shared::Info::turnIntoNone() {
 }
 
 void Shared::Info::turnIntoContact(
-    const Shared::VCard& crd,
+    const Shared::VCard &crd, const std::list<KeyInfo> &aks, const std::list<KeyInfo> &iaks
-    const std::list<KeyInfo>& aks,
-    const std::list<KeyInfo>& iaks
 ) {
     switch (type) {
     case EntryType::none:
@@ -113,11 +151,7 @@ void Shared::Info::turnIntoContact(
     type = EntryType::contact;
 }
 
-void Shared::Info::turnIntoContact(
+void Shared::Info::turnIntoContact(Shared::VCard *crd, std::list<KeyInfo> *aks, std::list<KeyInfo> *iaks) {
-    Shared::VCard* crd,
-    std::list<KeyInfo>* aks,
-    std::list<KeyInfo>* iaks
-) {
     switch (type) {
     case EntryType::contact:
     case EntryType::ownAccount:
@@ -138,9 +172,7 @@ void Shared::Info::turnIntoContact(
 }
 
 void Shared::Info::turnIntoOwnAccount(
-    const Shared::VCard& crd,
+    const Shared::VCard &crd, const std::list<KeyInfo> &aks, const std::list<KeyInfo> &iaks
-    const std::list<KeyInfo>& aks,
-    const std::list<KeyInfo>& iaks
 ) {
     switch (type) {
     case EntryType::none:
@@ -161,11 +193,7 @@ void Shared::Info::turnIntoOwnAccount(
     type = EntryType::ownAccount;
 }
 
-void Shared::Info::turnIntoOwnAccount(
+void Shared::Info::turnIntoOwnAccount(Shared::VCard *crd, std::list<KeyInfo> *aks, std::list<KeyInfo> *iaks) {
-    Shared::VCard* crd,
-    std::list<KeyInfo>* aks,
-    std::list<KeyInfo>* iaks
-) {
     switch (type) {
     case EntryType::contact:
     case EntryType::ownAccount:
@@ -186,16 +214,20 @@ void Shared::Info::turnIntoOwnAccount(
 }
 
 void Shared::Info::setAddress(const QString &addr) {
-    address = addr;}
+    address = addr;
+}
 
 QString Shared::Info::getAddress() const {
-    return address;}
+    return address;
+}
 
 const QString &Shared::Info::getAddressRef() const {
-    return address;}
+    return address;
+}
 
 Shared::EntryType Shared::Info::getType() const {
-    return type;}
+    return type;
+}
 
 std::list<Shared::KeyInfo> &Shared::Info::getActiveKeysRef() {
     switch (type) {
@@ -350,4 +382,3 @@ void Shared::Info::setVCard(Shared::VCard* card) {
         throw 367;
     }
 }
-

shared/info.h

@@ -1,21 +1,22 @@
-// Squawk messenger. 
+/*
-// Copyright (C) 2019  Yury Gubich <blue@macaw.me>
+ * Squawk messenger.
-// 
+ * Copyright (C) 2019  Yury Gubich <blue@macaw.me>
-// This program is free software: you can redistribute it and/or modify
+ *
-// it under the terms of the GNU General Public License as published by
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or
-// 
+ * (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
+ *
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 
+ * GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
+ *
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#ifndef SHARED_INFO_H
+#pragma once
-#define SHARED_INFO_H
 
 #include "vcard.h"
 #include "keyinfo.h"
@@ -36,7 +37,10 @@ public:
     Info();
     Info(const QString& address, EntryType = EntryType::none);
     Info(const Info& other);
+    Info(Info&& other);
     virtual ~Info();
+    Info& operator = (const Info& other);
+    Info& operator = (Info&& other);
 
     QString getAddress() const;
     const QString& getAddressRef() const;
@@ -90,7 +94,4 @@ private:
     std::list<KeyInfo>* activeKeys;
     std::list<KeyInfo>* inactiveKeys;
 };
-
 }
-
-#endif // SHARED_INFO_H

ui/models/info/omemo/keys.cpp

@@ -1,18 +1,20 @@
-// Squawk messenger. 
+/*
-// Copyright (C) 2019  Yury Gubich <blue@macaw.me>
+ * Squawk messenger.
-// 
+ * Copyright (C) 2019  Yury Gubich <blue@macaw.me>
-// This program is free software: you can redistribute it and/or modify
+ *
-// it under the terms of the GNU General Public License as published by
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or
-// 
+ * (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
+ *
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 
+ * GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
+ *
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "keys.h"
 
@@ -37,18 +39,34 @@ Models::Keys::~Keys() {
         delete pair.second;
 }
 
-std::deque<Shared::KeyInfo> Models::Keys::modifiedKeys() const {
+std::list<Shared::KeyInfo> Models::Keys::modifiedKeys() const {
-    std::deque<Shared::KeyInfo> response(modified.size());
+    std::list<Shared::KeyInfo> response;
+    for (const std::pair<const int, Shared::KeyInfo*>& pair: modified)
+        response.push_back(*(pair.second));
 
-    int i = 0;
-    for (const std::pair<const int, Shared::KeyInfo*>& pair: modified) {
-        response[i] = *(pair.second);
-        ++i;
-    }
 
     return response;
 }
 
+std::list<Shared::KeyInfo> Models::Keys::finalKeys() const {
+    std::list<Shared::KeyInfo> result;
+    finalKeys(result);
+    return result;
+}
+
+void Models::Keys::finalKeys(std::list<Shared::KeyInfo>& out) const {
+    for (int i = 0; i < rowCount(); ++i)
+        out.push_back(key(i));
+}
+
+const Shared::KeyInfo & Models::Keys::key(unsigned int i) const {
+    std::map<int, Shared::KeyInfo*>::const_iterator itr = modified.find(i);
+    if (itr != modified.end())
+        return*(itr->second);
+    else
+        return *(keys[i]);
+}
+
 void Models::Keys::addKey(const Shared::KeyInfo& info) {
     beginInsertRows(QModelIndex(), keys.size(), keys.size());
     keys.push_back(new Shared::KeyInfo(info));

ui/models/info/omemo/keys.h

@@ -1,21 +1,22 @@
-// Squawk messenger. 
+/*
-// Copyright (C) 2019  Yury Gubich <blue@macaw.me>
+ * Squawk messenger.
-// 
+ * Copyright (C) 2019  Yury Gubich <blue@macaw.me>
-// This program is free software: you can redistribute it and/or modify
+ *
-// it under the terms of the GNU General Public License as published by
+ * This program is free software: you can redistribute it and/or modify
-// the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU General Public License as published by
-// (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or
-// 
+ * (at your option) any later version.
-// This program is distributed in the hope that it will be useful,
+ *
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * This program is distributed in the hope that it will be useful,
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-// GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// 
+ * GNU General Public License for more details.
-// You should have received a copy of the GNU General Public License
+ *
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-#ifndef MODELS_KEYS_H
+#pragma once
-#define MODELS_KEYS_H
 
 #include <QAbstractListModel>
 
@@ -23,11 +24,7 @@
 
 namespace Models {
 
-/**
+class Keys : public QAbstractListModel {
- * @todo write docs
- */
-class Keys : public QAbstractListModel
-{
 public:
     Keys(QObject *parent = nullptr);
     ~Keys();
@@ -37,11 +34,14 @@ public:
 
     QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+    const Shared::KeyInfo& key(unsigned int i) const;
 
     QHash<int, QByteArray> roleNames() const override;
     QModelIndex index(int row, int column, const QModelIndex & parent) const override;
 
-    std::deque<Shared::KeyInfo> modifiedKeys() const;
+    std::list<Shared::KeyInfo> modifiedKeys() const;
+    std::list<Shared::KeyInfo> finalKeys() const;
+    void finalKeys(std::list<Shared::KeyInfo>& out) const;
 
     enum Roles {
         Label = Qt::UserRole + 1,
@@ -64,5 +64,3 @@ private:
 };
 
 }
-
-#endif // MODELS_KEYS_H

ui/widgets/info/info.cpp

@@ -114,6 +114,9 @@ void UI::Info::onButtonBoxAccepted() {
         contactGeneral->fillVCard(card);
         contactContacts->fillVCard(card);
         card.setDescription(description->description());
+#ifdef WITH_OMEMO
+        omemo->fillData(info.getActiveKeysRef());
+#endif
         emit saveInfo(info);
         emit close();
     }
@@ -161,7 +164,8 @@ void UI::Info::initializeDescription(const QString& descr, bool editable) {
 }
 
 QString UI::Info::getJid() const {
-    return jid;}
+    return jid;
+}
 
 void UI::Info::clear() {
     if (contactGeneral != nullptr) {

ui/widgets/info/info.h

@@ -39,8 +39,7 @@
 
 
 namespace UI {
-namespace Ui
+namespace Ui {
-{
 class Info;
 }
 

ui/widgets/info/omemo/omemo.cpp

@@ -88,6 +88,12 @@ void UI::Omemo::setData(const std::list<Shared::KeyInfo>& keys) {
     deviceKeyVisibility(deviceKeyModel.rowCount() > 0);
 }
 
+void UI::Omemo::fillData(std::list<Shared::KeyInfo>& out) {
+    deviceKeyModel.finalKeys(out);
+    keysModel.finalKeys(out);
+    unusedKeysModel.finalKeys(out);
+}
+
 const QString UI::Omemo::title() const {
     return m_ui->OMEMOHeading->text();
 }

ui/widgets/info/omemo/omemo.h

@@ -41,6 +41,7 @@ public:
     ~Omemo();
 
     void setData(const std::list<Shared::KeyInfo>& keys);
+    void fillData(std::list<Shared::KeyInfo>& out);
     const QString title() const;
 
 private slots: