Merge lp:~abreu-alexandre/webapps-core/post-error-feedback into lp:webapps-core

[Alexandre Abreu]

Add feedback messages when an error happens as a picture/etc. is being posted.

Add feedback messages when an error happens as a picture/etc. is being posted.

[lp:~abreu-alexandre/webapps-core/post-error-feedback]

119. By Alexandre Abreu on 2015-09-21

share content hub links

120. By Alexandre Abreu on 2015-09-21

Tweak facebook link shareing piucture

121. By Alexandre Abreu on 2015-09-21

Add error user feedback screen

Unmerged revisions

121. By Alexandre Abreu on 2015-09-21

Add error user feedback screen

=== modified file 'webapp-facebook/manifest.json'
--- webapp-facebook/manifest.json	2015-04-16 16:59:55 +0000
+++ webapp-facebook/manifest.json	2015-09-21 15:59:22 +0000
@@ -19,5 +19,5 @@
     "maintainer": "Webapps Team <[e-mail]>",
     "name": "com.ubuntu.developer.webapps.webapp-facebook",
     "title": "Facebook",
-    "version": "1.1"
+    "version": "1.2"
 }

=== modified file 'webapp-facebook/unity-webapps-facebook/HubSharer.qml'
--- webapp-facebook/unity-webapps-facebook/HubSharer.qml	2015-04-16 14:59:02 +0000
+++ webapp-facebook/unity-webapps-facebook/HubSharer.qml	2015-09-21 15:59:22 +0000
@@ -22,12 +22,8 @@
             fileToShare: dataUri.toString(),
             message: message};
 
-        completed(
-            JSON.stringify(result),
-            function(result) {
-                main.destroy();
-                resourceUploadCompletedCallback(result);
-            });
+        completed(JSON.stringify(result),
+                  resourceUploadCompletedCallback);
     }
 
     ContentItem {
@@ -69,9 +65,6 @@
             /* if the upload was successful, we need to destroy the parent */
             if (success) {
                 main.destroy();
-            } else {
-                console.error ("Upload failed");
-                /* FIXME: Display a message to the user */
             }
         }
     }

=== modified file 'webapp-facebook/unity-webapps-facebook/Share.qml'
--- webapp-facebook/unity-webapps-facebook/Share.qml	2015-09-21 15:53:37 +0000
+++ webapp-facebook/unity-webapps-facebook/Share.qml	2015-09-21 15:59:22 +0000
@@ -36,16 +36,29 @@
     property string accessToken
     property var account
 
+    property int __attemptCount: 0
+
     signal accountSelected
     signal canceled
-    signal uploadCompleted(bool success)
+    signal uploadCompleted(bool success, string errorMessage)
 
     onUploadCompleted: {
         activitySpinner.visible = false;
-        if (success)
-            print ("Successfully posted");
-        else
-            print ("Failed to post");
+        if (! success) {
+            var reply = JSON.parse(errorMessage)
+            if (root.__attemptCount === 0 && "error" in reply && reply.error.type == "OAuthException") {
+                console.log("Trying again!")
+                activitySpinner.visible = true
+                root.__attemptCount++
+                root.account.authenticate({
+                    "ForceTokenRefresh": true
+                })
+            } else
+            {
+                statusRow.text = errorMessage
+                statusRow.visible = true
+            }
+        }
     }
 
     AccountServiceModel {
@@ -63,13 +76,18 @@
         id: srv
         onObjectHandleChanged: {
             root.account = srv;
+            root.__attemptCount = 0;
             root.account.authenticate(null);
         }
         onAuthenticated: {
             root.userAccountId = accountId;
             root.accessToken = reply.AccessToken;
-            shareComponent.visible = true;
-            sharemenu.visible = false;
+            if (!shareComponent.visible) {
+                shareComponent.visible = true;
+                sharemenu.visible = false;
+            } else {
+                callback(accessToken, fileToShare, message.text, uploadCompleted);
+            }
         }
     }
 
@@ -164,6 +182,38 @@
                 }
             }
 
+            Row {
+                id: statusRow
+
+                visible: false
+
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                anchors.topMargin: units.gu(4)
+                anchors.leftMargin: units.gu(1)
+                anchors.rightMargin: units.gu(1)
+
+                height: units.gu(10)
+
+                TextArea {
+                    id: statusLabel
+
+                    anchors.fill: parent
+
+                    anchors.margins: units.gu(1)
+
+                    wrapMode: Text.Wrap
+
+                    readOnly: true
+
+                    clip: true
+                    font.pixelSize: FontUtils.sizeToPixels("medium")
+                    font.weight: Font.Light
+                    focus: true
+                }
+            }
+            
             Item {
                 id: actionsBar
                 anchors.left: parent.left

=== modified file 'webapp-facebook/unity-webapps-facebook/facebook.user.js'
--- webapp-facebook/unity-webapps-facebook/facebook.user.js	2015-04-17 18:57:59 +0000
+++ webapp-facebook/unity-webapps-facebook/facebook.user.js	2015-09-21 15:59:22 +0000
@@ -49,14 +49,18 @@
         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.open('POST',
+             'https://graph.facebook.com/me/photos?access_token=' + results.accessToken,
+             true);
+
     xhr.onload = xhr.onerror = function() {
-        if ( xhr.status == 200 ) {
+        if (xhr.status == 200) {
             window.location.reload();
 	    onResourceUploadedCallback(true);
         }
 	else {
-	    onResourceUploadedCallback(false);
+	    onResourceUploadedCallback(
+                false, xhr.responseText);
 	}
     };
 

=== modified file 'webapp-twitter/unity-webapps-twitter/HubSharer.qml'
--- webapp-twitter/unity-webapps-twitter/HubSharer.qml	2015-03-12 21:41:16 +0000
+++ webapp-twitter/unity-webapps-twitter/HubSharer.qml	2015-09-21 15:59:22 +0000
@@ -31,7 +31,7 @@
         };
         
         completed(JSON.stringify(result),
-                  function(result) { main.destroy(); resourceUploadCompletedCallback(result); });
+                  resourceUploadCompletedCallback);
     }
 
     ContentItem {
@@ -69,9 +69,6 @@
             /* if the upload was successful, we need to destroy the parent */
             if (success) {
                 main.destroy();
-            } else {
-                console.error ("Upload failed");
-                /* FIXME: Display a message to the user */
             }
         }
     }

=== modified file 'webapp-twitter/unity-webapps-twitter/Share.qml'
--- webapp-twitter/unity-webapps-twitter/Share.qml	2015-03-12 21:41:16 +0000
+++ webapp-twitter/unity-webapps-twitter/Share.qml	2015-09-21 15:59:22 +0000
@@ -40,14 +40,14 @@
 
     signal accountSelected
     signal canceled
-    signal uploadCompleted(bool success)
+    signal uploadCompleted(bool success, string errorMessage)
 
     onUploadCompleted: {
         activitySpinner.visible = false;
-        if (success)
-            print ("Successfully posted");
-        else
-            print ("Failed to post");
+        if (! success) {
+            statusRow.text = errorMessage
+            statusRow.visible = true
+        }
     }
 
     AccountServiceModel {
@@ -169,6 +169,38 @@
                 }
             }
 
+            Row {
+                id: statusRow
+
+                visible: false
+
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                anchors.topMargin: units.gu(4)
+                anchors.leftMargin: units.gu(1)
+                anchors.rightMargin: units.gu(1)
+
+                height: units.gu(10)
+
+                TextArea {
+                    id: statusLabel
+
+                    anchors.fill: parent
+
+                    anchors.margins: units.gu(1)
+
+                    wrapMode: Text.Wrap
+
+                    readOnly: true
+
+                    clip: true
+                    font.pixelSize: FontUtils.sizeToPixels("medium")
+                    font.weight: Font.Light
+                    focus: true
+                }
+            }
+            
             Item {
                 id: actionsBar
                 anchors.left: parent.left

=== modified file 'webapp-twitter/unity-webapps-twitter/share.user.js'
--- webapp-twitter/unity-webapps-twitter/share.user.js	2015-04-16 14:59:02 +0000
+++ webapp-twitter/unity-webapps-twitter/share.user.js	2015-09-21 15:59:22 +0000
@@ -245,7 +245,7 @@
 		activeTransfer = null;
 		onResourceUploadedCallback(
                     false,
-                    {errorMessage: results.errorMsg});
+                    results.errorMsg);
 		return;
             }
 
@@ -278,7 +278,7 @@
 			    window.location.reload();
 			    onResourceUploadedCallback(
                                 results.success,
-                                {errorMessage: results.errorMsg});
+                                results.errorMsg);
 			});
 		}
 	    );
@@ -311,7 +311,7 @@
                 if (content.errorMsg
                     && content.errorMsg.length !== 0) {
                     onResourceUploadedCallback(
-                        false, {errorMessage: content.errorMsg})
+                        false, content.errorMsg)
 		    activeTransfer = null;
                     return;
                 }