Merge lp:~renatofilho/address-book-app/fix-1390128 into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Avoid show online account dialog if the app was called from another app.
Close the online account dialog if a new contact get created.

[lp:~renatofilho/address-book-app/fix-1390128]

319. By Renato Araujo Oliveira Filho on 2014-11-06

Fixed typo.

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:319
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/366/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-vivid-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/28
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/21
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-team-address-book-app-staging-ci/366/rebuild

review: Approve (continuous-integration)

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-10-23 15:17:14 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-11-06 16:58:24 +0000
@@ -236,14 +236,6 @@
                 emptyStateScreen.visible = false
 
             }
-
-            if ((count > 0) && mainPage.onlineAccountsMessageDialog) {
-                // Because of some contacts can take longer to arrive due the dbus delay,
-                // we need to destroy the online account dialog if this happen
-                PopupUtils.close(mainPage.onlineAccountsMessageDialog)
-                mainPage.onlineAccountsMessageDialog = null
-                application.unsetFirstRun()
-            }
         }
 
         onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
@@ -514,16 +506,6 @@
         }
     }
 
-    onSyncEnabledChanged: {
-        // close online account dialog if any account get registered
-        // while the app is running
-        if (syncEnabled && mainPage.onlineAccountsMessageDialog) {
-            PopupUtils.close(mainPage.onlineAccountsMessageDialog)
-            mainPage.onlineAccountsMessageDialog = null
-            application.unsetFirstRun()
-        }
-    }
-
     // We need to reset the page proprerties in case of the page was created pre-populated,
     // with phonenumber or contact.
     onBottomEdgeDismissed: {
@@ -550,7 +532,7 @@
         width: childrenRect.width
         spacing: units.gu(2)
 
-        visible: (contactList.count === 0 && !indicator.visible)
+        visible: (contactList.count === 0 && !indicator.visible && (mainPage.newPhoneToAdd === ""))
 
         Icon {
             id: emptyStateIcon
@@ -604,11 +586,21 @@
 
     Loader {
         id: onlineAccount
-        source: (contactList.count === 0) &&
-                application.firstRun ? Qt.resolvedUrl("./OnlineAccountsMessage.qml") : ""
+        asynchronous: true
+        source: Qt.resolvedUrl("./OnlineAccountsMessage.qml")
+        Binding {
+            target: onlineAccount.item
+            property: "dialogVisible"
+            when: onlineAccount.status === Loader.Ready
+            value: (contactList.count === 0) &&
+                   !mainPage.syncEnabled &&
+                   !mainPage.pickMode &&
+                   !onlineAccount.item.hasAccounts &&
+                   mainPage.newPhoneToAdd === "" &&
+                   application.firstRun
+        }
     }
 
-
     Component {
         id: removeContactDialog
 

=== modified file 'src/imports/ContactList/OnlineAccountsMessage.qml'
--- src/imports/ContactList/OnlineAccountsMessage.qml	2014-10-22 13:07:18 +0000
+++ src/imports/ContactList/OnlineAccountsMessage.qml	2014-11-06 16:58:24 +0000
@@ -23,7 +23,32 @@
 Item {
     id: root
 
+    readonly property bool hasAccounts: (accounts.count > 0)
     property var onlineAccountsMessageDialog: null
+    property bool dialogVisible: false
+
+    // Add some delay before show or hide the dialog to avoid dialog to get created unnecessary
+    Behavior on dialogVisible {
+        SequentialAnimation {
+            PauseAnimation { duration: 500 }
+            ScriptAction {
+                script: {
+                    if (dialogVisible) {
+                        showDialog()
+                    } else {
+                        closeDialog()
+                    }
+                }
+            }
+        }
+    }
+
+    function showDialog()
+    {
+        if (root.onlineAccountsMessageDialog == null) {
+            root.onlineAccountsMessageDialog = PopupUtils.open(noAccountDialog, null)
+        }
+    }
 
     function closeDialog()
     {
@@ -86,10 +111,4 @@
             }
         }
     }
-
-    Component.onCompleted: {
-        if (accounts.count === 0) {
-            root.onlineAccountsMessageDialog = PopupUtils.open(noAccountDialog, null)
-        }
-    }
 }