ego model

14 files changed, 187 insertions, 73 deletions

diff --git a/qml/PlaceCreate.qml b/qml/PlaceCreate.qml
index 2206eb5..a5a4313 100644
--- a/qml/PlaceCreate.qml
+++ b/qml/PlaceCreate.qml
@@ -173,7 +173,7 @@ Rectangle {
                 width: 200
 
                 onClicked: {
-                    App.social.createPlace() // FIXME: nameField.text
+                    App.social.createPlace("FIXME: egoPubKey") // FIXME: nameField.text
                 }
             }
         }
diff --git a/qml/PlaceEnter.qml b/qml/PlaceEnter.qml
index 1eb09bb..3dcd3e7 100644
--- a/qml/PlaceEnter.qml
+++ b/qml/PlaceEnter.qml
@@ -212,7 +212,7 @@ Rectangle {
                 width: 200
 
                 onClicked: {
-                    App.social.enterPlace(publicKeyField.text, originField.text)
+                    App.social.enterPlace("FIXME: egoPubKey", publicKeyField.text, originField.text)
                 }
             }
         }
diff --git a/src/app.cpp b/src/app.cpp
index 6933589..15063cb 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -15,7 +15,7 @@ Settings *theSettings;
 QQuickWindow *theWindow;
 
 
-App::App (QObject * parent)
+App::App (QObject *parent)
   : QObject (parent)
 {
   theApp = this;
@@ -78,6 +78,12 @@ App::startGnuNet ()
 void
 App::setConnected (bool connected)
 {
+  #if FIXME
+  m_models->egos ()->setData (m_gnunet->social ()->egos ());
+  connect (m_gnunet->social (), SIGNAL (egoAdded ()),
+           m_models->egos (), SLOT (add ()));
+  #endif
+
   m_connected = connected;
   emit connectedChanged (m_connected);
 }
diff --git a/src/model/EgoListModel.cpp b/src/model/EgoListModel.cpp
index 740545f..3ffe6bd 100644
--- a/src/model/EgoListModel.cpp
+++ b/src/model/EgoListModel.cpp
@@ -28,9 +28,15 @@
 EgoListModel::EgoListModel (QObject * parent)
   : QAbstractListModel (parent)
 {
-  //connect(this, &EgoListModel::addNewPeerSignal, this, &EgoListModel::addNewPeerSlot, Qt::BlockingQueuedConnection);
-  connect (this, &EgoListModel::addNewEgoSignal, this,
-           &EgoListModel::addNewEgoSlot, Qt::BlockingQueuedConnection);
+  connect (this, &EgoListModel::addEgoSignal,
+           this, &EgoListModel::addEgoSlot, Qt::BlockingQueuedConnection);
+}
+
+
+void
+EgoListModel::setData (const QList<Ego *> &data)
+{
+  m_data = data;
 }
 
 
@@ -38,7 +44,7 @@ int
 EgoListModel::rowCount (const QModelIndex & parent) const
 {
   Q_UNUSED (parent);
-  return m_data.size () + 1;    // PLus one is because the last one is a "<CREATE>"
+  return m_data.size ();
 }
 
 
@@ -52,10 +58,8 @@ EgoListModel::contains (QString pubKey)
 QVariant
 EgoListModel::data (const QModelIndex &index, int role) const
 {
-  if (index.row () < 0 || index.row () > m_data.count ())
+  if (index.row () < 0 || m_data.count () <= index.row ())
     return QVariant ();
-  else if (index.row () == m_data.count ())
-    return QString ("<Create>");
 
   Ego *ego = m_data[index.row ()];
 
@@ -95,6 +99,7 @@ EgoListModel::modifiedSlot (int indexRow)
   emit dataChanged (modelIndex, modelIndex);
 }
 
+
 /**
  * @brief EgoListModel::add, add a new ego to the model.
  * @param key
@@ -104,17 +109,17 @@ EgoListModel::modifiedSlot (int indexRow)
 void
 EgoListModel::add (Ego *ego)
 {
-  emit addNewEgoSignal (ego, ego->pubKeyString ());
+  emit addEgoSignal (ego, ego->pubKeyString ());
 }
 
 
 /**
- * @brief EgoListModel::addNewEgoSlot
+ * @brief EgoListModel::addEgoSlot
  * @param key, the ego key.
  * @return return the same place as item
  */
 Ego *
-EgoListModel::addNewEgoSlot (Ego *item, QString pubKey)
+EgoListModel::addEgoSlot (Ego *item, QString pubKey)
 {
 
   //Search if already exists
@@ -138,10 +143,9 @@ EgoListModel::addNewEgoSlot (Ego *item, QString pubKey)
     endInsertRows ();
     return item;
   }
-
-
 }
 
+
 Ego *
 EgoListModel::get (QString key)
 {
@@ -154,20 +158,21 @@ EgoListModel::get (QString key)
     return NULL;
 }
 
+
 Ego *
 EgoListModel::get (QModelIndex index)
 {
-
-  if (getCount () <= index.row ())
+  if (m_data.count () <= index.row ())
     return NULL;
 
   return m_data[index.row ()];
 }
 
+
 Ego *
 EgoListModel::get (int index)
 {
-  if (index < 0 || getCount () <= index)
+  if (index < 0 || m_data.count () <= index)
     return NULL;
 
   Ego *ego = m_data[index];
@@ -178,6 +183,7 @@ EgoListModel::get (int index)
   return ego;
 }
 
+
 int
 EgoListModel::getCount ()
 {
diff --git a/src/model/EgoListModel.h b/src/model/EgoListModel.h
index 0ab2bcb..33a9cbe 100644
--- a/src/model/EgoListModel.h
+++ b/src/model/EgoListModel.h
@@ -44,6 +44,9 @@ public:
     EgoListModel (QObject *parent = 0);
 
   void
+    setData (const QList<Ego *> &data);
+
+  void
     add (Ego *ego);
 
   Q_INVOKABLE int
@@ -62,7 +65,7 @@ public:
 signals:
 
   void
-    addNewEgoSignal (Ego *item, QString pubKey);
+    addEgoSignal (Ego *item, QString pubKey);
 
 public slots:
 
@@ -72,7 +75,7 @@ public slots:
 private slots:
 
   Ego *
-    addNewEgoSlot (Ego * item, QString name);
+    addEgoSlot (Ego *item, QString name);
 
 private:
 
diff --git a/src/model/PlaceListModel.cpp b/src/model/PlaceListModel.cpp
index 54fede7..1116679 100644
--- a/src/model/PlaceListModel.cpp
+++ b/src/model/PlaceListModel.cpp
@@ -28,9 +28,8 @@
 PlaceListModel::PlaceListModel (QObject * parent)
   : QAbstractListModel (parent)
 {
-  //connect(this, &PlaceListModel::addNewPlaceSignal, this, &PlaceListModel::addNewPlaceSlot, Qt::BlockingQueuedConnection);
-  connect (this, &PlaceListModel::addNewPlaceSignal, this,
-           &PlaceListModel::addNewPlaceSlot);
+  connect (this, &PlaceListModel::addPlaceSignal,
+           this, &PlaceListModel::addPlaceSlot);
 }
 
 
@@ -116,17 +115,17 @@ PlaceListModel::modifiedSlot (int indexRow)
 void
 PlaceListModel::add (Place *place)
 {
-  emit addNewPlaceSignal (place, place->pubKeyString ());
+  emit addPlaceSignal (place, place->pubKeyString ());
 }
 
 
 /**
- * @brief PlaceListModel::addNewPlaceSlot
+ * @brief PlaceListModel::addPlaceSlot
  * @param key, the place ID.
  * @return return the same place as item
  */
 Place *
-PlaceListModel::addNewPlaceSlot (Place *item, QString pubKey)
+PlaceListModel::addPlaceSlot (Place *item, QString pubKey)
 {
 
   //Search if already exists
diff --git a/src/model/PlaceListModel.h b/src/model/PlaceListModel.h
index 03d1501..b66044d 100644
--- a/src/model/PlaceListModel.h
+++ b/src/model/PlaceListModel.h
@@ -67,7 +67,7 @@ class PlaceListModel : public QAbstractListModel
  signals:
 
   void
-    addNewPlaceSignal (Place *item, QString key);
+    addPlaceSignal (Place *item, QString key);
 
  public slots:
 
@@ -77,7 +77,7 @@ class PlaceListModel : public QAbstractListModel
  private slots:
 
    Place *
-   addNewPlaceSlot (Place *item, QString name);
+   addPlaceSlot (Place *item, QString name);
 
  private:
 
diff --git a/src/model/models.cpp b/src/model/models.cpp
index 0ff97b3..cdac395 100644
--- a/src/model/models.cpp
+++ b/src/model/models.cpp
@@ -22,7 +22,7 @@
 #include "models.h"
 
 
-Models::Models (QObject * parent)
+Models::Models (QObject *parent)
   : QObject (parent)
 {
   m_egos = new EgoListModel (this);
diff --git a/src/nym/ego.cpp b/src/nym/ego.cpp
index 75e1513..410bab8 100644
--- a/src/nym/ego.cpp
+++ b/src/nym/ego.cpp
@@ -1,6 +1,10 @@
 #include "ego.h"
 
-Ego::Ego (GNUNET_CRYPTO_EcdsaPublicKey pubKey, QObject *parent)
-  : Nym (pubKey, parent)
+Ego::Ego (GNUNET_CRYPTO_EcdsaPublicKey pubKey,
+          QString name,
+          GNUNET_SOCIAL_Ego *ego,
+          QObject *parent)
+  : Nym (pubKey, name, 0, parent)
 {
+  setEgo (ego);
 }
diff --git a/src/nym/ego.h b/src/nym/ego.h
index d41ba4b..fbf6370 100644
--- a/src/nym/ego.h
+++ b/src/nym/ego.h
@@ -13,7 +13,10 @@ class Ego : public Nym
  public:
 
   explicit
-    Ego (GNUNET_CRYPTO_EcdsaPublicKey pubKey, QObject *parent = 0);
+    Ego (GNUNET_CRYPTO_EcdsaPublicKey pubKey,
+         QString name = "",
+         GNUNET_SOCIAL_Ego *ego = 0,
+         QObject *parent = 0);
 
 
   GNUNET_SOCIAL_Ego *
diff --git a/src/nym/nym.cpp b/src/nym/nym.cpp
index 17ced59..007b26c 100644
--- a/src/nym/nym.cpp
+++ b/src/nym/nym.cpp
@@ -1,7 +1,12 @@
 #include "ego.h"
 
-Nym::Nym (GNUNET_CRYPTO_EcdsaPublicKey pubKey, QObject *parent):
-QObject (parent)
+Nym::Nym (GNUNET_CRYPTO_EcdsaPublicKey pubKey,
+          QString name,
+          GNUNET_SOCIAL_Nym *nym,
+          QObject *parent)
+  : QObject (parent)
 {
   setPubKey (pubKey);
+  setName (name);
+  setNym (nym);
 }
diff --git a/src/nym/nym.h b/src/nym/nym.h
index 350a21c..bddf91d 100644
--- a/src/nym/nym.h
+++ b/src/nym/nym.h
@@ -15,7 +15,10 @@ class Nym : public QObject
  public:
 
   explicit
-    Nym (GNUNET_CRYPTO_EcdsaPublicKey pubKey, QObject *parent = 0);
+    Nym (GNUNET_CRYPTO_EcdsaPublicKey pubKey,
+         QString name = "",
+         GNUNET_SOCIAL_Nym *nym = 0,
+         QObject *parent = 0);
 
   int
   getIndex () const
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index 353ce56..c789e7e 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -41,11 +41,23 @@ SocialApp::egoCallback (void *cls,
                         const char *name)
 {
   SocialApp *s = (SocialApp *) cls;
-  s->m_curEgo = ego;
-  Ego *e = new Ego (*egoPubKey);
-  e->setEgo (ego);
-  e->setName (QString::fromLatin1 (name));
-  theApp->models ()->egos ()->add (e);
+  s->addEgo (new Ego (*egoPubKey, QString::fromLatin1 (name), ego));
+}
+
+
+void
+SocialApp::addEgo (Ego *ego)
+{
+  m_egos += ego;
+  emit egoAddedSignal (ego);
+  theApp->models ()->egos ()->add (ego); // FIXME
+}
+
+void
+SocialApp::addPlace (Place *place)
+{
+  m_places += place;
+  emit placeAddedSignal (place);
 }
 
 void
@@ -56,7 +68,7 @@ SocialApp::hostPlaceCallback (void *cls,
                               enum GNUNET_SOCIAL_AppPlaceState placeState)
 {
   SocialApp *s = (SocialApp *) cls;
-  s->m_places += new Host (s->m_app, ego, hconn, s);
+  s->addPlace (new Host (s->m_app, ego, hconn, s));
 }
 
 
@@ -68,64 +80,95 @@ SocialApp::guestPlaceCallback (void *cls,
                                enum GNUNET_SOCIAL_AppPlaceState placeState)
 {
   SocialApp *s = (SocialApp *) cls;
-  s->m_places += new Guest (s->m_app, ego, gconn, s);
+  s->addPlace (new Guest (s->m_app, ego, gconn, s));
+}
+
+
+Ego *
+SocialApp::findEgo (const QString pubKeyStr)
+{
+  QListIterator<Ego *> it (m_egos);
+  while (it.hasNext ())
+  {
+    Ego *ego = it.next ();
+    if (ego->pubKeyString () == pubKeyStr)
+      return ego;
+  }
+  return 0;
+}
+
+
+void
+SocialApp::placeCreate (GNUNET_SOCIAL_Ego *ego)
+{
+  addPlace (new Host (m_app, ego, GNUNET_PSYC_CHANNEL_PRIVATE, this)); // FIXME: ego
 }
 
 
 void
-SocialApp::placeCreate ()
+SocialApp::createPlaceSlot (QString egoPubKeyStr)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Creating a New Place.\n");
 
-  Host *host = new Host (m_app, m_curEgo, GNUNET_PSYC_CHANNEL_PRIVATE, this); // FIXME: ego
-  m_places += host;
+  Ego *ego = findEgo (egoPubKeyStr);
+  if (!ego) // FIXME: fall back to last added ego for now
+  {
+    Q_ASSERT (!m_egos.isEmpty ());
+    ego = m_egos.last ();
+  }
+
+  placeCreate (ego->ego ());
 }
 
 
 void
-SocialApp::createPlaceSlot ()
+SocialApp::createPlace (QString egoPubKeyStr)
 {
-  placeCreate ();
+  emit createPlaceSignal (egoPubKeyStr);
 }
 
 
 void
-SocialApp::createPlace ()
+SocialApp::placeEnter (GNUNET_SOCIAL_Ego *ego,
+                       GNUNET_CRYPTO_EddsaPublicKey *pubKey,
+                       GNUNET_PeerIdentity *peerId)
 {
-  emit createPlaceSignal ();
+  addPlace (new Guest (m_app, ego, pubKey, peerId, 0, NULL, NULL, this));
 }
 
 
 void
-SocialApp::placeEnter (QString pubKeyStr, QString peerIdStr)
+SocialApp::enterPlaceSlot (QString egoPubKeyStr, QString pubKeyStr, QString peerIdStr)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Entering place %s as guest.\n",
               pubKeyStr.toStdString ().c_str ());
 
-  GNUNET_CRYPTO_EddsaPublicKey *pubKey = new GNUNET_CRYPTO_EddsaPublicKey;
+  GNUNET_CRYPTO_EddsaPublicKey pubKey;
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_public_key_from_string (pubKeyStr.toStdString ().c_str (),
                                                   pubKeyStr.length (),
-                                                  pubKey))
+                                                  &pubKey))
     return; // Failed conversion
 
   GNUNET_PeerIdentity peerId;
-  GNUNET_CRYPTO_eddsa_public_key_from_string (peerIdStr.toStdString ().c_str (),
-                                              peerIdStr.length (),
-                                              &peerId.public_key);
-  m_places += new Guest (m_app, m_curEgo, pubKey, &peerId, 0, NULL, NULL, this);
-}
+  if (GNUNET_OK != GNUNET_CRYPTO_eddsa_public_key_from_string (peerIdStr.toStdString ().c_str (),
+                                                               peerIdStr.length (),
+                                                               &peerId.public_key))
+    return; // Failed conversion
 
+  Ego *ego = findEgo (egoPubKeyStr);
+  if (!ego) // FIXME: fall back to last added ego for now
+  {
+    Q_ASSERT (!m_egos.isEmpty ());
+    ego = m_egos.last ();
+  }
 
-void
-SocialApp::enterPlaceSlot (QString pubKeyStr, QString peerIdStr)
-{
-  placeEnter (pubKeyStr, peerIdStr);
+  placeEnter (ego->ego (), &pubKey, &peerId);
 }
 
 
 void
-SocialApp::enterPlace (QString pubKeyStr, QString peerIdStr)
+SocialApp::enterPlace (QString egoPubKeyStr, QString pubKeyStr, QString peerIdStr)
 {
-  emit enterPlaceSignal (pubKeyStr, peerIdStr);
+  emit enterPlaceSignal (egoPubKeyStr, pubKeyStr, peerIdStr);
 }
diff --git a/src/social/socialapp.h b/src/social/socialapp.h
index 99ee0ab..4aaa2c3 100644
--- a/src/social/socialapp.h
+++ b/src/social/socialapp.h
@@ -4,6 +4,7 @@
 #include <QObject>
 #include <QDebug>
 
+#include "nym/ego.h"
 #include "social/place.h"
 #include "gnunet.h"
 
@@ -17,28 +18,63 @@ class SocialApp : public QObject
                       QObject *parent = 0);
   ~SocialApp ();
 
-  void placeCreate ();
-  void placeEnter (QString pubKeyStr, QString peerIdStr);
+  Ego *
+    findEgo (const QString pubKeyStr);
 
-  Q_INVOKABLE void createPlace ();
-  Q_INVOKABLE void enterPlace (QString pubKeyStr, QString peerIdStr);
+  void
+    placeCreate (GNUNET_SOCIAL_Ego *ego);
+
+  void
+    placeEnter (GNUNET_SOCIAL_Ego *ego,
+                GNUNET_CRYPTO_EddsaPublicKey *pubKey,
+                GNUNET_PeerIdentity *peerId);
+
+  Q_INVOKABLE void
+    createPlace (QString egoPubKeyStr);
+
+  Q_INVOKABLE void
+    enterPlace (QString egoPubKeyStr, QString pubKeyStr, QString peerIdStr);
+
+  const QList<Ego *> &
+    egos ()
+  {
+    return m_egos;
+  }
+
+  const QList<Place *> &
+    places ()
+  {
+    return m_places;
+  }
 
  signals:
 
-  void createPlaceSignal ();
-  void enterPlaceSignal (QString pubKey, QString peerIdentity);
+  void
+    createPlaceSignal (QString egoPubKeyStr);
+
+  void
+    enterPlaceSignal (QString egoPubKeyStr, QString pubKey, QString peerId);
+
+  void
+    egoAddedSignal (Ego *ego);
+
+  void
+    placeAddedSignal (Place *place);
 
  public slots:
 
-  void createPlaceSlot ();
-  void enterPlaceSlot (QString pubKey, QString peerIdentity);
+  void
+    createPlaceSlot (QString egoPubKeyStr);
+
+  void
+    enterPlaceSlot (QString egoPubKeyStr, QString pubKey, QString peerId);
 
  private:
 
   GNUNET_SOCIAL_App *m_app;
-  GNUNET_SOCIAL_Ego *m_curEgo; // FIXME
+  QList<Ego *> m_egos;
+  QList<Place *> m_places;
   GNUNET_CONFIGURATION_Handle *m_config;
-  QList<Place*> m_places;
 
   static void
     egoCallback (void *cls,
@@ -46,6 +82,12 @@ class SocialApp : public QObject
                  const struct GNUNET_CRYPTO_EcdsaPublicKey *ego_pub_key,
                  const char *name);
 
+  void
+    addEgo (Ego *ego);
+
+  void
+    addPlace (Place *place);
+
   static void
     hostPlaceCallback (void *cls,
                        struct GNUNET_SOCIAL_HostConnection *hconn,