Merge lp:~renatofilho/sync-monitor/start-after-unity8 into lp:sync-monitor

[Renato Araujo Oliveira Filho]

Do not sync on startup, only after a client registers with sync-monitor (apps, or online accounts).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:38
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/70/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/77/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/80/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/80/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/81/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/82/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-armhf-ci/31/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-utopic-i386-ci/31

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/83/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/sync-monitor/start-after-unity8]

47. By Renato Araujo Oliveira Filho on 2014-11-06

Merged parent branch.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:47
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/91/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/91/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested according to "Test Network" section of test plan. All working.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-06 03:58:10 +0000
+++ CMakeLists.txt	2014-11-06 03:58:10 +0000
@@ -27,12 +27,11 @@
 enable_testing()
 add_subdirectory(3rd_party)
 add_subdirectory(src)
-add_subdirectory(upstart)
 add_subdirectory(accounts)
 add_subdirectory(templates)
-add_subdirectory(data)
 add_subdirectory(tests)
 add_subdirectory(po)
 add_subdirectory(Ubuntu)
+add_subdirectory(upstart)
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)

=== modified file 'Ubuntu/SyncMonitor/syncmonitor-qml.cpp'
--- Ubuntu/SyncMonitor/syncmonitor-qml.cpp	2014-04-25 14:00:57 +0000
+++ Ubuntu/SyncMonitor/syncmonitor-qml.cpp	2014-11-06 03:58:10 +0000
@@ -55,6 +55,7 @@
 SyncMonitorQml::~SyncMonitorQml()
 {
     if (m_iface) {
+        m_iface->call("detach");
         delete m_iface;
         m_iface = 0;
     }
@@ -111,6 +112,7 @@
 
     connect(m_iface, SIGNAL(stateChanged()), SIGNAL(stateChanged()));
     connect(m_iface, SIGNAL(enabledServicesChanged()), SIGNAL(enabledServicesChanged()));
+    m_iface->call("attach");
     Q_EMIT stateChanged();
     Q_EMIT enabledServicesChanged();
 }

=== removed directory 'data'
=== removed file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2014-03-25 15:10:15 +0000
+++ data/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/com.canonical.SyncMonitor.service.in"
-               "${CMAKE_CURRENT_BINARY_DIR}/com.canonical.SyncMonitor.service"
-               IMMEDIATE @ONLY
-)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.SyncMonitor.service
-        DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/dbus-1/services/
-)

=== removed file 'data/com.canonical.SyncMonitor.service.in'
--- data/com.canonical.SyncMonitor.service.in	2014-04-08 18:51:17 +0000
+++ data/com.canonical.SyncMonitor.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.SyncMonitor
-Exec=@CMAKE_INSTALL_FULL_LIBDIR@/sync-monitor/sync-monitor

=== modified file 'debian/sync-monitor.install'
--- debian/sync-monitor.install	2014-04-08 14:55:20 +0000
+++ debian/sync-monitor.install	2014-11-06 03:58:10 +0000
@@ -1,4 +1,3 @@
 usr/lib/*/sync-monitor/sync-monitor
 usr/share/upstart/sessions/sync-monitor.conf
 usr/share/sync-monitor/templates/*
-usr/share/dbus-1/services/com.canonical.SyncMonitor.service

=== modified file 'src/eds-helper.cpp'
--- src/eds-helper.cpp	2014-11-06 03:58:10 +0000
+++ src/eds-helper.cpp	2014-11-06 03:58:10 +0000
@@ -28,39 +28,10 @@
     qRegisterMetaType<QList<QOrganizerItemId> >("QList<QOrganizerItemId>");
     qRegisterMetaType<QList<QContactId> >("QList<QContactId>");
 
-    m_timeoutTimer.setSingleShot(true);
-
     m_contactEngine = new QContactManager(contactManager, QMap<QString, QString>());
-    connect(m_contactEngine,
-            SIGNAL(contactsAdded(QList<QContactId>)),
-            SLOT(contactChangedFilter(QList<QContactId>)),
-            Qt::QueuedConnection);
-    connect(m_contactEngine,
-            SIGNAL(contactsChanged(QList<QContactId>)),
-            SLOT(contactChangedFilter(QList<QContactId>)),
-            Qt::QueuedConnection);
-    connect(m_contactEngine,
-            SIGNAL(contactsRemoved(QList<QContactId>)),
-            SLOT(contactChanged()),
-            Qt::QueuedConnection);
-    connect(m_contactEngine,
-            SIGNAL(dataChanged()),
-            SLOT(contactDataChanged()),
-            Qt::QueuedConnection);
-
     m_organizerEngine = new QOrganizerManager(organizerManager, QMap<QString, QString>());
-    connect(m_organizerEngine,
-            SIGNAL(itemsAdded(QList<QOrganizerItemId>)),
-            SLOT(calendarChanged(QList<QOrganizerItemId>)), Qt::QueuedConnection);
-    connect(m_organizerEngine,
-            SIGNAL(itemsRemoved(QList<QOrganizerItemId>)),
-            SLOT(calendarChanged(QList<QOrganizerItemId>)), Qt::QueuedConnection);
-    connect(m_organizerEngine,
-            SIGNAL(itemsChanged(QList<QOrganizerItemId>)),
-            SLOT(calendarChanged(QList<QOrganizerItemId>)), Qt::QueuedConnection);
-    connect(m_organizerEngine,
-            SIGNAL(collectionsModified(QList<QPair<QOrganizerCollectionId,QOrganizerManager::Operation> >)),
-            SLOT(calendarCollectionsChanged()));
+
+    m_timeoutTimer.setSingleShot(true);
 }
 
 EdsHelper::~EdsHelper()
@@ -117,6 +88,44 @@
     m_pendingCalendars.clear();
 }
 
+void EdsHelper::setEnabled(bool enabled)
+{
+    if (enabled) {
+        connect(m_contactEngine,
+                SIGNAL(contactsAdded(QList<QContactId>)),
+                SLOT(contactChangedFilter(QList<QContactId>)),
+                Qt::QueuedConnection);
+        connect(m_contactEngine,
+                SIGNAL(contactsChanged(QList<QContactId>)),
+                SLOT(contactChangedFilter(QList<QContactId>)),
+                Qt::QueuedConnection);
+        connect(m_contactEngine,
+                SIGNAL(contactsRemoved(QList<QContactId>)),
+                SLOT(contactChanged()),
+                Qt::QueuedConnection);
+        connect(m_contactEngine,
+                SIGNAL(dataChanged()),
+                SLOT(contactDataChanged()),
+                Qt::QueuedConnection);
+
+        connect(m_organizerEngine,
+                SIGNAL(itemsAdded(QList<QOrganizerItemId>)),
+                SLOT(calendarChanged(QList<QOrganizerItemId>)), Qt::QueuedConnection);
+        connect(m_organizerEngine,
+                SIGNAL(itemsRemoved(QList<QOrganizerItemId>)),
+                SLOT(calendarChanged(QList<QOrganizerItemId>)), Qt::QueuedConnection);
+        connect(m_organizerEngine,
+                SIGNAL(itemsChanged(QList<QOrganizerItemId>)),
+                SLOT(calendarChanged(QList<QOrganizerItemId>)), Qt::QueuedConnection);
+        connect(m_organizerEngine,
+                SIGNAL(collectionsModified(QList<QPair<QOrganizerCollectionId,QOrganizerManager::Operation> >)),
+                SLOT(calendarCollectionsChanged()));
+    } else {
+        m_contactEngine->disconnect(this);
+        m_organizerEngine->disconnect(this);
+    }
+}
+
 void EdsHelper::contactChangedFilter(const QList<QContactId>& contactIds)
 {
     if (m_freezed) {

=== modified file 'src/eds-helper.h'
--- src/eds-helper.h	2014-11-06 03:58:10 +0000
+++ src/eds-helper.h	2014-11-06 03:58:10 +0000
@@ -47,6 +47,7 @@
     void freezeNotify();
     void unfreezeNotify();
     void flush();
+    void setEnabled(bool enabled);
 
 Q_SIGNALS:
     void dataChanged(const QString &serviceName, const QString &sourceName);

=== modified file 'src/sync-daemon.cpp'
--- src/sync-daemon.cpp	2014-11-06 03:58:10 +0000
+++ src/sync-daemon.cpp	2014-11-06 03:58:10 +0000
@@ -41,9 +41,10 @@
       m_manager(0),
       m_eds(0),
       m_dbusAddaptor(0),
+      m_currentAccount(0),
       m_syncing(false),
       m_aboutToQuit(false),
-      m_currentAccount(0)
+      m_firstClient(true)
 {
     m_provider = new ProviderTemplate();
     m_provider->load();
@@ -109,6 +110,16 @@
     }
 }
 
+void SyncDaemon::onClientAttached()
+{
+    if (m_firstClient) {
+        m_firstClient = false;
+        // accept eds changes
+        qDebug() << "First client connected, will auto-sync on next EDS change";
+        m_eds->setEnabled(true);
+     }
+}
+
 void SyncDaemon::onOnlineStatusChanged(bool isOnline)
 {
     Q_EMIT isOnlineChanged(isOnline);
@@ -221,13 +232,13 @@
         }
 
         m_dbusAddaptor = new SyncDBus(connection, this);
-        if (!connection.registerObject(SYNCMONITOR_OBJECT_PATH, this))
-        {
+        if (!connection.registerObject(SYNCMONITOR_OBJECT_PATH, this)) {
             qWarning() << "Could not register object!" << SYNCMONITOR_OBJECT_PATH;
             delete m_dbusAddaptor;
             m_dbusAddaptor = 0;
             return false;
         }
+        connect(m_dbusAddaptor, SIGNAL(clientAttached(int)), SLOT(onClientAttached()));
     }
     return true;
 }

=== modified file 'src/sync-daemon.h'
--- src/sync-daemon.h	2014-11-06 03:58:10 +0000
+++ src/sync-daemon.h	2014-11-06 03:58:10 +0000
@@ -72,6 +72,7 @@
     void onAccountEnableChanged(const QString &serviceName, bool enabled);
     void onAccountConfigured(const QString &serviceName);
     void onDataChanged(const QString &serviceName, const QString &sourceName);
+    void onClientAttached();
 
     void onOnlineStatusChanged(bool isOnline);
 
@@ -90,6 +91,7 @@
     bool m_syncing;
     bool m_aboutToQuit;
     QElapsedTimer m_syncElapsedTime;
+    bool m_firstClient;
 
     void setupAccounts();
     void setupTriggers();

=== modified file 'src/sync-dbus.cpp'
--- src/sync-dbus.cpp	2014-11-06 03:58:10 +0000
+++ src/sync-dbus.cpp	2014-11-06 03:58:10 +0000
@@ -23,7 +23,8 @@
 SyncDBus::SyncDBus(const QDBusConnection &connection, SyncDaemon *parent)
     : QDBusAbstractAdaptor(parent),
       m_parent(parent),
-      m_connection(connection)
+      m_connection(connection),
+      m_clientCount(0)
 {
     connect(m_parent, SIGNAL(syncStarted(SyncAccount*,QString)), SLOT(onSyncStarted(SyncAccount*,QString)));
     connect(m_parent, SIGNAL(syncFinished(SyncAccount*,QString)), SLOT(onSyncFinished(SyncAccount*,QString)));
@@ -77,6 +78,18 @@
     return m_parent->availableServices();
 }
 
+void SyncDBus::attach()
+{
+    m_clientCount++;
+    Q_EMIT clientAttached(m_clientCount);
+}
+
+void SyncDBus::detach()
+{
+    m_clientCount--;
+    Q_EMIT clientDeattached(m_clientCount);
+}
+
 void SyncDBus::onSyncStarted(SyncAccount *syncAcc, const QString &serviceName)
 {
     updateState();

=== modified file 'src/sync-dbus.h'
--- src/sync-dbus.h	2014-04-07 14:00:14 +0000
+++ src/sync-dbus.h	2014-11-06 03:58:10 +0000
@@ -63,6 +63,8 @@
 "    <method name=\"cancel\">\n"
 "      <arg direction=\"in\" type=\"as\"/>\n"
 "    </method>\n"
+"    <method name=\"attach\"/>\n"
+"    <method name=\"detach\"/>\n"
 "  </interface>\n"
         "")
     Q_PROPERTY(QString state READ state NOTIFY stateChanged)
@@ -78,6 +80,8 @@
     void syncError(const QString &account, const QString &service, const QString &error);
     void stateChanged();
     void enabledServicesChanged();
+    void clientAttached(int count);
+    void clientDeattached(int count);
 
 public Q_SLOTS:
     void sync(QStringList service);
@@ -85,6 +89,8 @@
     QString state() const;
     QStringList enabledServices() const;
     QStringList servicesAvailable();
+    void attach();
+    void detach();
 
 private Q_SLOTS:
     void onSyncStarted(SyncAccount *syncAcc, const QString &serviceName);
@@ -96,6 +102,7 @@
     SyncDaemon *m_parent;
     QDBusConnection m_connection;
     QString m_state;
+    int m_clientCount;
 };
 
 #endif

=== modified file 'tests/unittest/eds-helper-mock.h'
--- tests/unittest/eds-helper-mock.h	2014-04-10 20:39:20 +0000
+++ tests/unittest/eds-helper-mock.h	2014-11-06 03:58:10 +0000
@@ -37,7 +37,9 @@
 public:
     EdsHelperMock(QObject *parent = 0)
         : EdsHelper(parent, "memory", "memory")
-    {}
+    {
+        setEnabled(true);
+    }
 
 
     QtOrganizer::QOrganizerManager *organizerEngine()

=== removed directory 'upstart'
=== removed file 'upstart/CMakeLists.txt'
--- upstart/CMakeLists.txt	2014-02-18 15:22:19 +0000
+++ upstart/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-project(synq-upstart)
-
-configure_file(sync-monitor.conf.in ${CMAKE_CURRENT_BINARY_DIR}/sync-monitor.conf)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sync-monitor.conf
-    DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/upstart/sessions
-)

=== removed file 'upstart/sync-monitor.conf.in'
--- upstart/sync-monitor.conf.in	2014-04-08 20:18:27 +0000
+++ upstart/sync-monitor.conf.in	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-description "sync-monitor"
-author "Renato Oliveira Filho <[e-mail]>"
-
-start on started address-book-service
-stop on session-end
-
-respawn
-
-exec @CMAKE_INSTALL_FULL_LIBDIR@/sync-monitor/sync-monitor