2 files changed, 16 insertions, 26 deletions

diff --git a/synchronizer/listener.cpp b/synchronizer/listener.cpp
index 2e1e918..7481537 100644
--- a/synchronizer/listener.cpp
+++ b/synchronizer/listener.cpp
@@ -35,7 +35,7 @@
 #include <QLocalSocket>
 #include <QTimer>
 
-Listener::Listener(const QString &resourceName, QObject *parent)
+Listener::Listener(const QByteArray &resourceName, QObject *parent)
     : QObject(parent),
       m_server(new QLocalServer(this)),
       m_resourceName(resourceName),
@@ -48,11 +48,11 @@ Listener::Listener(const QString &resourceName, QObject *parent)
             this, &Listener::refreshRevision);
     connect(m_server, &QLocalServer::newConnection,
              this, &Listener::acceptConnection);
-    Log() << QString("Trying to open %1").arg(resourceName);
-    if (!m_server->listen(resourceName)) {
+    Log() << "Trying to open " << m_resourceName;
+    if (!m_server->listen(QString::fromLatin1(resourceName))) {
         // FIXME: multiple starts need to be handled here
         m_server->removeServer(resourceName);
-        if (!m_server->listen(resourceName)) {
+        if (!m_server->listen(QString::fromLatin1(resourceName))) {
             Warning() << "Utter failure to start server";
             exit(-1);
         }
@@ -212,26 +212,16 @@ void Listener::processCommand(int commandId, uint messageId, Client &client, uin
                     Warning() << "No resource loaded";
                     break;
                 }
-                //TODO a more elegant composition of jobs should be possible
+                auto job = Async::null<void>();
                 if (buffer->sourceSync()) {
-                    bool localSync = buffer->localSync();
-                    m_resource->synchronizeWithSource(m_pipeline).then<void>([callback, localSync, this](Async::Future<void> &f){
-                        if (localSync) {
-                            m_resource->processAllMessages().then<void>([callback](Async::Future<void> &f){
-                                callback();
-                                f.setFinished();
-                            }).exec();
-                        } else {
-                            callback();
-                            f.setFinished();
-                        }
-                    }).exec();
-                } else if (buffer->localSync()) {
-                    m_resource->processAllMessages().then<void>([callback](Async::Future<void> &f){
-                        callback();
-                        f.setFinished();
-                    }).exec();
+                    job = m_resource->synchronizeWithSource(m_pipeline);
                 }
+                if (buffer->localSync()) {
+                    job = job.then<void>(m_resource->processAllMessages());
+                }
+                job.then<void>([callback]() {
+                    callback();
+                }).exec();
                 return;
             } else {
                 Warning() << "received invalid command";
@@ -375,10 +365,10 @@ void Listener::loadResource()
         Log() << QString("Resource factory: %1").arg((qlonglong)resourceFactory);
         Log() << QString("\tResource: %1").arg((qlonglong)m_resource);
         //TODO: this doesn't really list all the facades .. fix
-        Log() << QString("\tFacades: %1").arg(Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::Domain::Event>(m_resourceName)->type());
+        Log() << "\tFacades: " << Akonadi2::FacadeFactory::instance().getFacade<Akonadi2::ApplicationDomain::Event>(m_resourceName)->type();
         m_resource->configurePipeline(m_pipeline);
     } else {
-        Error() << QString("Failed to load resource %1").arg(m_resourceName);
+        Error() << "Failed to load resource " << m_resourceName;
     }
     //TODO: on failure ... what?
     //Enter broken state?
diff --git a/synchronizer/listener.h b/synchronizer/listener.h
index 8dad3a4..d2ef0fc 100644
--- a/synchronizer/listener.h
+++ b/synchronizer/listener.h
@@ -58,7 +58,7 @@ class Listener : public QObject
     Q_OBJECT
 
 public:
-    Listener(const QString &resourceName, QObject *parent = 0);
+    Listener(const QByteArray &resourceName, QObject *parent = 0);
     ~Listener();
 
 Q_SIGNALS:
@@ -87,7 +87,7 @@ private:
     QLocalServer *m_server;
     QVector<Client> m_connections;
     flatbuffers::FlatBufferBuilder m_fbb;
-    const QString m_resourceName;
+    const QByteArray m_resourceName;
     Akonadi2::Resource *m_resource;
     Akonadi2::Pipeline *m_pipeline;
     QTimer *m_clientBufferProcessesTimer;