shutdown & cleanup

11 files changed, 121 insertions, 106 deletions

diff --git a/qml/About.qml b/qml/About.qml
index 9b28e48..c03741d 100644
--- a/qml/About.qml
+++ b/qml/About.qml
@@ -1,5 +1,5 @@
-import QtQuick.Window 2.1;
 import QtQuick 2.2
+import QtQuick.Window 2.1
 import QtQuick.Controls 1.1
 import QtQuick.Layouts 1.1
 
@@ -11,7 +11,6 @@ Window {
     height: 400;
     id: aboutWnd
 
-
     RowLayout{
         anchors.fill: parent
         anchors.margins: 10
@@ -21,14 +20,11 @@ Window {
             Add designed by Factorio.us collective from the Noun Project
             Send designed by Javier Sánchez - javyliu from the thenounproject.com
             Gear designed by P.J. Onori from the thenounproject.com
-            GLYPHICONS FREE are released under the Creative Commons Attribution 3.0 Unported (CC BY 3.0) (http://glyphicons.com/).
-"
-
+            GLYPHICONS FREE are released under the Creative Commons Attribution 3.0 Unported (CC BY 3.0) (http://glyphicons.com/)."
         }
 
-
         Button{
-            text: "Ok"
+            text: "OK"
             onPressedChanged: {
                 aboutWnd.close();
             }
@@ -36,6 +32,3 @@ Window {
     }
 
 }
-
-
-
diff --git a/qml/main.qml b/qml/main.qml
index 83cec0c..fee82da 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -6,7 +6,12 @@ import QtQuick.Controls.Styles 1.2
 
 import secushare 1.0
 
-Window {
+ApplicationWindow {
+    onClosing: {
+        close.accepted = false
+        App.close()
+    }
+
     id: root
 
     width: 1000
diff --git a/src/app.cpp b/src/app.cpp
index 73e6ea8..e20de4a 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -33,12 +33,6 @@ App::App (QObject * parent)
 
 App::~App ()
 {
-  if (m_gnunet)
-  {
-    delete m_gnunet;
-    m_gnunet = NULL;
-    m_gnunetThread->exit ();
-  }
 }
 
 
@@ -49,23 +43,30 @@ App::~App ()
 void
 App::startGnuNet ()
 {
-  //Create the GnuNet object
   m_gnunet = new GnuNet ();
-
-  //New thread where the Gnunet will be run on.
   m_gnunetThread = new QThread ();
-
   m_gnunet->moveToThread (m_gnunetThread);
 
-  // Call the start function after our thread is ready to run
-  connect (m_gnunetThread, &QThread::started,
-           m_gnunet, &GnuNet::start);
-
-  m_gnunetThread->start ();
+  connect (m_gnunetThread, SIGNAL (started ()),
+           m_gnunet, SLOT (start ()));
 
   connect (m_gnunet, &GnuNet::connectedChanged,
-           this, &App::setConnected,
-           Qt::QueuedConnection);
+           this, &App::setConnected, Qt::QueuedConnection);
+
+
+  connect(m_gnunet, SIGNAL(stopped()),
+          m_gnunet, SLOT(deleteLater()));
+
+  connect(m_gnunet, SIGNAL(stopped()),
+          m_gnunetThread, SLOT(quit()));
+
+  connect(m_gnunetThread, SIGNAL(finished()),
+          m_gnunetThread, SLOT(deleteLater()));
+
+  connect(m_gnunetThread, SIGNAL(finished()),
+          qApp, SLOT(quit()));
+
+  m_gnunetThread->start ();
 }
 
 
@@ -163,7 +164,8 @@ App::setupTray ()
   // add a horizontal line to the menu
   m_trayMenu->addSeparator ();
   m_trayCloseAction = m_trayMenu->addAction ("Close");
-  connect (m_trayCloseAction, &QAction::triggered, this, &App::close);
+  connect (m_trayCloseAction, &QAction::triggered,
+           this, &App::close);
 
   // same as above
   m_tray = new QSystemTrayIcon (QIcon (":/assets/icon.ico"), theWindow);
@@ -186,7 +188,7 @@ App::trayActivated (QSystemTrayIcon::ActivationReason reason)
     }
     else
     {
-      onClose ();
+      hide ();
     }
   }
 }
@@ -206,10 +208,10 @@ App::setTrayMessage (QString place, QString message)
 
 
 /**
- * Recivied close signal
+ * Recieved close signal
  */
 void
-App::onClose ()
+App::hide ()
 {
   theWindow->hide ();
 }
@@ -221,6 +223,5 @@ App::onClose ()
 void
 App::close ()
 {
-  //setAlive(false);
-  QApplication::quit ();
+  m_gnunet->stop ();
 }
diff --git a/src/app.h b/src/app.h
index d4cd978..8bfa4fa 100644
--- a/src/app.h
+++ b/src/app.h
@@ -65,11 +65,12 @@ public:
 
   SocialApp *social () const
   {
-    return m_gnunet->social ();
+    return m_gnunet ?  m_gnunet->social () : NULL;
   }
 
   void setupTray ();
-  Q_INVOKABLE void onClose ();
+  Q_INVOKABLE void hide ();
+  Q_INVOKABLE void close ();
 
   void setConnected (bool connected);
 
@@ -97,13 +98,13 @@ private:
   void
     startGnuNet ();
 
-  void
-    close ();
+ signals:
 
-signals:
   void connectedChanged (bool connected);
 
-  public slots:void trayActivated (QSystemTrayIcon::ActivationReason reason);
+ public slots:
+
+  void trayActivated (QSystemTrayIcon::ActivationReason reason);
   void setTrayMessage (QString place, QString message);
 };
 
diff --git a/src/gnunet/gnunet.cpp b/src/gnunet/gnunet.cpp
index 73070d6..8886808 100644
--- a/src/gnunet/gnunet.cpp
+++ b/src/gnunet/gnunet.cpp
@@ -40,19 +40,10 @@ GnuNet::GnuNet (QObject * parent)
 
 GnuNet::~GnuNet ()
 {
-  if (m_social)
-  {
-    delete m_social;
-    m_social = NULL;
-  }
-  setConnected (false);
-  GNUNET_SCHEDULER_shutdown ();
+  qDebug () << "GnuNet: destructed";
 }
 
 
-/**
- * Start GNUnet
- */
 void
 GnuNet::start ()
 {
@@ -63,10 +54,34 @@ GnuNet::start ()
   GNUNET_PROGRAM_run (main_argc, main_argv,
                       APP_NAME, APP_NAME,
                       options, mainLoopCallback, this);
+  qDebug () << "GnuNet: event loop finished";
   Q_ASSERT (!m_connected);
 }
 
 
+void
+GnuNet::stop ()
+{
+  emit shutdown ();
+}
+
+
+void
+GnuNet::shutdownSlot ()
+{
+  qDebug () << "GnuNet: shutting down";
+  if (m_social)
+  {
+    delete m_social;
+    m_social = NULL;
+  }
+  setConnected (false);
+  GNUNET_SCHEDULER_shutdown ();
+  qDebug () << "GnuNet: shut down finished";
+  emit stopped ();
+}
+
+
 /**
  * The first function called when the GnuNet scheduler starts.
  */
@@ -78,6 +93,9 @@ GnuNet::mainLoop (char *const *args, const char *cfgfile,
   Q_UNUSED (cfgfile);
   Q_UNUSED (cfg);
 
+  connect (this, SIGNAL (shutdown ()),
+           this, SLOT (shutdownSlot ()), Qt::QueuedConnection);
+
   // Create our configuration
   m_config = GNUNET_CONFIGURATION_create ();
   GNUNET_CONFIGURATION_load (m_config, cfgfile);
@@ -95,21 +113,11 @@ GnuNet::mainLoop (char *const *args, const char *cfgfile,
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 shutdownTask, this);
 
-  // An update function to process our messages
-  GNUNET_SCHEDULER_add_now (processQtEventsTask, this);
-
-  connectServices ();
-}
-
-
-/**
- * Connect to the services
- */
-void
-GnuNet::connectServices ()
-{
   m_social = new SocialApp (m_config, this);
   setConnected (true);
+
+  // An update function to process our messages
+  GNUNET_SCHEDULER_add_now (processQtEventsTask, this);
 }
 
 
@@ -143,9 +151,12 @@ GnuNet::processQtEventsTask (void *cls,
   QCoreApplication::processEvents ();
 
   // Call again
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_MILLISECONDS, 500),
-                                processQtEventsTask, gnunet);
+  if (gnunet->isConnected ())
+  {
+    GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+                                  (GNUNET_TIME_UNIT_MILLISECONDS, 100),
+                                  processQtEventsTask, gnunet);
+  }
 }
 
 
diff --git a/src/gnunet/gnunet.h b/src/gnunet/gnunet.h
index ae67ed1..0de079b 100644
--- a/src/gnunet/gnunet.h
+++ b/src/gnunet/gnunet.h
@@ -49,10 +49,30 @@ class GnuNet : public QObject
               READ peerIdString
               NOTIFY peerIdStringChanged);
 
+ signals:
+
+  void shutdown ();
+  void stopped ();
+
+  void connectedChanged (bool connected);
+
+  void peerIdChanged (GNUNET_PeerIdentity peerId);
+
+  void peerIdStringChanged (QString peerIdStr);
+
+ public slots:
+
+  void start ();
+
+ private slots:
+
+  void shutdownSlot ();
+
  public:
 
   explicit GnuNet (QObject *parent = 0);
   ~GnuNet ();
+  void stop ();
 
   SocialApp *social () const
   {
@@ -85,6 +105,7 @@ class GnuNet : public QObject
     return m_peerIdStr;
   }
 
+
  private:
 
   GNUNET_PeerIdentity m_peerId;
@@ -107,25 +128,6 @@ class GnuNet : public QObject
     shutdownTask (void *cls,
                   const struct GNUNET_SCHEDULER_TaskContext *tc);
 
-
- signals:
-
-  void connectedChanged (bool connected);
-
-  void peerIdChanged (GNUNET_PeerIdentity peerId);
-
-  void peerIdStringChanged (QString peerIdStr);
-
- public slots:
-
-  void start ();
-
- private slots:
-
-   void connectServices ();
-
- private:
-
    SocialApp *m_social;
 
    struct GNUNET_CONFIGURATION_Handle *m_config;
diff --git a/src/main.cpp b/src/main.cpp
index 38d0993..986d12b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,7 +22,6 @@ main (int argc, char **argv)
 
   // connect window to quit signal
   QObject *topLevel = engine.rootObjects ().value (0);
-
   theWindow = qobject_cast < QQuickWindow * >(topLevel);
   if (!theWindow)
   {
@@ -30,7 +29,9 @@ main (int argc, char **argv)
     return -1;
   }
 
-  QObject::connect (&engine, SIGNAL (quit ()), &qapp, SLOT (quit ()));
+  QObject::connect (&engine, SIGNAL (quit ()),
+                    &app, SLOT (close ()));
+
   app.registerImageProvider (&engine);
 
   theWindow->setTitle (QString ("secushare 0.1"));
diff --git a/src/social/host.cpp b/src/social/host.cpp
index 86c112e..e76151b 100644
--- a/src/social/host.cpp
+++ b/src/social/host.cpp
@@ -1,10 +1,10 @@
 #include "host.h"
 
-
 Host::Host (GNUNET_SOCIAL_App *app,
             GNUNET_SOCIAL_Ego *ego,
             enum GNUNET_PSYC_Policy policy,
-            QObject *parent) : Place (parent)
+            QObject *parent)
+  : Place (parent)
 {
   m_app = app;
   m_ego = ego;
@@ -23,7 +23,8 @@ Host::Host (GNUNET_SOCIAL_App *app,
 Host::Host (GNUNET_SOCIAL_App *app,
             GNUNET_SOCIAL_Ego *ego,
             GNUNET_SOCIAL_HostConnection *hconn,
-            QObject *parent) : Place (parent)
+            QObject *parent)
+  : Place (parent)
 {
   m_app = app;
   m_ego = ego;
@@ -64,7 +65,8 @@ Host::answerDoorCallback (void *cls, struct GNUNET_SOCIAL_Nym *nym,
               "%s\n%.*s\n", method_name, data_size, data);
 
   Host *host = (Host *) cls;
-  emit host->answerDoorSignal (new Message (method_name, env, data, data_size, nym));
+  emit host->answerDoorSignal (new Message (method_name, env, data, data_size,
+                                            nym, host));
 }
 
 
diff --git a/src/social/host.h b/src/social/host.h
index d4aae3d..06ebc36 100644
--- a/src/social/host.h
+++ b/src/social/host.h
@@ -16,7 +16,7 @@ class Host : public Place
   explicit
     Host (GNUNET_SOCIAL_App *app,
           GNUNET_SOCIAL_Ego *ego,
-          enum GNUNET_PSYC_Policy policy = GNUNET_PSYC_CHANNEL_PRIVATE,
+          enum GNUNET_PSYC_Policy policy,
           QObject *parent = NULL);
 
   explicit
diff --git a/src/social/place.cpp b/src/social/place.cpp
index 72c5693..28bf1a3 100644
--- a/src/social/place.cpp
+++ b/src/social/place.cpp
@@ -200,5 +200,9 @@ Place::notifyDataCallback (void *cls, uint16_t *data_size, void *data)
   memcpy (data, sub.c_str (), *data_size);
   tmit->data_sent += *data_size;
 
-  return (tmit->data.size () <= tmit->data_sent) ? GNUNET_YES : GNUNET_NO;
+  if (tmit->data_sent < tmit->data.size ())
+    return GNUNET_NO;
+
+  delete tmit;
+  return GNUNET_YES;
 }
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index cd8f182..7ff6971 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -20,21 +20,16 @@ SocialApp::SocialApp (struct GNUNET_CONFIGURATION_Handle *config,
                                guestPlaceCallback,
                                this);
 
-  connect (this, &SocialApp::createPlaceSignal, this,
-           &SocialApp::createPlaceSlot, Qt::QueuedConnection);
+  connect (this, &SocialApp::createPlaceSignal,
+           this, &SocialApp::createPlaceSlot, Qt::QueuedConnection);
 
-  connect (this, &SocialApp::enterPlaceSignal, this,
-           &SocialApp::enterPlaceSlot, Qt::QueuedConnection);
+  connect (this, &SocialApp::enterPlaceSignal,
+           this, &SocialApp::enterPlaceSlot, Qt::QueuedConnection);
 }
 
 
 SocialApp::~SocialApp ()
 {
-  foreach (Place *place, m_places)
-  {
-    delete place;
-  }
-
   GNUNET_SOCIAL_app_disconnect (m_app);
 }
 
@@ -61,7 +56,7 @@ SocialApp::hostPlaceCallback (void *cls,
                               enum GNUNET_SOCIAL_PlaceState placeState)
 {
   SocialApp *s = (SocialApp *) cls;
-  s->m_places += new Host (s->m_app, ego, hconn);
+  s->m_places += new Host (s->m_app, ego, hconn, s);
 }
 
 
@@ -73,7 +68,7 @@ SocialApp::guestPlaceCallback (void *cls,
                                enum GNUNET_SOCIAL_PlaceState placeState)
 {
   SocialApp *s = (SocialApp *) cls;
-  s->m_places += new Guest (s->m_app, ego, gconn);
+  s->m_places += new Guest (s->m_app, ego, gconn, s);
 }
 
 
@@ -82,7 +77,7 @@ SocialApp::placeCreate ()
 {
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Creating a New Place.\n");
 
-  Host *host = new Host (m_app, m_curEgo); // FIXME: ego
+  Host *host = new Host (m_app, m_curEgo, GNUNET_PSYC_CHANNEL_PRIVATE, this); // FIXME: ego
   m_places += host;
 }
 
@@ -118,7 +113,7 @@ SocialApp::placeEnter (QString pubKeyStr, QString peerIdStr)
   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);
+  m_places += new Guest (m_app, m_curEgo, pubKey, &peerId, 0, NULL, NULL, this);
 }