Merge lp:~abreu-alexandre/unity-webapps-qml/backport-oxide-contenthub-fixes-1409 into lp:unity-webapps-qml/rtm-14.09

[Alexandre Abreu]

Fix content hub getpeers()

Fix content hub getpeers()

In order to test:

- create an HTML5 app from Qtc,
- make sure that your apparmor profile has the content_exchange policy,
- replace the content of the index.html and js/app.js with the ones found here http://bazaar.launchpad.net/~webapps/unity-webapps-qml/trunk/files/head:/examples/api-bindings/content-hub/www/
- launch the application on the device,
- make sure that the application lists (including at least the Gallery app and the Camera app),

[lp:~abreu-alexandre/unity-webapps-qml/backport-oxide-contenthub-fixes-1409]

134. By Alexandre Abreu on 2015-01-14

Backport a testability improvement (webapps instrumentation) from trunk that allows some tests from external packages to run.

135. By CI Train Bot Account on 2015-01-14

Releasing 0.1+15.04.20150114~rtm-0ubuntu1

136. By Alexandre Abreu on 2015-02-18

fix content hub getpeers()

[Alexandre Abreu (abreu-alexandre)]

review: Approve

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-06-17 13:53:49 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2015-02-18 13:55:32 +0000
@@ -643,8 +643,7 @@
                 return;
             }
 
-            var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerModel {";
-            var filterParams = {};
+            var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerModel { ";
             if (filters.contentType) {
                 statement += " contentType: ContentType." + filters.contentType + ";";
             }
@@ -654,18 +653,14 @@
             statement += " }";
 
             var peerModel = Qt.createQmlObject(statement, backendDelegate.parent());
-            var onPeersFound = function() {
-                var peers = peerModel.peers;
+            var peers = peerModel.peers;
 
-                var wrappedPeers = [];
-                for (var i = 0; i < peers.length; ++i) {
-                    var wrappedPeer = new ContentPeer(peers[i]);
-                    wrappedPeers.push(wrappedPeer.serialize());
-                }
-                peerModel.onFindPeersCompleted.disconnect(onPeersFound);
-                callback(wrappedPeers);
-            };
-            peerModel.onFindPeersCompleted.connect(onPeersFound);
+            var wrappedPeers = [];
+            for (var i = 0; i < peers.length; ++i) {
+                var wrappedPeer = new ContentPeer(peers[i]);
+                wrappedPeers.push(wrappedPeer.serialize());
+            }
+            callback(wrappedPeers);
         },
 
         getStore: function(scope, callback) {
@@ -692,7 +687,6 @@
             }
 
             var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerPicker {";
-            var filterParams = {};
             if (filters.contentType) {
                 statement += " contentType: ContentType." + filters.contentType + "";
             }