Merge lp:~mikemc/ubuntuone-credentials/fix-qml-example into lp:ubuntuone-credentials

[Mike McCracken]

- Fix example code for QML plugin to no longer try to show the CredentialsUI that doesn't exist anymore, and improve its comments to better explain the remaining API.

- Fix example code for QML plugin to no longer try to show the CredentialsUI that doesn't exist anymore, and improve its comments to better explain the remaining API.

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'qml-credentials-service/examples/embeddingMain.qml'
--- qml-credentials-service/examples/embeddingMain.qml	2013-07-12 19:41:22 +0000
+++ qml-credentials-service/examples/embeddingMain.qml	2013-09-02 18:25:04 +0000
@@ -12,59 +12,6 @@
         spacing: units.gu(2)
         anchors.fill: parent
 
-        add: Transition {
-            NumberAnimation { properties: "opacity"; easing.type: Easing.OutQuad; duration: 1000}
-        }
-
-        Row {
-            anchors.left: parent.left
-            anchors.margins: units.gu(2)
-            spacing: units.gu(2)
-
-            Switch {
-                id: showCredsUISwitch
-                checked: true
-            }
-
-            Label {
-                id: label
-                color: "white"
-                text: "Show Creds UI"
-                anchors.verticalCenter: showCredsUISwitch.verticalCenter
-            }
-
-            Label {
-                id: statusLabel
-                color: "white"
-                text: ""
-                anchors.verticalCenter: showCredsUISwitch.verticalCenter
-            }
-        }
-
-        // Here is where we've embedded the UI for UbuntuOne login and register.
-        // Note that you must declare some width and height for the layout to work.
-
-        CredentialsUI {
-            id: credsUI
-
-            width: parent.width * 0.80
-            height: (parent.height - showCredsUISwitch.height) * 0.80
-            anchors.horizontalCenter: parent.horizontalCenter 
-            visible: showCredsUISwitch.checked
-
-            onUserCancelled: {
-                showCredsUISwitch.checked = false;
-                statusLabel.text = "Login/Register cancelled by user";
-                credsUI.resetUI();
-            }
-
-            onSucceeded: {
-                showCredsUISwitch.checked = false;
-                statusLabel.text = "Login/Register succeeded";
-                credsUI.resetUI();
-            }
-        }
-
         Label {
             id: infoLabel
             text: "Press this button to check for credentials in local keyring:"
@@ -97,8 +44,8 @@
 
     } // Column
 
-    /* Below, an example of how to use the service without showing UI,
-       just to test if there is a local credential already, and sign a
+    /* Here is the component that exposes the credentials API.
+       You can use it to test if there is a local credential already, and sign a
        url with it, if it does exist.*/
 
     UbuntuOneCredentialsService {
@@ -118,8 +65,15 @@
         }
 
         onCredentialsNotFound: {
-            infoLabel.text = "No Credentials Found.";
-            signUrl("http://server", "GET"); // xfail
+            /* We could just report a generic error here, but to show what happens
+               if you don't bother checking before you sign a URL, we
+               sign a URL here, expecting it to fail. We'll then get
+               onUrlSigningError(), with an error message saying
+               something like "attempt to sign with no credentials in
+               keyring". Note that "Keyring" is vestigial, we are not
+               using the system keyring. */
+
+            signUrl("http://server", "GET");
         }
         
         onCredentialsDeleted: {