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

[Alexandre Abreu]

Add share cpability

Add share cpability

Unmerged revisions

122. By Alexandre Abreu on 2014-05-23

expand

=== added directory 'examples/facebook-share'
=== added file 'examples/facebook-share/bla.qml'
--- examples/facebook-share/bla.qml	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/bla.qml	2014-06-10 12:45:47 +0000
@@ -0,0 +1,13 @@
+import QtQuick 2.0;
+
+//import "/home/ken/work/phablet/content-hub/14.10/content-hub-share/examples/facebook-share/unity-webapps-facebook" as Sharer
+import "unity-webapps-facebook" as Sharer
+
+Sharer.HubSharer {
+  width: 800
+  height: 500
+  
+  fileToShare: 'file:///home/ken/.cache/com.ubuntu.developer.webapps.webapp-facebook/HubIncoming/14/ubuntu-varsity-red-1920x1200.png';
+  visible: true;
+}
+

=== added directory 'examples/facebook-share/content-hub'
=== added file 'examples/facebook-share/content-hub/content-hub-exporter.json'
--- examples/facebook-share/content-hub/content-hub-exporter.json	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/content-hub/content-hub-exporter.json	2014-06-10 12:45:47 +0000
@@ -0,0 +1,5 @@
+{
+    "source": [
+        "pictures"
+    ]
+}

=== added file 'examples/facebook-share/facebook-webapp.service'
--- examples/facebook-share/facebook-webapp.service	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/facebook-webapp.service	2014-06-10 12:45:47 +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>

=== 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-10 12:45:47 +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-10 12:45:47 +0000
@@ -0,0 +1,19 @@
+{
+    "description": "Facebook (webapp version)",
+    "framework": "ubuntu-sdk-14.04-dev1",
+    "architecture": "all",
+    "hooks": {
+        "webapp-facebook": {
+            "account-application": "webapp-facebook.application",
+            "content-hub": "content-hub/content-hub-exporter.json",
+            "account-service": "facebook-webapp.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.13"
+}
+

=== 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-10 12:45:47 +0000
@@ -0,0 +1,80 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.Extras.Browser 0.1
+
+
+/*!
+    \brief MainView with a Label and Button elements.
+*/
+
+Item {
+    id: main
+    // objectName for functional testing purposes (autopilot-qt5)
+    //objectName: "mainView"
+
+    // Note! applicationName needs to match the "name" field of the click manifest
+    //applicationName: "com.ubuntu.developer.ken-vandine.hub-sharer"
+
+    /*
+     This property enables the application to change orientation
+     when the device is rotated. The default is false.
+    */
+    //automaticOrientation: true
+
+    width: parent.width
+    height: parent.height
+    anchors.fill: parent
+
+    signal completed(string result)
+
+    property string fileToShare: "/home/ken/Pictures/Ubuntu_TV.png"
+
+    function _callback(accessToken, fileToShare, message, cb) {
+        print ("_callback: " + accessToken);
+        print ("_callback: " + fileToShare);
+        print ("_callback: " + message);
+        webview.experimental.postMessage(JSON.stringify({file: fileToShare, token: accessToken}));
+    }
+
+    UbuntuWebView {
+        id: webview
+
+        url: Qt.resolvedUrl("uploader.html")
+
+        experimental.onMessageReceived: {
+            completed("[]");
+        }
+
+        experimental.preferences.offlineWebApplicationCacheEnabled: true
+        experimental.preferences.universalAccessFromFileURLsAllowed: true
+        experimental.preferences.navigatorQtObjectEnabled: true
+
+        // port in QTWEBKIT_INSPECTOR_SERVER enviroment variable
+        experimental.preferences.developerExtrasEnabled: true
+    }
+
+    //PageStack {
+    //    id: pageStack
+    //    Component.onCompleted: push(sharePage)
+
+        //Page {
+        //    id: sharePage
+        //    anchors.fill: parent
+        //    visible: true
+        //    title: i18n.tr("Hub Share")
+
+            Share {
+                anchors.fill: parent
+                visible: true
+                fileToShare: main.fileToShare
+                callback: _callback
+                provider: "facebook"
+                onCanceled: print ("canceled")
+                onUploadCompleted: print (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-10 12:45:47 +0000
@@ -0,0 +1,303 @@
+/*
+ * 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: "sharing"
+    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");
+    }
+
+    Component.onCompleted: print ("Root completed " + height + " : " + width)
+
+    AccountServiceModel {
+        id: accounts
+        serviceType: root.serviceType
+        provider: root.provider
+    }
+
+    Rectangle {
+        id: shareComponent
+        objectName: "shareComponent"
+        anchors.fill: parent
+        color: Theme.palette.normal.background
+        visible: false
+
+        Component.onCompleted: print ("shareComponent completed " + height + " : " + width)
+
+        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;
+            print ("sharemenu completed " + height + " : " + width);
+        }
+        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);
+                    }
+                    Component.onCompleted: print ("KEN: " + service.provider.displayName + " height: " + height + " y: " + y + " visible: " + visible)
+                }
+            }
+        }
+
+        ListView {
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+            height: childrenRect.height
+            interactive: false
+            model: accounts
+            delegate: acctDelegate
+            Component.onCompleted: print ("listview completed " + height + " : " + width)
+        }
+    }
+}

=== 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-10 12:45:47 +0000
@@ -0,0 +1,72 @@
+var api = external.getUnityObject('1.0');
+
+var oa = api.OnlineAccounts;
+var hub = api.ContentHub;
+
+function _shareRequested(transfer) {
+    transfer.items(function(items) {
+        api.launchEmbeddedUI("HubSharer", upload, {"fileToShare": items[0]});
+    });
+};
+hub.onShareRequested(_shareRequested);
+
+function upload(res) {
+    var results = JSON.parse(res);
+    //console.log (results);
+    console.log (results.accessToken);
+    var xhr = new XMLHttpRequest();
+    xhr.open( 'POST', 'https://graph.facebook.com/me/photos?access_token=' + results.accessToken, true );
+    xhr.onload = xhr.onerror = function() {
+        console.log( xhr.responseText );
+    };
+
+    //var xhrr = new XMLHttpRequest();
+    //var re = /file:\/\//gi;
+    //var file = results.fileToShare.replace(re, '');
+    //console.log ("FILE: " + results.fileToShare);
+    console.log('file to share lenght: ' + [].slice.call(results.fileToShare).length)
+
+    console.log(results.fileToShare)
+
+    console.log("After atob: " + atob(results.fileToShare))
+
+    var bin = atob(results.fileToShare);
+    var a = new Uint8Array(results.contentlength);
+
+    console.log('results.length: ' + results.size)
+
+    for (var i = 0; i < results.size; ++i) {
+	a[i] = bin.charCodeAt(i);
+    }
+
+    console.log("array buffer content: " + btoa(a.buffer))
+
+    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([a], {type: "image/png"});
+
+    console.log('blob size: ' + blob.size)
+    console.log(blob.type)
+
+    var uploadForm = document.forms.namedItem("uploadForm");
+    var formData = new FormData(uploadForm);
+    formData.append('source', blob);
+    xhr.send(formData);
+
+    /*
+    xhrr.open("GET", results.fileToShare, true);
+    xhrr.responseType = "blob";
+    xhrr.onload = function (e) {
+        var blob = new Blob([xhrr.response], {type: "image/png"});
+        var formData = new FormData();
+        formData.append('source', blob);
+        formData.append('message', results.message);
+        xhr.send(formData);
+    }
+    xhrr.send();
+    */
+}
+
+

=== 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-10 12:45:47 +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/unity-webapps-facebook/uploader.html'
--- examples/facebook-share/unity-webapps-facebook/uploader.html	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/unity-webapps-facebook/uploader.html	2014-06-10 12:45:47 +0000
@@ -0,0 +1,15 @@
+<html>
+<head>
+<script src="./uploader.js"></script>
+</head>
+<body>
+
+  <div>
+  <form enctype="multipart/form-data" method="post" id="uploadForm">
+    <textarea id="message" name="message" rows="5" style="height: auto; width: 600px;" placeholder="What's on your mind?">
+    </textarea>
+  </form>
+  </div>
+
+<body>
+</html>

=== added file 'examples/facebook-share/unity-webapps-facebook/uploader.js'
--- examples/facebook-share/unity-webapps-facebook/uploader.js	1970-01-01 00:00:00 +0000
+++ examples/facebook-share/unity-webapps-facebook/uploader.js	2014-06-10 12:45:47 +0000
@@ -0,0 +1,34 @@
+/**
+ * Wait before the DOM has been loaded before initializing the Ubuntu UI layer
+ */
+navigator.qt.onmessage = function(message) {
+    var data = null;
+    try {
+        data = JSON.parse(message.data);
+    } catch (error) {
+        return;
+    }
+    upload(data.file, data.token);
+}
+
+function upload(file, token) {
+    // FIXME: we should submit multiples if we can
+    var xhr = new XMLHttpRequest();
+    xhr.open( 'POST', 'https://graph.facebook.com/me/photos?access_token=' + token, true );
+    xhr.onload = xhr.onerror = function() {
+	navigator.qt.postMessage(JSON.stringify({}));
+    };
+
+    var xhrr = new XMLHttpRequest();
+    xhrr.open("GET", file, true);
+    xhrr.responseType = "blob";
+    xhrr.onload = function (e) {
+        var blob = new Blob([xhrr.response], {type: "image/png"});
+        var uploadForm = document.forms.namedItem("uploadForm");
+        var formData = new FormData(uploadForm);
+        formData.append('source', blob);
+        xhr.send(formData);
+    }
+    xhrr.send();
+}
+

=== 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-10 12:45:47 +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-10 12:45:47 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Terminal=false
+Exec=webapp-container --enable-back-forward --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-10 12:45:47 +0000
@@ -0,0 +1,13 @@
+{
+  "template": "ubuntu-webapp",
+  "policy_groups": [    
+    "networking",
+    "audio",
+    "video",
+    "webview",
+    "location",
+    "content_exchange",
+    "content_exchange_source"
+  ],
+  "policy_version": 1.1
+}

=== 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-10 12:45:47 +0000
@@ -413,6 +413,27 @@
         return null;
     }
 
+    /*!
+      \internal
+
+     */
+    function __getPolicyForContent(settings) {
+        // TODO: review this
+        function PassthroughPolicy() {};
+        PassthroughPolicy.prototype.allowed = function(signature) {
+            return true;
+        };
+        function RestrictedPolicy(restrictions) {
+            this.restrictions = restrictions || [];
+        };
+        RestrictedPolicy.prototype.allowed = function(signature) {
+            return this.restrictions.some(function(e) { return e == signature; });
+        };
+
+        if (injectExtraUbuntuApis)
+            return new PassthroughPolicy();
+        return new RestrictedPolicy(["ContentHub.onShareRequested"])
+    }
 
     /*!
       \internal
@@ -524,6 +545,59 @@
                 UnityBackends.get("hud").clearActions();
             },
 
+            launchEmbeddedUI: function(name, callback, params) {
+                if ( ! model) {
+                    print ("No model");
+                    return;
+                }
+
+                // TODO validate
+                var path = model.path(webapps.name);
+                console.debug ("PATH: " + path);
+                if (! path || path.length == 0)
+                    return;
+
+                var backendDelegate = UnityBackends.backendDelegate;
+
+                var parentItem = backendDelegate.parentView();
+                if ( ! parentItem || ! parentItem.visible || ! parentItem.height || ! parentItem.width) {
+                    console.debug("Cannot launch the content peer picker UI, invalid parent item: " + parentItem);
+                    callback({result: "cancelled"});
+                    return;
+                }
+
+                var p = parentItem.parent ? parentItem.parent : parentItem
+
+                var c;
+                function oncreated() {
+                          //if (p) {
+                          //  p.visible = false;
+                          //}
+
+                  var ui = c.createObject(p, {"fileToShare": params.fileToShare.url, "visible": true});
+
+                  if ( ! ui.onCompleted) {
+                    ui.destroy();
+                    return;
+                  }
+
+                  function _onCompleted(data) {
+                    ui.visible = false;
+                    p.visible = true;
+                    ui.onCompleted.disconnect(_onCompleted);
+                    ui.destroy();
+                    callback(data);
+                  }
+                  ui.onCompleted.connect(_onCompleted);
+                };
+
+                c = Qt.createComponent(path + "/" + name + ".qml");
+                if (c.status == Component.Ready)
+                  oncreated()
+                else
+                  c.statusChanged.connect(oncreated)
+            },
+
             Notification: {
                 showNotification: function (summary, body, iconUrl) {
                     if (!initialized)
@@ -641,17 +715,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/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-10 12:45:47 +0000
@@ -24,7 +24,7 @@
  *
  */
 
-function createContentHubApi(backendDelegate) {
+function createContentHubApi(backendDelegate, accessPolicy) {
     var PLUGIN_URI = 'Ubuntu.Content';
     var VERSION = 0.1;
 
@@ -769,6 +769,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-10 12:45:47 +0000
@@ -836,6 +836,58 @@
                                [callback]);
         },
 
+        /**
+         * Sets a handler that is to be called when the current application is the
+         * target of an share request.
+         *
+         * @method onExportRequested
+         * @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: {
 
             /**

=== 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-10 12:45:47 +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-10 12:45:47 +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-10 12:45:47 +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-10 12:45:47 +0000
@@ -98,6 +98,12 @@
             clearActions: createArgumentsSanitizer (backend, [], 'clearActions'),
 
             /**
+             */
+            launchEmbeddedUI: function(name, callback, params) {
+                backend.call('launchEmbeddedUI', [name, callback, params]);
+            },
+
+            /**
              *
              * MediaPlayer API
              *