Merge lp:~abreu-alexandre/webapps-core/share-contenthub-links into lp:webapps-core

[Alexandre Abreu]

Add link sharing

Add link sharing

depends on this branch:

lp:~abreu-alexandre/unity-webapps-qml/improve-embedded-ui-params-passing

[lp:~abreu-alexandre/webapps-core/share-contenthub-links]

113. By Alexandre Abreu on 2015-04-20

Added an initial selenium + autopilot test for a webapp. It runs locally, on qemu and on the phone.

114. By Alexandre Abreu on 2015-04-22

fix cookies data path

115. By Alexandre Abreu on 2015-04-23

bump g+

116. By Alexandre Abreu on 2015-04-30

Fix gplus

117. By Alexandre Abreu on 2015-04-30

allow ebay description page pattern

118. By Alexandre Abreu on 2015-04-30

Fix bad ebay webapp framework

119. By Alexandre Abreu on 2015-09-21

share content hub links

Unmerged revisions

=== modified file 'webapp-facebook/content-hub/webapp-facebook.json'
--- webapp-facebook/content-hub/webapp-facebook.json	2014-06-19 17:20:53 +0000
+++ webapp-facebook/content-hub/webapp-facebook.json	2015-09-21 14:46:23 +0000
@@ -1,5 +1,6 @@
 {
     "share": [
-        "pictures"
+        "pictures",
+        "links"
     ]
 }

=== modified file 'webapp-facebook/manifest.json'
--- webapp-facebook/manifest.json	2014-10-13 17:24:22 +0000
+++ webapp-facebook/manifest.json	2015-09-21 14:46:23 +0000
@@ -19,5 +19,5 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-facebook",
     "title": "Facebook",
-    "version": "1.0.26"
+    "version": "1.1"
 }

=== modified file 'webapp-facebook/unity-webapps-facebook/HubSharer.qml'
--- webapp-facebook/unity-webapps-facebook/HubSharer.qml	2014-07-28 18:35:35 +0000
+++ webapp-facebook/unity-webapps-facebook/HubSharer.qml	2015-09-21 14:46:23 +0000
@@ -8,6 +8,7 @@
 
     signal completed(string result, var resourceUploadCompletedCallback)
 
+    property string contentType
     property string fileToShare
 
     function _callback(accessToken,
@@ -15,13 +16,18 @@
 		       message,
 		       resourceUploadCompletedCallback) {
         itemComp.url = fileToShare;
+
         var dataUri = itemComp.toDataURI();
 	var result = {accessToken: accessToken,
             fileToShare: dataUri.toString(),
             message: message};
 
-        completed(JSON.stringify(result),
-                  function(result) { main.destroy(); resourceUploadCompletedCallback(result); });
+        completed(
+            JSON.stringify(result),
+            function(result) {
+                main.destroy();
+                resourceUploadCompletedCallback(result);
+            });
     }
 
     ContentItem {
@@ -45,16 +51,20 @@
 
     Share {
         id: share
+
         anchors.fill: parent
         visible: true
+
         fileToShare: main.fileToShare
+        contentType: main.contentType
         callback: _callback
-        provider: "facebook"
+
         onCanceled: {
             completed(JSON.stringify({status: "cancelled"}),
                       function(result) { uploadCompleted(result); });
             main.destroy();
         }
+
         onUploadCompleted: {
             /* if the upload was successful, we need to destroy the parent */
             if (success) {

=== modified file 'webapp-facebook/unity-webapps-facebook/Share.qml'
--- webapp-facebook/unity-webapps-facebook/Share.qml	2014-07-28 14:50:02 +0000
+++ webapp-facebook/unity-webapps-facebook/Share.qml	2015-09-21 14:46:23 +0000
@@ -24,13 +24,18 @@
 Item {
     id: root
     anchors.fill: parent
+
     property string fileToShare
+    property string contentType
     property var callback
-    property string serviceType: "webapps"
-    property string provider: "facebook"
+
+    readonly property string serviceType: "webapps"
+    readonly property string provider: "facebook"
+
     property string userAccountId
     property string accessToken
     property var account
+
     signal accountSelected
     signal canceled
     signal uploadCompleted(bool success)
@@ -142,14 +147,15 @@
 
                 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
+                        source: contentType === 'Pictures' ? fileToShare : "language-chooser"
                         sourceSize.height: snapshot.height
                         sourceSize.width: snapshot.width
                         fillMode: Image.PreserveAspectCrop

=== modified file 'webapp-facebook/unity-webapps-facebook/facebook.user.js'
--- webapp-facebook/unity-webapps-facebook/facebook.user.js	2015-03-12 21:41:16 +0000
+++ webapp-facebook/unity-webapps-facebook/facebook.user.js	2015-09-21 14:46:23 +0000
@@ -1,3 +1,20 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This file is part of webapps-core.
+ *
+ * webbrowser-app 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.
+ *
+ * webbrowser-app 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/>.
+ */
 
 var api = external.getUnityObject('1.0');
 var hub = api.ContentHub;
@@ -5,14 +22,28 @@
 
 function _shareRequested(transfer) {
     activeTransfer = transfer;
-    transfer.items(function(items) {
-	api.launchEmbeddedUI("HubSharer", upload, {"fileToShare": items[0]});
+
+    transfer.contentType(function(type) {
+        if (type === hub.ContentType.Pictures) {
+            transfer.items(function(items) {
+	        api.launchEmbeddedUI(
+                    "HubSharer",
+                    uploadPhoto,
+                    {"fileToShare": items[0], contentType: type});
+            });
+        } else if (type === hub.ContentType.Links) {
+            transfer.items(function(items) {
+	        api.launchEmbeddedUI(
+                    "HubSharer",
+                    uploadLink,
+                    {"fileToShare": items[0], contentType: type});
+            });
+        }
     });
 };
-
 hub.onShareRequested(_shareRequested);
 
-function upload(res, onResourceUploadedCallback) {
+function uploadPhoto(res, onResourceUploadedCallback) {
     var results = JSON.parse(res);
     if (results.status == "cancelled")
         activeTransfer.setState(hub.ContentTransfer.State.Aborted);
@@ -52,3 +83,42 @@
     xhr.send(formData);
 }
 
+function uploadLink(res, onResourceUploadedCallback) {
+    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/feed?'
+            + 'access_token=' + results.accessToken,
+        true);
+    xhr.onload = xhr.onerror = function() {
+        if (xhr.status === 200) {
+            window.location.reload();
+
+	    onResourceUploadedCallback(true);
+        }
+	else {
+	    onResourceUploadedCallback(false);
+	}
+    };
+
+    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 uploadForm = document.forms.namedItem("uploadForm");
+    var formData = new FormData(uploadForm);
+    formData.append('message', results.message);
+    formData.append('link', results.fileToShare);
+    xhr.send(formData);
+}
+

=== modified file 'webapp-googleplus/content-hub/webapp-googleplus.json'
--- webapp-googleplus/content-hub/webapp-googleplus.json	2015-03-18 16:50:37 +0000
+++ webapp-googleplus/content-hub/webapp-googleplus.json	2015-09-21 14:46:23 +0000
@@ -1,5 +1,6 @@
 {
     "share": [
-        "pictures"
+        "pictures",
+        "links"
     ]
 }

=== modified file 'webapp-googleplus/manifest.json'
--- webapp-googleplus/manifest.json	2015-04-30 21:01:24 +0000
+++ webapp-googleplus/manifest.json	2015-09-21 14:46:23 +0000
@@ -15,5 +15,5 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.googleplus",
     "title": "Google+",
-    "version": "0.6"
+    "version": "0.7"
 }

=== modified file 'webapp-googleplus/webview-override.qml'
--- webapp-googleplus/webview-override.qml	2015-04-30 21:01:24 +0000
+++ webapp-googleplus/webview-override.qml	2015-09-21 14:46:23 +0000
@@ -48,7 +48,7 @@
         activeTransfer = null
     }
 
-    function handleShareRequestForFileUris(uris) {
+    function handleShareRequestForFileUris(uris, contentType) {
         if ( ! activeTransfer) {
             return
         }
@@ -66,28 +66,50 @@
             activeFileUrisToShare = uris
 
             // TODO beware of async
-            defaultFilePicker = webview.filePicker
-            webview.filePicker = contentHubSharePassthroughPickerComponent
-
-            var request = webview.rootFrame.sendMessage(
-                "oxide://share-request-context/",
-                "EVALUATE-CODE",
-                {
-                    code: " var delayCount = 0;
-                            var id = window.setInterval(function() {
-                                if (document.querySelector('textarea') || delayCount > 10) {
-                                    window.clearInterval(id);
-                                    function clickUpload() {
-                                        document.querySelector('textarea').removeEventListener('focus', clickUpload)
-                                        document.querySelector('div:nth-child(3) > div > div > div > div > button').click();
-                                    }
-                                    if (delayCount <= 10) {
-                                        document.querySelector('textarea').addEventListener('focus', clickUpload);
+            if (contentType === ContentType.Pictures) {
+                defaultFilePicker = webview.filePicker
+                webview.filePicker = contentHubSharePassthroughPickerComponent
+                var request = webview.rootFrame.sendMessage(
+                    "oxide://share-request-context/",
+                    "EVALUATE-CODE",
+                    {
+                        code: " var delayCount = 0;
+                                var id = window.setInterval(function() {
+                                    if (document.querySelector('textarea') || delayCount > 10) {
+                                        window.clearInterval(id);
+                                        function clickUpload() {
+                                            document.querySelector('textarea').removeEventListener('focus', clickUpload)
+                                            document.querySelector('div:nth-child(3) > div > div > div > div > button').click();
+                                        }
+                                        if (delayCount <= 10) {
+                                            document.querySelector('textarea').addEventListener('focus', clickUpload);
+                                        }
                                     }
                                     ++delayCount;
-                                }
-                            }, 100);"
-                })
+                                }, 100);"
+                    })
+            } else if (contentType === ContentType.Links) {
+                var uristext = ''
+                for (var i = 0; i < uris.length; ++i) {
+                    uristext += uris[i] + " "
+                }
+
+                request = webview.rootFrame.sendMessage(
+                    "oxide://share-request-context/",
+                    "EVALUATE-CODE",
+                    {
+                        code: " var delayCount = 0;
+                                var id = window.setInterval(function() {
+                                    if (document.querySelector('textarea') || delayCount > 10) {
+                                        window.clearInterval(id);
+                                        if (delayCount <= 10) {
+                                            document.querySelector('textarea').value = '" + uristext + "';
+                                        }
+                                        ++delayCount;
+                                    }
+                                }, 100);"
+                    })
+            }
         }
 
     }
@@ -117,7 +139,7 @@
                 for (var i = 0; i < activeTransfer.items.length; ++i) {
                     uris.push(String(activeTransfer.items[i].url).replace("file://", ""))
                 }
-                handleShareRequestForFileUris(uris)
+                handleShareRequestForFileUris(uris, activeTransfer.contentType)
             }
 
             function onLoadProgressChanged() {

=== modified file 'webapp-twitter/content-hub/webapp-twitter.json'
--- webapp-twitter/content-hub/webapp-twitter.json	2015-02-23 15:58:11 +0000
+++ webapp-twitter/content-hub/webapp-twitter.json	2015-09-21 14:46:23 +0000
@@ -1,5 +1,6 @@
 {
     "share": [
-        "pictures"
+        "pictures",
+        "links"
     ]
 }

=== modified file 'webapp-twitter/manifest.json'
--- webapp-twitter/manifest.json	2015-03-30 14:10:28 +0000
+++ webapp-twitter/manifest.json	2015-09-21 14:46:23 +0000
@@ -19,6 +19,6 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-twitter",
     "title": "webapp-twitter",
-    "version": "1.1"
+    "version": "1.2"
 }
 

=== modified file 'webapp-twitter/unity-webapps-twitter/share.user.js'
--- webapp-twitter/unity-webapps-twitter/share.user.js	2015-03-31 13:27:16 +0000
+++ webapp-twitter/unity-webapps-twitter/share.user.js	2015-09-21 14:46:23 +0000
@@ -37,16 +37,33 @@
     activeTransfer = transfer;
 
     // Make sure that we have the proper
-    transfer.items(function(items) {
-        api.launchEmbeddedUI(
-            "HubSharer",
-            upload,
-            {"fileToShare": items[0]});
+    transfer.contentType(function(type) {
+        if (type === hub.ContentType.Pictures) {
+            transfer.items(function(items) {
+	        api.launchEmbeddedUI(
+                    "HubSharer",
+                    uploadPhoto,
+                    {"fileToShare": items[0]});
+            });
+        } else if (type === hub.ContentType.Links) {
+            transfer.items(function(items) {
+                uploadLink(items[0].url)
+            });
+        }
     });
 };
 hub.onShareRequested(_shareRequested);
 
 
+function uploadLink(url) {
+    window.location.href = 'https://www.twitter.com/share?url=' + url
+    if (activeTransfer) {
+        activeTransfer.setState(
+            hub.ContentTransfer.State.Finalized)
+        activeTransfer = null
+    }
+}
+
 function generateNonce() {
     // base64 encoding 32 bytes of random data, and stripping out all non-word
     // characters
@@ -269,7 +286,7 @@
     )
 }
 
-function upload(res, onResourceUploadedCallback) {
+function uploadPhoto(res, onResourceUploadedCallback) {
     try {
         var results = JSON.parse(res);
         if (results.status == "cancelled") {