Merge lp:~ken-vandine/webapps-core/facebook-userscript into lp:webapps-core

[Ken VanDine]

Implements a share handler in the facebook webapp.

Implements a share handler in the facebook webapp. This requires updates[1] to unity-webapps-qml to be fully functional.

[1] https://code.launchpad.net/~abreu-alexandre/unity-webapps-qml/add-content-hub-share

=== added directory 'webapp-facebook/content-hub'
=== added file 'webapp-facebook/content-hub/webapp-facebook.json'
--- webapp-facebook/content-hub/webapp-facebook.json	1970-01-01 00:00:00 +0000
+++ webapp-facebook/content-hub/webapp-facebook.json	2014-06-20 21:39:29 +0000
@@ -0,0 +1,5 @@
+{
+    "share": [
+        "pictures"
+    ]
+}
 
=== modified file 'webapp-facebook/manifest.json'
--- webapp-facebook/manifest.json	2014-06-20 13:54:52 +0000
+++ webapp-facebook/manifest.json	2014-06-20 21:39:29 +0000
@@ -1,11 +1,12 @@
 {
     "description": "Facebook (webapp version)",
-    "framework": "ubuntu-sdk-14.04-dev1",
+    "framework": "ubuntu-sdk-14.10-dev1",
     "architecture": "all",
     "hooks": {
         "webapp-facebook": {
             "account-application": "webapp-facebook.application",
-            "account-service": "facebook-webapp.service",
+            "content-hub": "content-hub/webapp-facebook.json",
+            "account-service": "webapp-facebook.service",
             "apparmor": "webapp-facebook.json",
             "desktop": "webapp-facebook.desktop"
         }
@@ -13,6 +14,5 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-facebook",
     "title": "webapp-facebook",
-    "version": "1.0.13"
+    "version": "1.0.13.2"
 }
-
 
=== added directory 'webapp-facebook/unity-webapps-facebook'
=== added file 'webapp-facebook/unity-webapps-facebook/HubSharer.qml'
--- webapp-facebook/unity-webapps-facebook/HubSharer.qml	1970-01-01 00:00:00 +0000
+++ webapp-facebook/unity-webapps-facebook/HubSharer.qml	2014-06-20 21:39:29 +0000
@@ -0,0 +1,65 @@
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Content 0.1
+
+Item {
+    id: main
+    anchors.fill: parent
+
+    signal completed(string result, var uploadCompletedCallback)
+
+    property string fileToShare
+
+    function _callback(accessToken, fileToShare, message, uploadCompletedCallback) {
+
+        itemComp.url = fileToShare;
+        var dataUri = itemComp.toDataURI();
+	var result = {accessToken: accessToken,
+            fileToShare: dataUri.toString(),
+            message: message};
+
+        completed(JSON.stringify(result), uploadCompletedCallback);
+    }
+
+    ContentItem {
+        id: itemComp
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: UbuntuColors.lightGrey
+
+        Image {
+            id: background
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+            source: Qt.resolvedUrl("assets/background_full.png")
+        }
+    }
+
+    Share {
+        id: share
+        anchors.fill: parent
+        visible: true
+        fileToShare: main.fileToShare
+        callback: _callback
+        provider: "facebook"
+        onCanceled: {
+            completed(JSON.stringify({status: "cancelled"}), uploadCompleted);
+            parent.destroy();
+        }
+        onUploadCompleted: {
+            console.log (success);
+            /* if the upload was successful, we need to destroy the parent */
+            if (success) {
+                parent.destroy();
+            } else {
+                console.error ("Upload failed");
+                /* FIXME: Display a message to the user */
+            }
+        }
+    }
+}
 
=== added file 'webapp-facebook/unity-webapps-facebook/Share.qml'
--- webapp-facebook/unity-webapps-facebook/Share.qml	1970-01-01 00:00:00 +0000
+++ webapp-facebook/unity-webapps-facebook/Share.qml	2014-06-20 21:39:29 +0000
@@ -0,0 +1,383 @@
+/*
+ * 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
+import Ubuntu.OnlineAccounts.Client 0.1
+
+Item {
+    id: root
+    anchors.fill: parent
+    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;
+        }
+    }
+
+    Item {
+        id: shareComponent
+        objectName: "shareComponent"
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        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"
+
+                TextArea {
+                    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);
+                    }
+                }
+            }
+
+            // toggle to enable including location - Not implemented yet
+            /*
+            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"
+            }
+            */
+            // End location toggle
+
+        }
+
+        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
+            visible: !listView.visible
+            model: accounts
+            header: ListItem.Header {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                text: i18n.tr("Select account")
+            }
+            delegate: acctDelegate
+        }
+
+        ListView {
+            id: listView
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: parent.right
+            }
+            height: childrenRect.height
+            header: headerComponent
+            model: providerModel
+            visible: accounts.count === 0
+            delegate: providerDelegate
+
+            Component {
+                id: headerComponent
+                ListItem.Header {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    text: i18n.tr("No online accounts configured")
+                }
+            }
+
+            Component {
+                id: providerDelegate
+                Item {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: childrenRect.height
+                    ListItem.Standard {
+                        text: model.displayName
+                        iconName: model.iconName
+                        onClicked: {
+                            setup.providerId = providerId
+                            setup.exec()
+                        }
+                    }
+                }
+            }
+
+
+            ProviderModel {
+                id: providerModel
+                applicationId: "com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook"
+            }
+
+            Setup {
+                id: setup
+                applicationId: "com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook"
+            }
+        }
+    }
+}
 
=== added directory 'webapp-facebook/unity-webapps-facebook/assets'
=== added file 'webapp-facebook/unity-webapps-facebook/assets/avatar_image.jpg'
 Binary files webapp-facebook/unity-webapps-facebook/assets/avatar_image.jpg	1970-01-01 00:00:00 +0000 and webapp-facebook/unity-webapps-facebook/assets/avatar_image.jpg	2014-06-20 21:39:29 +0000 differ
=== added file 'webapp-facebook/unity-webapps-facebook/assets/[e-mail]'
 Binary files webapp-facebook/unity-webapps-facebook/assets/[e-mail]	1970-01-01 00:00:00 +0000 and webapp-facebook/unity-webapps-facebook/assets/[e-mail]	2014-06-20 21:39:29 +0000 differ
=== added file 'webapp-facebook/unity-webapps-facebook/assets/icon_location.png'
 Binary files webapp-facebook/unity-webapps-facebook/assets/icon_location.png	1970-01-01 00:00:00 +0000 and webapp-facebook/unity-webapps-facebook/assets/icon_location.png	2014-06-20 21:39:29 +0000 differ
=== added file 'webapp-facebook/unity-webapps-facebook/facebook.user.js'
--- webapp-facebook/unity-webapps-facebook/facebook.user.js	1970-01-01 00:00:00 +0000
+++ webapp-facebook/unity-webapps-facebook/facebook.user.js	2014-06-20 21:39:29 +0000
@@ -0,0 +1,51 @@
+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, uploadCompletedCallback) {
+    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 ) {
+            uploadCompletedCallback(true);
+            window.location.reload();
+        } else {
+            uploadCompletedCallback(false);
+        }
+    };
+
+    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 'webapp-facebook/unity-webapps-facebook/manifest.json'
--- webapp-facebook/unity-webapps-facebook/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-facebook/unity-webapps-facebook/manifest.json	2014-06-20 21:39:29 +0000
@@ -0,0 +1,7 @@
+{
+    "name": "facebook",
+    "includes": ["https://*.facebook.com/*"],
+    "homepage": "https://m.facebook.com/",
+    "domain": "facebook.com",
+    "scripts": ["facebook.user.js"]
+}
 
=== modified file 'webapp-facebook/webapp-facebook.desktop'
--- webapp-facebook/webapp-facebook.desktop	2014-06-20 13:54:52 +0000
+++ webapp-facebook/webapp-facebook.desktop	2014-06-20 21:39:29 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webapp-container --enable-back-forward --popup-redirection-url-prefix=http://lm.facebook.com/l.php?u= --webappUrlPatterns=https?://*.facebook.com/* https://m.facebook.com/
+Exec=webapp-container --enable-back-forward  --popup-redirection-url-prefix=http://lm.facebook.com/l.php?u= --webapp='ZmFjZWJvb2s=' --webappModelSearchPath=. --webappUrlPatterns=https?://*.facebook.com/* https://m.facebook.com/
 Name=Facebook
 Icon=./facebook.png
 X-Ubuntu-Touch=true
 
=== modified file 'webapp-facebook/webapp-facebook.json'
--- webapp-facebook/webapp-facebook.json	2014-04-10 21:52:56 +0000
+++ webapp-facebook/webapp-facebook.json	2014-06-20 21:39:29 +0000
@@ -2,11 +2,12 @@
   "template": "ubuntu-webapp",
   "policy_groups": [    
     "networking",
+    "accounts",
     "audio",
     "video",
     "webview",
     "location",
     "content_exchange"
   ],
-  "policy_version": 1.1
+  "policy_version": 1.2
 }
 
=== renamed file 'webapp-facebook/facebook-webapp.service' => 'webapp-facebook/webapp-facebook.service'