Merge lp:~mikemc/ubuntuone-credentials/back-delete-fix into lp:ubuntuone-credentials

[Mike McCracken]

- Fix behavior of back button on existing account detail page (LP: #1237006)

- Fix behavior of back button on existing account detail page (LP: #1237006)

When the back button is pressed:
- Do not delete accounts that you are viewing in the detail page.
- Do delete new accounts that were created but not completely set up.

To Test on desktop saucy:

# branch this
cd branchname

mkdir build
cd build
cmake -DLIB_SUFFIX=/i386-linux-gnu -DCMAKE_INSTALL_PREFIX=/usr ..

make && sudo make install && U1_DEBUG=1 annotate-output system-settings

- click 'accounts', 'ubuntuone' to start creating a U1 account. don't enter any data.
- use 'back' button from toolbar
= note that no account is listed. (It was created then deleted)

# then,
- click 'ubuntuone', and create an account.
= note the account is listed.
- click on the account to view its details
- use 'back' button from toolbar
= note the account is still listed.

[Roberto Alsina (ralsina)]

looks good to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-saucy-amd64-manual/47

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntuone-credentials-ci/49/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'online-accounts-provider/Main.qml'
--- online-accounts-provider/Main.qml	2013-10-02 20:15:18 +0000
+++ online-accounts-provider/Main.qml	2013-10-08 21:18:46 +0000
@@ -41,7 +41,7 @@
         sourceComponent: account.accountId != 0 ? existingAccountComponent : newAccountComponent
 
         onLoaded: {
-            /* NOTE: dirty hack to work around out grandparent Page (from
+            /* NOTE: dirty hack to work around our grandparent Page (from
                AccountCreationPage.qml in
                ubuntu-system-settings-online-accounts) not being able
                to find our Flickable, and not having an id set for us
@@ -55,8 +55,8 @@
         Connections {
             target: rootFlickable.parent.parent.tools.back;
             onTriggered: {
-                console.debug("page back button clicked, deleting incomplete account.");
-                if(account.accountId != 0) {
+                if(editPageLoader.source == newAccountUrl) {
+                    console.debug("back button clicked while creating account, removing incomplete account.");
                     account.remove(Account.RemoveCredentials);
                     editPageLoader.item.resetUI();
                 }

=== modified file 'online-accounts-provider/NewAccount.qml'
--- online-accounts-provider/NewAccount.qml	2013-10-04 18:02:59 +0000
+++ online-accounts-provider/NewAccount.qml	2013-10-08 21:18:46 +0000
@@ -24,7 +24,6 @@
 Column {
     id: main
 
-    property bool isNewAccount: false
     property variant __account: account
 
     state: "login" // or "register" or "twofactor"
@@ -38,7 +37,6 @@
     spacing: units.gu(2)
 
     Component.onCompleted: {
-        isNewAccount = (__account.accountId === 0);
         enableAccount();
         __account.sync()
         resetUI();