adding and removing contacts, rester testing

core/account.cpp

@@ -195,11 +195,14 @@ void Core::Account::onRosterItemRemoved(const QString& bareJid)
         return;
     }
     Contact* contact = itr->second;
+    contacts.erase(itr);
     QSet<QString> cGroups = contact->getGroups();
     for (QSet<QString>::const_iterator itr = cGroups.begin(), end = cGroups.end(); itr != end; ++itr) {
         removeFromGroup(bareJid, *itr);
     }
     emit removeContact(bareJid);
+    
+    contact->deleteLater();
 }
 
 void Core::Account::addedAccount(const QString& jid)
@@ -240,7 +243,12 @@ void Core::Account::addedAccount(const QString& jid)
         if (grCount == 0) {
             emit addContact(jid, "", cData);
         }
+        handleNewContact(contact);
+    }
+}
 
+void Core::Account::handleNewContact(Core::Contact* contact)
+{
     QObject::connect(contact, SIGNAL(groupAdded(const QString&)), this, SLOT(onContactGroupAdded(const QString&)));
     QObject::connect(contact, SIGNAL(groupRemoved(const QString&)), this, SLOT(onContactGroupRemoved(const QString&)));
     QObject::connect(contact, SIGNAL(nameChanged(const QString&)), this, SLOT(onContactNameChanged(const QString&)));
@@ -248,9 +256,9 @@ void Core::Account::addedAccount(const QString& jid)
                      this, SLOT(onContactSubscriptionStateChanged(Shared::SubscriptionState)));
     QObject::connect(contact, SIGNAL(needHistory(const QString&, const QString&)), this, SLOT(onContactNeedHistory(const QString&, const QString&)));
     QObject::connect(contact, SIGNAL(historyResponse(const std::list<Shared::Message>&)), this, SLOT(onContactHistoryResponse(const std::list<Shared::Message>&)));
-    }
 }
 
+
 void Core::Account::onPresenceReceived(const QXmppPresence& presence)
 {
     QString id = presence.from();
@@ -431,8 +439,21 @@ bool Core::Account::handleChatMessage(const QXmppMessage& msg, bool outgoing, bo
         const QString& id(msg.id());
         Shared::Message sMsg(Shared::Message::chat);
         initializeMessage(sMsg, msg, outgoing, forwarded, guessing);
-        std::map<QString, Contact*>::const_iterator itr = contacts.find(sMsg.getPenPalJid());
+        QString jid = sMsg.getPenPalJid();
-        itr->second->appendMessageToArchive(sMsg);
+        std::map<QString, Contact*>::const_iterator itr = contacts.find(jid);
+        Contact* cnt;
+        if (itr != contacts.end()) {
+            cnt = itr->second;
+        } else {
+            cnt = new Contact(jid, name);
+            contacts.insert(std::make_pair(jid, cnt));
+            cnt->setSubscriptionState(Shared::unknown);
+            emit addContact(jid, "", QMap<QString, QVariant>({
+                {"state", Shared::unknown}
+            }));
+            handleNewContact(cnt);
+        }
+        cnt->appendMessageToArchive(sMsg);
         
         emit message(sMsg);
         

core/account.h

@@ -107,6 +107,7 @@ private slots:
   
 private:
     void addedAccount(const QString &bareJid);
+    void handleNewContact(Contact* contact);
     bool handleChatMessage(const QXmppMessage& msg, bool outgoing = false, bool forwarded = false, bool guessing = false);
     void addToGroup(const QString& jid, const QString& group);
     void removeFromGroup(const QString& jid, const QString& group);

core/squawk.cpp

@@ -365,3 +365,14 @@ void Core::Squawk::removeContactRequest(const QString& account, const QString& j
     
     itr->second->removeContactRequest(jid);
 }
+
+void Core::Squawk::addContactRequest(const QString& account, const QString& jid, const QString& name, const QSet<QString>& groups)
+{
+    AccountsMap::const_iterator itr = amap.find(account);
+    if (itr == amap.end()) {
+        qDebug("An attempt to add contact to a non existing account, skipping");
+        return;
+    }
+    
+    itr->second->addContactRequest(jid, name, groups);
+}

core/squawk.h

@@ -52,6 +52,7 @@ public slots:
     void subscribeContact(const QString& account, const QString& jid, const QString& reason);
     void unsubscribeContact(const QString& account, const QString& jid, const QString& reason);
     void removeContactRequest(const QString& account, const QString& jid);
+    void addContactRequest(const QString& account, const QString& jid, const QString& name, const QSet<QString>& groups);
     
 private:
     typedef std::deque<Account*> Accounts;

main.cpp

@@ -10,6 +10,7 @@ int main(int argc, char *argv[])
 {
     qRegisterMetaType<Shared::Message>("Shared::Message");
     qRegisterMetaType<std::list<Shared::Message>>("std::list<Shared::Message>");
+    qRegisterMetaType<QSet<QString>>("QSet<QString>");
     
     QApplication app(argc, argv);
     SignalCatcher sc(&app);
@@ -45,6 +46,10 @@ int main(int argc, char *argv[])
                      squawk, SLOT(subscribeContact(const QString&, const QString&, const QString&)));
     QObject::connect(&w, SIGNAL(unsubscribeContact(const QString&, const QString&, const QString&)), 
                      squawk, SLOT(unsubscribeContact(const QString&, const QString&, const QString&)));
+    QObject::connect(&w, SIGNAL(addContactRequest(const QString&, const QString&, const QString&, const QSet<QString>&)), 
+                     squawk, SLOT(addContactRequest(const QString&, const QString&, const QString&, const QSet<QString>&)));
+    QObject::connect(&w, SIGNAL(removeContactRequest(const QString&, const QString&)), 
+                     squawk, SLOT(removeContactRequest(const QString&, const QString&)));
     
     QObject::connect(squawk, SIGNAL(newAccount(const QMap<QString, QVariant>&)), &w, SLOT(newAccount(const QMap<QString, QVariant>&)));
     QObject::connect(squawk, SIGNAL(addContact(const QString&, const QString&, const QString&, const QMap<QString, QVariant>&)), 

ui/CMakeLists.txt

@@ -21,6 +21,7 @@ set(squawkUI_SRC
   models/presence.cpp
   conversation.cpp
   messageline.cpp
+  newcontact.cpp
 )
 
 # Tell CMake to create the helloworld executable

ui/accounts.cpp

@@ -42,6 +42,7 @@ void Accounts::onAccountAccepted()
         emit newAccount(map);
     }
     
+    acc->deleteLater();
     editing = false;
 }
 

ui/models/accounts.cpp

@@ -66,6 +66,8 @@ void Models::Accounts::addAccount(Account* account)
     accs.push_back(account);
     connect(account, SIGNAL(childChanged(Models::Item*, int, int)), this, SLOT(onAccountChanged(Models::Item*, int, int)));
     endInsertRows();
+    
+    emit sizeChanged(accs.size());
 }
 
 void Models::Accounts::onAccountChanged(Item* item, int row, int col)
@@ -93,4 +95,17 @@ void Models::Accounts::removeAccount(int index)
     disconnect(account, SIGNAL(childChanged(Models::Item*, int, int)), this, SLOT(onAccountChanged(Models::Item*, int, int)));
     accs.erase(accs.begin() + index);
     endRemoveRows();
+    
+    emit sizeChanged(accs.size());
+}
+
+std::deque<QString> Models::Accounts::getNames() const
+{
+    std::deque<QString> res;
+    
+    for (std::deque<Models::Account*>::const_iterator i = accs.begin(), end = accs.end(); i != end; ++i) {
+        res.push_back((*i)->getName());
+    }
+    
+    return res;
 }

ui/models/accounts.h

@@ -25,8 +25,11 @@ public:
 
     Account* getAccount(int index);
     
+    std::deque<QString> getNames() const;
+    
 signals:
     void changed();
+    void sizeChanged(unsigned int size);
     
 private:
     std::deque<Account*> accs;

ui/models/roster.cpp

@@ -260,6 +260,7 @@ void Models::Roster::addContact(const QString& account, const QString& jid, cons
                 qDebug() << "An attempt to add a contact " << jid << " ungrouped to non the account " << account << " for the second time, skipping";
                 return;
             }
+            itr++;
         }
         parent = acc;
     } else {
@@ -345,7 +346,8 @@ void Models::Roster::removeGroup(const QString& account, const QString& name)
         }
     }
     
-    delete item;
+    item->deleteLater();
+    groups.erase(gItr);
 }
 
 void Models::Roster::changeContact(const QString& account, const QString& jid, const QMap<QString, QVariant>& data)
@@ -366,6 +368,7 @@ void Models::Roster::removeContact(const QString& account, const QString& jid)
     ElId id(account, jid);
     std::multimap<ElId, Contact*>::iterator cBeg = contacts.lower_bound(id);
     std::multimap<ElId, Contact*>::iterator cEnd = contacts.upper_bound(id);
+    std::multimap<ElId, Contact*>::iterator cpBeg = cBeg;
     
     QSet<QString> toRemove;
     for (; cBeg != cEnd; ++cBeg) {
@@ -376,8 +379,9 @@ void Models::Roster::removeContact(const QString& account, const QString& jid)
         }
         
         parent->removeChild(contact->row());
-        delete contact;
+        contact->deleteLater();
     }
+    contacts.erase(cpBeg, cEnd);
     
     for (QSet<QString>::const_iterator itr = toRemove.begin(), end = toRemove.end(); itr != end; ++itr) {
         removeGroup(account, *itr);
@@ -402,6 +406,7 @@ void Models::Roster::removeContact(const QString& account, const QString& jid, c
     for (;cBeg != cEnd; ++cBeg) {
         if (cBeg->second->parentItem() == gr) {
             cont = cBeg->second;
+            contacts.erase(cBeg);
             break;
         }
     }
@@ -412,7 +417,7 @@ void Models::Roster::removeContact(const QString& account, const QString& jid, c
     }
     
     gr->removeChild(cont->row());
-    delete cont;
+    cont->deleteLater();
     
     if (gr->childCount() == 0) {
         removeGroup(account, group);

ui/newcontact.cpp

@@ -0,0 +1,78 @@
+/*
+ * <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2019  Юрий Губич <y.gubich@initi.ru>
+ *
+ * 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
+ * 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
+ * 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/>.
+ */
+
+#include "newcontact.h"
+#include "ui_newcontact.h"
+#include <QDebug>
+
+NewContact::NewContact(const Models::Accounts* accounts, QWidget* parent):
+    QDialog(parent),
+    m_ui(new Ui::NewContact())
+{
+    m_ui->setupUi ( this );
+    std::deque<QString> names = accounts->getNames();
+    
+    for (std::deque<QString>::const_iterator i = names.begin(), end = names.end(); i != end; i++) {
+        m_ui->account->addItem(*i);
+    }
+    
+    m_ui->account->setCurrentIndex(0);
+}
+
+NewContact::NewContact(const QString& acc, const Models::Accounts* accounts, QWidget* parent):
+    QDialog(parent),
+    m_ui(new Ui::NewContact())
+{
+
+    m_ui->setupUi ( this );
+    std::deque<QString> names = accounts->getNames();
+    
+    int index = 0;
+    bool found = false;
+    for (std::deque<QString>::const_iterator i = names.begin(), end = names.end(); i != end; i++) {
+        const QString& name = *i;
+        m_ui->account->addItem(name);
+        if (!found) {
+            if (name == acc) {
+                found = true;
+            } else {
+                index++;
+            }
+        }
+    }
+    
+    if (!found) {
+        qDebug() << "Couldn't find a correct account among available accounts creating NewContact dialog, setting to 0";
+    }
+    
+    m_ui->account->setCurrentIndex(index);
+}
+
+NewContact::~NewContact()
+{
+}
+
+NewContact::Data NewContact::value() const
+{
+    return {
+        m_ui->jid->text(),
+        m_ui->name->text(),
+        m_ui->account->currentText(),
+        {}
+    };
+}

ui/newcontact.h

@@ -0,0 +1,54 @@
+/*
+ * <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2019  Юрий Губич <y.gubich@initi.ru>
+ *
+ * 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
+ * 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
+ * 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/>.
+ */
+
+#ifndef NEWCONTACT_H
+#define NEWCONTACT_H
+
+#include <QDialog>
+#include <QScopedPointer>
+#include <QSet>
+
+#include "models/accounts.h"
+
+namespace Ui
+{
+class NewContact;
+}
+
+class NewContact : public QDialog
+{
+    Q_OBJECT
+public:
+    struct Data {
+        QString jid;
+        QString name;
+        QString account;
+        QSet<QString> groups;
+    };
+    
+    NewContact(const Models::Accounts* accounts, QWidget* parent = 0);
+    NewContact(const QString& acc, const Models::Accounts* accounts, QWidget* parent = 0);
+    ~NewContact();
+    
+    Data value() const;
+
+private:
+    QScopedPointer<Ui::NewContact> m_ui;
+};
+
+#endif // NEWCONTACT_H

ui/newcontact.ui

@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewContact</class>
+ <widget class="QDialog" name="NewContact">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>376</width>
+    <height>222</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>NewContact</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Account</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="account">
+       <property name="toolTip">
+        <string>An account that is going to have new contact</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>JID</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="jid">
+       <property name="toolTip">
+        <string>Jabber id of your new contact</string>
+       </property>
+       <property name="placeholderText">
+        <string>name@server.dmn</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Name</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="name">
+       <property name="toolTip">
+        <string>The way this new contact will be labeled in your roster (optional)</string>
+       </property>
+       <property name="placeholderText">
+        <string>John Smith</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>NewContact</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>NewContact</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

ui/squawk.cpp

@@ -21,9 +21,12 @@ Squawk::Squawk(QWidget *parent) :
     m_ui->comboBox->setCurrentIndex(Shared::offline);
     
     connect(m_ui->actionAccounts, SIGNAL(triggered()), this, SLOT(onAccounts()));
+    connect(m_ui->actionAddContact, SIGNAL(triggered()), this, SLOT(onNewContact()));
     connect(m_ui->comboBox, SIGNAL(activated(int)), this, SLOT(onComboboxActivated(int)));
     connect(m_ui->roster, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(onRosterItemDoubleClicked(const QModelIndex&)));
     connect(m_ui->roster, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(onRosterContextMenu(const QPoint&)));
+    
+    connect(rosterModel.accountsModel, SIGNAL(sizeChanged(unsigned int)), this, SLOT(onAccountsSizeChanged(unsigned int)));
     //m_ui->mainToolBar->addWidget(m_ui->comboBox);
 }
 
@@ -51,6 +54,35 @@ void Squawk::onAccounts()
     }
 }
 
+void Squawk::onAccountsSizeChanged(unsigned int size)
+{
+    if (size > 0) {
+        m_ui->actionAddContact->setEnabled(true);
+    } else {
+        m_ui->actionAddContact->setEnabled(false);
+    }
+}
+
+void Squawk::onNewContact()
+{
+    NewContact* nc = new NewContact(rosterModel.accountsModel, this);
+    
+    connect(nc, SIGNAL(accepted()), this, SLOT(onNewContactAccepted()));
+    connect(nc, SIGNAL(rejected()), nc, SLOT(deleteLater()));
+    
+    nc->exec();
+}
+
+void Squawk::onNewContactAccepted()
+{
+    NewContact* nc = static_cast<NewContact*>(sender());
+    NewContact::Data value = nc->value();
+    
+    emit addContactRequest(value.account, value.jid, value.name, value.groups);
+    
+    nc->deleteLater();
+}
+
 void Squawk::closeEvent(QCloseEvent* event)
 {
     if (accounts != 0) {

ui/squawk.h

@@ -11,6 +11,7 @@
 #include "accounts.h"
 #include "conversation.h"
 #include "models/roster.h"
+#include "newcontact.h"
 
 #include "../global.h"
 
@@ -38,6 +39,7 @@ signals:
     void subscribeContact(const QString& account, const QString& jid, const QString& reason);
     void unsubscribeContact(const QString& account, const QString& jid, const QString& reason);
     void removeContactRequest(const QString& account, const QString& jid);
+    void addContactRequest(const QString& account, const QString& jid, const QString& name, const QSet<QString>& groups);
     
 public slots:
     void newAccount(const QMap<QString, QVariant>& account);
@@ -69,6 +71,9 @@ protected:
     
 private slots:
     void onAccounts();
+    void onNewContact();
+    void onNewContactAccepted();
+    void onAccountsSizeChanged(unsigned int size);
     void onAccountsClosed(QObject* parent = 0);
     void onConversationClosed(QObject* parent = 0);
     void onComboboxActivated(int index);

ui/squawk.ui

@@ -80,6 +80,7 @@
     <property name="title">
      <string>File</string>
     </property>
+    <addaction name="actionAddContact"/>
     <addaction name="actionQuit"/>
    </widget>
    <addaction name="menuFile"/>
@@ -96,12 +97,24 @@
   </action>
   <action name="actionQuit">
    <property name="icon">
-    <iconset theme="application-exit"/>
+    <iconset theme="application-exit">
+     <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
     <string>Quit</string>
    </property>
   </action>
+  <action name="actionAddContact">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="list-add-user"/>
+   </property>
+   <property name="text">
+    <string>Add contact</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>