Merge lp:~stolowski/unity-scopes-shell/set-connectivity-status-of-actionmetadata into lp:unity-scopes-shell

[Paweł Stołowski]

Set internet connectivity status in ActionMetadata (previews and preview actions).

Set internet connectivity status in ActionMetadata (previews and preview actions). We currently only do this for SearchMetadata.

[Michi Henning (michihenning)]

Looks good to me, but someone who knows the shell code better should look it over too. Thanks for persisting with this!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/458/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/152
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/152
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/152/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/152
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-amd64-ci/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-armhf-ci/115/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-wily-i386-ci/115/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/458/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Ah, my bad. I totally neglected to consider providing connectivity status via ActionMetadata as well. Thanks Pawel!

review: Approve

[lp:~stolowski/unity-scopes-shell/set-connectivity-status-of-actionmetadata]

307. By Paweł Stołowski on 2016-05-06

Merged trunk

=== modified file 'src/Unity/previewmodel.cpp'
--- src/Unity/previewmodel.cpp	2016-05-05 09:40:58 +0000
+++ src/Unity/previewmodel.cpp	2016-05-06 07:32:24 +0000
@@ -548,6 +548,9 @@
 
         QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : QStringLiteral("phone"));
         scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
+        if (m_associatedScope) {
+            metadata.set_internet_connectivity(m_associatedScope->networkManager().isOnline() ? scopes::SearchMetadata::Connected : scopes::SearchMetadata::Disconnected);
+        }
         if (!extra_data.is_null()) {
             metadata.set_scope_data(extra_data);
         }
@@ -594,6 +597,9 @@
             QString formFactor(m_associatedScope ? m_associatedScope->formFactor() : QStringLiteral("phone"));
             scopes::ActionMetadata metadata(QLocale::system().name().toStdString(), formFactor.toStdString());
             metadata.set_scope_data(qVariantToScopeVariant(data));
+            if (m_associatedScope) {
+                metadata.set_internet_connectivity(m_associatedScope->networkManager().isOnline() ? scopes::SearchMetadata::Connected : scopes::SearchMetadata::Disconnected);
+            }
 
             if (m_lastActivation) {
                 m_lastActivation->invalidate();

=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2016-05-05 09:41:13 +0000
+++ src/Unity/scope.cpp	2016-05-06 07:32:24 +0000
@@ -1435,4 +1435,9 @@
     }
 }
 
+const QNetworkConfigurationManager& Scope::networkManager() const
+{
+    return m_network_manager;
+}
+
 } // namespace scopes_ng

=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2016-05-05 09:41:13 +0000
+++ src/Unity/scope.h	2016-05-06 07:32:24 +0000
@@ -180,6 +180,8 @@
 
     void setSearchQueryString(const QString& search_query);
 
+    const QNetworkConfigurationManager& networkManager() const;
+
 public Q_SLOTS:
     void invalidateChildScopes();
     void invalidateResults();