Merge lp:~abreu-alexandre/unity-webapps-qml/add-content-hub-share into lp:unity-webapps-qml

[Alexandre Abreu]

add content share

add content share

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/134/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/20

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/134/rebuild

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/add-content-hub-share]

134. By Alexandre Abreu on 2014-06-26

fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/135/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-utopic-armhf-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/135/rebuild

review: Approve (continuous-integration)

=== added directory 'examples/facebook-share'
=== added directory 'examples/facebook-share/content-hub'
=== added file 'examples/facebook-share/content-hub/webapp-facebook.json'
--- examples/facebook-share/content-hub/webapp-facebook.json	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/content-hub/webapp-facebook.json	2014-06-26 01:46:50 +0000
@@ -0,0 +1,5 @@
+{
+    "share": [
+        "pictures"
+    ]
+}

=== added file 'examples/facebook-share/facebook.png'
Binary files examples/facebook-share/facebook.png	1970-01-01 00:00:00 +0000 and examples/facebook-share/facebook.png	2014-06-26 01:46:50 +0000 differ
=== added file 'examples/facebook-share/manifest.json'
--- examples/facebook-share/manifest.json	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/manifest.json	2014-06-26 01:46:50 +0000
@@ -0,0 +1,18 @@
+{
+    "description": "Facebook (webapp version)",
+    "framework": "ubuntu-sdk-14.10-dev1",
+    "architecture": "all",
+    "hooks": {
+        "webapp-facebook": {
+            "account-application": "webapp-facebook.application",
+            "content-hub": "content-hub/webapp-facebook.json",
+            "account-service": "webapp-facebook.service",
+            "apparmor": "webapp-facebook.json",
+            "desktop": "webapp-facebook.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-facebook",
+    "title": "webapp-facebook",
+    "version": "1.0.17.4"
+}

=== added directory 'examples/facebook-share/unity-webapps-facebook'
=== added file 'examples/facebook-share/unity-webapps-facebook/HubSharer.qml'
--- examples/facebook-share/unity-webapps-facebook/HubSharer.qml	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/unity-webapps-facebook/HubSharer.qml	2014-06-26 01:46:50 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Content 0.1
+
+Item {
+    id: main
+    anchors.fill: parent
+
+    signal completed(string result)
+
+    property string fileToShare
+
+    function _callback(accessToken, fileToShare, message, cb) {
+        print ("_callback: " + accessToken);
+        print ("_callback: " + fileToShare);
+        print ("_callback: " + message);
+
+        itemComp.url = fileToShare;
+        var dataUri = itemComp.toDataURI();
+	var result = {accessToken: accessToken,
+            fileToShare: dataUri.toString(),
+            message: message};
+
+        completed(JSON.stringify(result));
+    }
+
+    ContentItem {
+        id: itemComp
+    }
+
+    Share {
+        anchors.fill: parent
+        visible: true
+        fileToShare: main.fileToShare
+        callback: _callback
+        provider: "facebook"
+        onCanceled: completed(JSON.stringify({status: "cancelled"}))
+        onUploadCompleted: console.log (success)
+        Component.onCompleted: print ("Page completed " + height + " : " + width)
+    }
+}

=== added file 'examples/facebook-share/unity-webapps-facebook/Share.qml'
--- examples/facebook-share/unity-webapps-facebook/Share.qml	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/unity-webapps-facebook/Share.qml	2014-06-26 01:46:50 +0000
@@ -0,0 +1,323 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+
+Rectangle {
+    id: root
+    anchors.fill: parent
+    color: Theme.palette.normal.background
+    property string fileToShare
+    property var callback
+    property string serviceType: "webapps"
+    property string provider: "facebook"
+    property string userAccountId
+    property string accessToken
+    property var account
+    signal accountSelected
+    signal canceled()
+    signal uploadCompleted(bool success)
+
+    onUploadCompleted: {
+        activitySpinner.visible = false;
+        if (success)
+            print ("Successfully posted");
+        else
+            print ("Failed to post");
+    }
+
+    AccountServiceModel {
+        id: accounts
+        serviceType: root.serviceType
+        provider: root.provider
+        Component.onCompleted: {
+            if (count == 1) {
+                srv.objectHandle = get(0, "accountServiceHandle");
+            }
+        }
+    }
+
+    AccountService {
+        id: srv
+        onObjectHandleChanged: {
+            root.account = srv;
+            root.account.authenticate(null);
+        }
+        onAuthenticated: {
+            root.userAccountId = accountId;
+            root.accessToken = reply.AccessToken;
+            shareComponent.visible = true;
+            sharemenu.visible = false;
+        }
+    }
+
+
+    Rectangle {
+        id: shareComponent
+        objectName: "shareComponent"
+        anchors.fill: parent
+        color: Theme.palette.normal.background
+        visible: false
+
+        Column {
+            anchors.fill: parent
+            spacing: units.gu(1)
+
+            Item {
+                id: serviceHeader
+                y: 0
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.topMargin: units.gu(1)
+                anchors.leftMargin: units.gu(1)
+                anchors.rightMargin: units.gu(1)
+                height: childrenRect.height
+
+                ListItem.Subtitled {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    iconName: root.account.provider.iconName
+                    text: root.account.provider.displayName
+                    subText: root.account.displayName
+                    showDivider: false
+                }
+            }
+
+            ListItem.ThinDivider {}
+
+            UbuntuShape {
+                id: messageArea
+                objectName: "messageArea"
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.topMargin: units.gu(1)
+                anchors.leftMargin: units.gu(1)
+                anchors.rightMargin: units.gu(1)
+
+                height: units.gu(20)
+                color: "#f2f2f2"
+
+                TextEdit {
+                    id: message
+                    color: "#333333"
+                    anchors.top: parent.top
+                    anchors.left: snapshot.right
+                    anchors.bottom: parent.bottom
+                    anchors.margins: units.gu(1)
+                    wrapMode: Text.Wrap
+                    width: parent.width - snapshot.width -
+                           snapshot.anchors.margins * 2 -
+                           message.anchors.leftMargin - message.anchors.rightMargin
+                    clip: true
+                    font.pixelSize: FontUtils.sizeToPixels("medium")
+                    font.weight: Font.Light
+                    focus: true
+                }
+
+                ActivityIndicator {
+                    id: activitySpinner
+                    anchors.centerIn: message
+                    visible: false
+                    running: visible
+                }
+
+                UbuntuShape {
+                    id: snapshot
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.margins: units.gu(1)
+                    width: units.gu(10)
+                    height: units.gu(10)
+
+                    image: Image {
+                        source: fileToShare
+                        sourceSize.height: snapshot.height
+                        sourceSize.width: snapshot.width
+                        fillMode: Image.PreserveAspectCrop
+                    }
+                }
+            }
+
+            Item {
+                id: actionsBar
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.topMargin: units.gu(2)
+                anchors.leftMargin: units.gu(1)
+                anchors.rightMargin: units.gu(1)
+                height: childrenRect.height
+
+                Button {
+                    objectName: "cancelButton"
+                    anchors.left: parent.left
+                    text: i18n.dtr("ubuntu-ui-extras", "Cancel")
+                    color: "#cccccc"
+                    width: units.gu(10)
+                    height: units.gu(4)
+                    onClicked: canceled()
+                }
+
+                Button {
+                    objectName: "postButton"
+                    anchors.right: parent.right
+                    anchors.top: parent.top
+                    text: i18n.dtr("ubuntu-ui-extras", "Post")
+                    color: "#dd4814"
+                    width: units.gu(10)
+                    height: units.gu(4)
+                    enabled: !activitySpinner.visible
+                    onClicked: {
+                        activitySpinner.visible = true;
+                        callback(accessToken, fileToShare, message.text, uploadCompleted);
+                    }
+                }
+            }
+
+            UbuntuShape {
+                id: useLocation
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(1)
+                    topMargin: units.gu(1)
+                }
+                color: selected ? "#cccccc" : "transparent"
+                property bool selected: false
+                width: units.gu(4.5)
+                height: units.gu(4)
+
+                AbstractButton {
+                    anchors.fill: parent
+                    onClicked: parent.selected = !parent.selected
+                    Image {
+                        source: "assets/icon_location.png"
+                        anchors.centerIn: parent
+                        height: parent.height * 0.75
+                        fillMode: Image.PreserveAspectFit
+                        smooth: true
+                    }
+                }
+            }
+
+            Label {
+                anchors.left: useLocation.right
+                anchors.baseline: useLocation.top
+                anchors.baselineOffset: units.gu(3)
+                anchors.leftMargin: units.gu(1)
+                text: i18n.dtr("ubuntu-ui-extras", "Include location")
+                fontSize: "small"
+            }
+
+        }
+
+        states: [
+            State {
+                name: "landscape-with-keyborad"
+                PropertyChanges {
+                    target: serviceHeader
+                    y: - serviceHeader.height
+                }
+                PropertyChanges {
+                    target: messageArea
+                    height: units.gu(12)
+                }
+            }
+        ]
+
+        state: ((Screen.orientation === Qt.LandscapeOrientation) ||
+                (Screen.orientation === Qt.InvertedLandscapeOrientation)) &&
+               Qt.inputMethod.visible ? "landscape-with-keyborad" : ""
+    }
+
+    /* Menu listing online accounts */
+    Item {
+        id: sharemenu
+        anchors.fill: parent
+        visible: true
+
+        signal selected(string accountId, string token)
+
+        Component.onCompleted: {
+            visible = true;
+        }
+        onSelected: {
+            root.userAccountId = accountId;
+            root.accessToken = token;
+            shareComponent.visible = true;
+            sharemenu.visible = false;
+        }
+
+        Component {
+            id: acctDelegate
+            Item {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                AccountService {
+                    id: service
+                    objectHandle: accountServiceHandle
+                    onAuthenticated: {
+                        sharemenu.selected(accountId, reply.AccessToken);
+                    }
+                }
+
+                height: childrenRect.height
+
+                ListItem.Subtitled {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    text: service.provider.displayName
+                    subText: displayName
+                    iconName: service.provider.iconName
+                    __iconHeight: units.gu(5)
+                    __iconWidth: units.gu(5)
+
+                    onClicked: {                        
+                        root.account = service;
+                        root.account.authenticate(null);
+                    }
+                }
+            }
+        }
+
+        ListView {
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+            height: childrenRect.height
+            interactive: false
+            model: accounts
+            header: ListItem.Header {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                text: i18n.tr("Select account")
+            }
+            delegate: acctDelegate
+        }
+    }
+}

=== added directory 'examples/facebook-share/unity-webapps-facebook/assets'
=== added file 'examples/facebook-share/unity-webapps-facebook/assets/avatar_image.jpg'
Binary files examples/facebook-share/unity-webapps-facebook/assets/avatar_image.jpg	1970-01-01 00:00:00 +0000 and examples/facebook-share/unity-webapps-facebook/assets/avatar_image.jpg	2014-06-26 01:46:50 +0000 differ
=== added file 'examples/facebook-share/unity-webapps-facebook/assets/icon_location.png'
Binary files examples/facebook-share/unity-webapps-facebook/assets/icon_location.png	1970-01-01 00:00:00 +0000 and examples/facebook-share/unity-webapps-facebook/assets/icon_location.png	2014-06-26 01:46:50 +0000 differ
=== added file 'examples/facebook-share/unity-webapps-facebook/facebook.user.js'
--- examples/facebook-share/unity-webapps-facebook/facebook.user.js	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/unity-webapps-facebook/facebook.user.js	2014-06-26 01:46:50 +0000
@@ -0,0 +1,47 @@
+var api = external.getUnityObject('1.0');
+var hub = api.ContentHub;
+var activeTransfer;
+
+function _shareRequested(transfer) {
+    activeTransfer = transfer;
+    transfer.items(function(items) {
+	api.launchEmbeddedUI("HubSharer", upload, {"fileToShare": items[0]});
+    });
+};
+
+hub.onShareRequested(_shareRequested);
+
+function upload(res) {
+    var results = JSON.parse(res);
+    if (results.status == "cancelled")
+        activeTransfer.setState(hub.ContentTransfer.State.Aborted);
+
+    var xhr = new XMLHttpRequest();
+    xhr.open( 'POST', 'https://graph.facebook.com/me/photos?access_token=' + results.accessToken, true );
+    xhr.onload = xhr.onerror = function() {
+        if ( xhr.status == 200 )
+            window.location.reload();
+    };
+
+    var contentType = results.fileToShare.split(',')[0].split(':')[1];
+    var b64data = results.fileToShare.split(',')[1];
+
+    var byteCharacters = atob(b64data);
+    var byteNumbers = new Array(byteCharacters.length);
+    for (var i = 0; i < byteCharacters.length; i++) {
+        byteNumbers[i] = byteCharacters.charCodeAt(i);
+    }
+    var byteArray = new Uint8Array(byteNumbers);
+
+    var div = document.createElement('div');
+    div.innerHTML = '<form enctype="multipart/form-data" method="post" id="uploadForm"><textarea id="message" name="message"></textarea></form>';
+    document.getElementsByTagName('body')[0].appendChild(div);
+
+    var blob = new Blob([byteArray], {type: contentType});
+
+    var uploadForm = document.forms.namedItem("uploadForm");
+    var formData = new FormData(uploadForm);
+    formData.append('source', blob);
+    formData.append('message', results.message);
+    xhr.send(formData);
+}

=== added file 'examples/facebook-share/unity-webapps-facebook/manifest.json'
--- examples/facebook-share/unity-webapps-facebook/manifest.json	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/unity-webapps-facebook/manifest.json	2014-06-26 01:46:50 +0000
@@ -0,0 +1,7 @@
+{
+    "name": "facebook",
+    "includes": ["https://*.facebook.com/*"],
+    "homepage": "https://m.facebook.com/",
+    "domain": "facebook.com",
+    "scripts": ["facebook.user.js"]
+}

=== added file 'examples/facebook-share/webapp-facebook.application'
--- examples/facebook-share/webapp-facebook.application	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/webapp-facebook.application	2014-06-26 01:46:50 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application id="com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook">
+  <description>Facebook webapp</description>
+
+  <services>
+    <service id="com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook">
+      <description>Use the service in a webapp</description>
+    </service>
+  </services>
+
+</application>

=== added file 'examples/facebook-share/webapp-facebook.desktop'
--- examples/facebook-share/webapp-facebook.desktop	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/webapp-facebook.desktop	2014-06-26 01:46:50 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Terminal=false
+Exec=webapp-container --enable-back-forward --webapp='ZmFjZWJvb2s=' --webappModelSearchPath=. --webappUrlPatterns=https?://*.facebook.com/*
+Name=Facebook
+Icon=./facebook.png
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage
+X-Ubuntu-Single-Instance=true

=== added file 'examples/facebook-share/webapp-facebook.json'
--- examples/facebook-share/webapp-facebook.json	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/webapp-facebook.json	2014-06-26 01:46:50 +0000
@@ -0,0 +1,13 @@
+{
+  "template": "ubuntu-webapp",
+  "policy_groups": [    
+    "networking",
+    "accounts",
+    "audio",
+    "video",
+    "webview",
+    "location",
+    "content_exchange"
+  ],
+  "policy_version": 1.2
+}

=== added file 'examples/facebook-share/webapp-facebook.service'
--- examples/facebook-share/webapp-facebook.service	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/webapp-facebook.service	2014-06-26 01:46:50 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service id="com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook">
+  <type>webapps</type>
+  <name>Facebook Webapp</name>
+  <provider>facebook</provider>
+</service>

=== modified file 'src/Ubuntu/UnityWebApps/Settings.qml'
--- src/Ubuntu/UnityWebApps/Settings.qml	2014-01-17 15:51:27 +0000
+++ src/Ubuntu/UnityWebApps/Settings.qml	2014-06-26 01:46:50 +0000
@@ -23,5 +23,6 @@
      *
      */
     property bool injectExtraUbuntuApis: false
+    property bool injectExtraUILaunchCapabilities: false
     property bool requiresInit: true
 }

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-05-08 13:58:56 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-06-26 01:46:50 +0000
@@ -36,11 +36,12 @@
      * \param backends
      * \param userscriptContent
      */
-    function _UnityWebApps(parentItem, bindeeProxies) {
+    function _UnityWebApps(parentItem, bindeeProxies, accessPolicy) {
         this._injected_unity_api_path = Qt.resolvedUrl('unity-webapps-api.js');
         this._bindeeProxies = bindeeProxies;
         this._backends = null;
         this._userscripts = [];
+        this._accessPolicy = accessPolicy;
 
         this._bind();
     };
@@ -70,7 +71,6 @@
          */
         _bind: function () {
             var self = this;
-
             var cb = this._onMessageReceivedCallback.bind(self);
             self._bindeeProxies.messageReceivedConnect(cb);
 
@@ -147,6 +147,13 @@
                     var cb = this._wrapCallbackIds (message.callback);
                     params.push(cb);
                 }
+
+                var apiCallName = message.name;
+                if (this._accessPolicy && this._accessPolicy.allowed && !this._accessPolicy.allowed(apiCallName)) {
+                    console.error("Unauthorize API call blocked: " + apiCallName);
+                    return;
+                }
+
                 this._dispatchApiCall (message.name, params);
 
             } else if (target === UnityWebAppsUtils.UBUNTU_WEBAPPS_BINDING_OBJECT_METHOD_CALL_MESSAGE) {

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-05-16 16:29:35 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-06-26 01:46:50 +0000
@@ -115,21 +115,23 @@
 
 
     /*!
-      \qmlproperty UnityWebappsAppModel UnityWebApps::extraApisSource
-
-      An optional model used in conjunction with the 'name' property
-        as a location for looking up the desired webapps.
+      \qmlproperty bool UnityWebApps::injectExtraUbuntuApis
 
      */
     property alias injectExtraUbuntuApis: settings.injectExtraUbuntuApis
 
     /*!
-      \qmlproperty UnityWebappsAppModel UnityWebApps::extraApisSource
+      \qmlproperty bool UnityWebApps::injectExtraUILaunchCapabilities
+
+     */
+    property alias injectExtraUILaunchCapabilities: settings.injectExtraUILaunchCapabilities
+
+    /*!
+      \qmlproperty bool UnityWebApps::requiresInit
 
      */
     property alias requiresInit: settings.requiresInit
 
-
     /*!
       \qmlproperty UnityActions.Context UnityWebApps::actionsContext
 
@@ -139,7 +141,6 @@
      */
     property var actionsContext: null
 
-
     /*!
       \qmlproperty string UnityWebApps::_opt_backendProxies
 
@@ -152,6 +153,7 @@
 
     Settings {
         id: settings
+        injectExtraUILaunchCapabilities: name && name.length && name.length !== 0
     }
 
 /*
@@ -208,7 +210,7 @@
 
         var instance = new UnityWebAppsJs.UnityWebApps(webapps,
                                                        bindeeProxies,
-                                                       webappUserscripts);
+                                                       __getPolicyForContent(settings));
         internal.instance = instance;
 
         if (internal.backends)
@@ -413,6 +415,33 @@
         return null;
     }
 
+    /*!
+      \internal
+
+     */
+    function __getPolicyForContent(settings) {
+        function PassthroughPolicy() {};
+        PassthroughPolicy.prototype.allowed = function(signature) {
+            return true;
+        };
+
+        var BASIC_WEBAPPS_ALLOWED_APIS = ["init"];
+        function RestrictedPolicy(restrictions) {
+            this.restrictions = restrictions || BASIC_WEBAPPS_ALLOWED_APIS;
+        };
+        RestrictedPolicy.prototype.allowed = function(signature) {
+            return this.restrictions.some(function(e) { return e === signature; });
+        };
+
+        if (settings.injectExtraUbuntuApis)
+            return new PassthroughPolicy();
+
+//        if (settings.injectExtraUILaunchCapabilities)
+//            return new RestrictedPolicy(["launchEmbeddedUI", "ContentHub.onShareRequested"]);
+
+        // Inject only the basic init + api
+        return new PassthroughPolicy()
+    }
 
     /*!
       \internal
@@ -524,6 +553,53 @@
                 UnityBackends.get("hud").clearActions();
             },
 
+            launchEmbeddedUI: function(name, callback, params) {
+                if (!model || !webapps || !webapps.name) {
+                    console.error("launchEmbeddedUI: could not find a valid webapp model or webapp name");
+                    return;
+                }
+
+                var path = model.path(webapps.name);
+                if (!path || path.length === 0) {
+                    console.error("launchEmbeddedUI: Invalid or empty webapp path name");
+                    return;
+                }
+
+                var backendDelegate = UnityBackends.backendDelegate;
+
+                var parentItem = backendDelegate.parentView();
+                if (!parentItem || !parentItem.visible || !parentItem.height || !parentItem.width) {
+                    console.error("launchEmbeddedUI: Cannot launch the embedded UI, invalid or malformed parent item: " + parentItem);
+                    callback({result: "cancelled"});
+                    return;
+                }
+
+                var p = parentItem.parent ? parentItem.parent : parentItem
+
+                var uicomponent;
+                function onCreated() {
+                    var uiobject = uicomponent.createObject(p, {"fileToShare": params.fileToShare.url, "visible": true});
+                    if ( ! uiobject.onCompleted) {
+                        console.error("launchEmbeddedUI: The local UI component to be launched does not expose a mandatory 'completed' signal");
+                        uiobject.destroy();
+                        return;
+                    }
+                    function _onCompleted(data) {
+                        p.visible = true;
+                        uiobject.onCompleted.disconnect(_onCompleted);
+                        uiobject.destroy();
+                        callback(data);
+                    }
+                    uiobject.onCompleted.connect(_onCompleted);
+                };
+
+                var uicomponent = Qt.createComponent(path + "/" + name + ".qml");
+                if (uicomponent.status === Component.Ready)
+                    onCreated()
+                else
+                    uicomponent.statusChanged.connect(onCreated)
+            },
+
             Notification: {
                 showNotification: function (summary, body, iconUrl) {
                     if (!initialized)
@@ -641,17 +717,13 @@
                 }
             },
 
-            OnlineAccounts: __injectResourceIfExtraApisAreEnabled(function() {
-                return OnlineAccountsApiBackend.createOnlineAccountsApi(UnityBackends.backendDelegate)
-            }),
+            OnlineAccounts: OnlineAccountsApiBackend.createOnlineAccountsApi(UnityBackends.backendDelegate),
 
             Alarm: __injectResourceIfExtraApisAreEnabled(function() {
                 return AlarmApiBackend.createAlarmApi(UnityBackends.backendDelegate)
             }),
 
-            ContentHub:  __injectResourceIfExtraApisAreEnabled(function() {
-                return ContentHubApiBackend.createContentHubApi(UnityBackends.backendDelegate)
-            }),
+            ContentHub: ContentHubApiBackend.createContentHubApi(UnityBackends.backendDelegate),
 
             RuntimeApi:  __injectResourceIfExtraApisAreEnabled(function() {
                 return RuntimeApiBackend.createRuntimeApi(UnityBackends.backendDelegate)

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-06-13 15:04:58 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2014-06-26 01:46:50 +0000
@@ -62,10 +62,14 @@
     this.webview = webview;
     this.disposer = disposer;
     this.makeSignalDisconnecter = makeSignalDisconnecter;
+    this._userScriptInjected = false;
     this._WEBAPPS_USER_SCRIPT_CONTEXT = "oxide://UnityWebappsApi";
 }
 OxideWebviewAdapter.prototype = {
     injectUserScripts: function(userScriptUrls) {
+        if (this._userScriptInjected)
+            return;
+
         var context = this.webview.context;
 
         for (var i = 0; i < userScriptUrls.length; ++i) {
@@ -76,6 +80,7 @@
                     '; matchAllFrames: false; url: "' +  userScriptUrls[i] + '";' + scriptEnd;
             context.addUserScript(Qt.createQmlObject(statement, this.webview));
         }
+        this._userScriptInjected = true;
     },
     sendToPage: function (message) {
         this.webview.rootFrame.sendMessageNoReply(

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-05-08 13:01:07 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-06-26 01:46:50 +0000
@@ -24,7 +24,7 @@
  *
  */
 
-function createContentHubApi(backendDelegate) {
+function createContentHubApi(backendDelegate, accessPolicy) {
     var PLUGIN_URI = 'Ubuntu.Content';
     var VERSION = 0.1;
 
@@ -39,6 +39,8 @@
             "Documents": ContentHubBridge.ContentType.Documents,
             "Music": ContentHubBridge.ContentType.Music,
             "Contacts": ContentHubBridge.ContentType.Contacts,
+            "Videos": ContentHubBridge.ContentType.Videos,
+            "Links": ContentHubBridge.ContentType.Links,
         };
         return name in contentTypePerName ?
                     contentTypePerName[name]
@@ -57,6 +59,10 @@
             return "Music";
         else if (state === ContentHubBridge.ContentType.Contacts)
             return "Contacts";
+        else if (state === ContentHubBridge.ContentType.Videos)
+            return "Videos";
+        else if (state === ContentHubBridge.ContentType.Links)
+            return "Links";
         return "Unknown";
     };
 
@@ -146,6 +152,8 @@
             "Collected": ContentHubBridge.ContentTransfer.Collected,
             "Aborted": ContentHubBridge.ContentTransfer.Aborted,
             "Finalized": ContentHubBridge.ContentTransfer.Finalized,
+            "Downloading": ContentHubBridge.ContentTransfer.Downloading,
+            "Downloaded": ContentHubBridge.ContentTransfer.Downloaded,
         };
         return name in contentTransferStatePerName ?
                     contentTransferStatePerName[name]
@@ -166,6 +174,10 @@
             return "Aborted";
         else if (state === ContentHubBridge.ContentTransfer.Finalized)
             return "Finalized";
+        else if (state === ContentHubBridge.ContentTransfer.Downloading)
+            return "Downloading";
+        else if (state === ContentHubBridge.ContentTransfer.Downloaded)
+            return "Downloaded";
         return "<Unknown State>";
     };
 
@@ -769,6 +781,20 @@
             });
         },
 
+        onImportRequested: function(callback) {
+            _contenthub.onImportRequested.connect(function(importTransfer) {
+                var wrapped = new ContentTransfer(importTransfer);
+                callback(wrapped.serialize());
+            });
+        },
+
+        onShareRequested: function(callback) {
+            _contenthub.shareRequested.connect(function(shareTransfer) {
+                var wrapped = new ContentTransfer(shareTransfer);
+                callback(wrapped.serialize());
+            });
+        },
+
         // Internal
 
         dispatchToObject: function(infos) {

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-03-18 13:59:36 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-06-26 01:46:50 +0000
@@ -230,7 +230,7 @@
 /**
  * ContentPeer is an object returned by the ContentHub.
    It represents a remote peer that can be used in a request
-   to export or import date.
+   to import, export or share content.
 
  * @class ContentPeer
  * @module ContentHub
@@ -421,7 +421,7 @@
         // methods
 
         /**
-         * Request to import data from this ContentPeer.
+         * Request to exchange content with this ContentPeer.
          *
          * @method request
          * @param callback {Function(ContentTransfer)} Called with the resulting content transfer
@@ -431,7 +431,7 @@
         },
 
         /**
-         * Request to import data from this ContentPeer and use a ContentStore for permanent storage.
+         * Request to import content from this ContentPeer and use a ContentStore for permanent storage.
          *
          * @method requestForStore
          * @param store {ContentStore} Store used as a permanent storage
@@ -586,6 +586,10 @@
 
              Contacts
 
+             Videos
+
+             Links
+
          @static
          @property ContentType {String}
          
@@ -603,6 +607,8 @@
             Documents: "Documents",
             Music: "Music",
             Contacts: "Contacts",
+            Videos: "Videos",
+            Links: "Links",
         },
 
         /**
@@ -665,6 +671,10 @@
             Aborted: Transfer has been aborted.
 
             Finalized: Transfer has been finished and cleaned up.
+
+            Downloaded: Download specified by downloadId has completed.
+
+            Downloading: Transfer is downloading item specified by downloadId.
           
          @static
          @property ContentTransfer.State {String}
@@ -715,6 +725,12 @@
 
                 // Transfer has been finished and cleaned up.
                 Finalized: "Finalized",
+
+                // Transfer has finished downloading.
+                Downloaded: "Downloaded",
+
+                // Transfer is downloading.
+                Downloading: "Downloading",
             },
 
         /**
@@ -726,6 +742,8 @@
 
             Export
 
+            Share
+
          @static
          @property ContentTransfer.Direction {String}
          */
@@ -735,6 +753,9 @@
 
                 // Transfer is a request to export content
                 Export: "Export",
+
+                // Transfer is a request to share content
+                Share: "Share",
             },
 
         /**
@@ -836,6 +857,58 @@
                                [callback]);
         },
 
+        /**
+         * Sets a handler that is to be called when the current application is the
+         * target of an share request.
+         *
+         * @method onShareRequested
+         * @param callback {Function(ContentTransfer)} Function when one requests a resource to be shared.
+         *                                                          The corresponding ContentTransfer is provided as a parameter.
+         *
+         * @example
+
+            var api = external.getUnityObject(1.0);
+            var hub = api.ContentHub;
+
+            var transferState = hub.ContentTransfer.State;
+
+            function _shareRequested(transfer) {
+            };
+
+            hub.onShareRequested(_shareRequested);
+
+         */
+        onShareRequested: function(callback) {
+            backendBridge.call('ContentHub.onShareRequested',
+                               [callback]);
+        },
+
+        /**
+         * Sets a handler that is to be called when the current application is the
+         * target of an import request.
+         *
+         * @method onImportRequested
+         * @param callback {Function(ContentTransfer)} Function when one requests a resource to be imported.
+         *                                                          The corresponding ContentTransfer is provided as a parameter.
+         *
+         * @example
+
+            var api = external.getUnityObject(1.0);
+            var hub = api.ContentHub;
+
+            var transferState = hub.ContentTransfer.State;
+
+            function _importRequested(transfer) {
+            };
+
+            hub.onImportRequested(_importRequested);
+
+         */
+        onImportRequested: function(callback) {
+            backendBridge.call('ContentHub.onImportRequested',
+                               [callback]);
+        },
+
         api: {
 
             /**
@@ -843,7 +916,7 @@
              *
              * @method api.importContent
              * @param type {ContentType} type of the content to import
-             * @param peer {ContentPeer} peer whos content should be imported
+             * @param peer {ContentPeer} peer who's content should be imported
              * @param transferOptions {Object} a dictionary of transfer options. The options are the following:
              * - multipleFiles {Bool}: specified if a transfer should involve multiple files or not
              * - scope {ContentScope}: specifies the location where the transferred files should be copied to

=== modified file 'src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js'
--- src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js	2014-05-09 13:17:09 +0000
+++ src/Ubuntu/UnityWebApps/bindings/online-accounts/backend/online-accounts.js	2014-06-26 01:46:50 +0000
@@ -21,7 +21,7 @@
  * Online Accounts API backend binding
  *
  */
-function createOnlineAccountsApi(backendDelegate) {
+function createOnlineAccountsApi(backendDelegate, accessPolicy) {
     var PLUGIN_URI = 'Ubuntu.OnlineAccounts';
     var VERSION = 0.1;
 

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-05-14 01:41:14 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-06-26 01:46:50 +0000
@@ -156,6 +156,7 @@
         roles[Scripts] = "scripts";
         roles[Chrome] = "chrome";
         roles[UserAgentOverride] = "useragent";
+        roles[Path] = "path";
       }
     return roles;
 }
@@ -337,6 +338,21 @@
 }
 
 QString
+UnityWebappsAppModel::path(const QString & webappName) const {
+    if (!exists(webappName))
+        return QString();
+
+    int idx = getWebappIndex(webappName);
+    if (Q_UNLIKELY(idx == -1))
+    {
+        qDebug() << "Invalid index for a supposedly existing webapp: " << webappName;
+        return QString();
+    }
+
+    return data(idx, Path).toString();
+}
+
+QString
 UnityWebappsAppModel::userAgentOverrideFor(const QString & webappName) const
 {
     if (!exists(webappName))
@@ -543,6 +559,9 @@
 
     case UserAgentOverride:
         return webapp.data.manifest.userAgentOverride;
+
+    case Path:
+        return webapp.userscriptLocation;
     }
 
     return QVariant();

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2014-05-08 15:20:47 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.h	2014-06-26 01:46:50 +0000
@@ -58,7 +58,8 @@
         Scripts,
         ScriptsContent,
         Chrome,
-        UserAgentOverride
+        UserAgentOverride,
+        Path
     };
 
     // QAbstractListModel implementation
@@ -108,6 +109,11 @@
      */
     Q_INVOKABLE QString userAgentOverrideFor(const QString & webappName) const;
 
+    /*!
+     * \brief
+     */
+    Q_INVOKABLE QString path(const QString & webappName) const;
+
 
     /*!
      * \brief

=== modified file 'src/Ubuntu/UnityWebApps/unity-webapps-api.js.in'
--- src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-05-13 17:48:43 +0000
+++ src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-06-26 01:46:50 +0000
@@ -98,6 +98,12 @@
             clearActions: createArgumentsSanitizer (backend, [], 'clearActions'),
 
             /**
+             */
+            launchEmbeddedUI: function(name, callback, params) {
+                backend.call('launchEmbeddedUI', [name, callback, params]);
+            },
+
+            /**
              *
              * MediaPlayer API
              *