Merge lp:~3v1n0/ubuntu-push-qml/register-wait-for-network into lp:ubuntu-push-qml

[Marco Trevisan (Treviño)]

PushClient: only try to register if we're currently connected, or wait for connection

Without this, just including a push client inside an app fails all the times, and it's not easily possible to get a token as soon as we get online. See attached bug for more info and qml possible solutions.

[lp:~3v1n0/ubuntu-push-qml/register-wait-for-network]

18. By Marco Trevisan (Treviño) on 2015-03-11

PushClient: only try to register if we're currently connected, or wait for connection

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/ubuntu-push-qml-ci/37/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-push-qml-vivid-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-push-qml-vivid-armhf-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-push-qml-ci/37/rebuild

review: Needs Fixing (continuous-integration)

[lp:~3v1n0/ubuntu-push-qml/register-wait-for-network]

19. By Marco Trevisan (Treviño) on 2015-03-11

debian/control: add pkg-config as build-debpend

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/ubuntu-push-qml-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-push-qml-vivid-amd64-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-push-qml-vivid-armhf-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-push-qml-ci/38/rebuild

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-07 11:50:58 +0000
+++ CMakeLists.txt	2015-03-11 16:52:16 +0000
@@ -34,6 +34,9 @@
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Quick REQUIRED)
 
+find_package (PkgConfig)
+pkg_check_modules (CONNECTIVITY REQUIRED connectivity-qt1)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 

=== modified file 'debian/control'
--- debian/control	2014-08-14 09:59:55 +0000
+++ debian/control	2015-03-11 16:52:16 +0000
@@ -6,6 +6,8 @@
                dbus-test-runner,
                debhelper (>= 9),
                hardening-wrapper,
+               libconnectivity-qt1-dev,
+               pkg-config,
                python,
                qt5-default,
                qt5-qmake,

=== modified file 'src/Ubuntu/PushNotifications/CMakeLists.txt'
--- src/Ubuntu/PushNotifications/CMakeLists.txt	2014-10-23 19:15:41 +0000
+++ src/Ubuntu/PushNotifications/CMakeLists.txt	2015-03-11 16:52:16 +0000
@@ -15,6 +15,9 @@
 
 qt5_use_modules(${PLUGIN} Core Gui Qml DBus)
 
+include_directories(${CONNECTIVITY_INCLUDE_DIRS})
+target_link_libraries(${PLUGIN} ${CONNECTIVITY_LDFLAGS})
+
 file(GLOB QML_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.qml qmldir *.js)
 install(TARGETS ${PLUGIN} DESTINATION ${IMPORTS_DIR})
 install(FILES ${QML_FILES} DESTINATION ${IMPORTS_DIR})

=== modified file 'src/Ubuntu/PushNotifications/pushclient.cpp'
--- src/Ubuntu/PushNotifications/pushclient.cpp	2015-01-19 18:42:19 +0000
+++ src/Ubuntu/PushNotifications/pushclient.cpp	2015-03-11 16:52:16 +0000
@@ -29,20 +29,46 @@
 #define PUSH_IFACE "com.ubuntu.PushNotifications"
 #define POSTAL_IFACE "com.ubuntu.Postal"
 
+using ubuntu::connectivity::NetworkingStatus;
+
 PushClient::PushClient(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    ns(new NetworkingStatus())
 {
 }
 
-void PushClient::registerApp(const QString &appId) {
-    if (appId == this->appId || appId == "")
+void PushClient::setAppId(const QString &appId) {
+    if (appId == this->appId || appId.isEmpty())
         return;
 
     this->appId = appId;
+    emit appIdChanged(appId);
+
+    if (ns->status() == NetworkingStatus::Online) {
+        registerApp();
+    }
+    else {
+        QObject::disconnect(ns.data());
+        QObject::connect(ns.data(), SIGNAL(statusChanged(NetworkingStatus::Status)),
+                         this, SLOT(connectionStatusChanged(NetworkingStatus::Status)));
+    }
+}
+
+void PushClient::connectionStatusChanged(NetworkingStatus::Status status)
+{
+    if (status == NetworkingStatus::Online) {
+        QObject::disconnect(ns.data());
+        registerApp();
+    }
+}
+
+void PushClient::registerApp()
+{
+    if (appId.isEmpty())
+        return;
 
     pkgname = appId.split("_").at(0);
     pkgname = pkgname.replace(".","_2e").replace("-","_2d");
-    emit appIdChanged(appId);
 
     QString register_path(PUSH_PATH);
     register_path += "/" + pkgname;

=== modified file 'src/Ubuntu/PushNotifications/pushclient.h'
--- src/Ubuntu/PushNotifications/pushclient.h	2014-11-21 16:34:36 +0000
+++ src/Ubuntu/PushNotifications/pushclient.h	2015-03-11 16:52:16 +0000
@@ -21,6 +21,7 @@
 #include <QObject>
 #include <QString>
 #include <QStringList>
+#include <ubuntu/connectivity/networking-status.h>
 
 class QDBusPendingCallWatcher;
 
@@ -29,7 +30,7 @@
     Q_OBJECT
 public:
     explicit PushClient(QObject *parent = 0);
-    void registerApp(const QString &appid);
+    void setAppId(const QString &appid);
     QString getStatus() {return this->status;};
     QString getAppId();
     QString getToken();
@@ -37,7 +38,7 @@
     void setCount(int count);
     int getCount();
 
-    Q_PROPERTY(QString appId WRITE registerApp READ getAppId NOTIFY appIdChanged);
+    Q_PROPERTY(QString appId WRITE setAppId READ getAppId NOTIFY appIdChanged);
     Q_PROPERTY(QString token READ getToken NOTIFY tokenChanged);
     Q_PROPERTY(QStringList notifications NOTIFY notificationsChanged);
     Q_PROPERTY(QString status READ getStatus NOTIFY statusChanged);
@@ -64,8 +65,12 @@
     void popAllFinished(QDBusPendingCallWatcher *watcher);
     void setCounterFinished(QDBusPendingCallWatcher *watcher);
     void clearPersistentFinished(QDBusPendingCallWatcher *watcher);
+    void connectionStatusChanged(ubuntu::connectivity::NetworkingStatus::Status);
 
 private:
+    void registerApp();
+
+    QScopedPointer<ubuntu::connectivity::NetworkingStatus> ns;
     QString appId;
     QString pkgname;
     QString token;