Merge lp:~renatofilho/address-book-app/fix-1200397 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Fixed busy indicator timeout to 2sec.

If the model reports a error show the contact load error dialog and stop the spinner.
If the model stay static for 2secs stop the busy indicator.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:10
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/37
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/37/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/37

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/37/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

This solution has problems. If the address book service is not running when you launch the app and you have many contacts the spinner stops after two seconds and the screen is still blank. Then after like 10 seconds the results show up.

A better way to implement this
1) start the spinner when app starts
2) to do an initial query for the number of contacts found on the server
3) if result is 0, stop spinner
4) else stop after you've received first page of results

review: Needs Fixing

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

11. By Renato Araujo Oliveira Filho on 2013-07-12

Increased spinner timeout to avoid problems when the server still starting.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:11
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins:8080/job/address-book-app-ci/41/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

review: Approve

=== modified file 'src/imports/ContactList/ContactList.qml'
--- src/imports/ContactList/ContactList.qml	2013-07-12 00:13:01 +0000
+++ src/imports/ContactList/ContactList.qml	2013-07-12 22:08:27 +0000
@@ -18,6 +18,7 @@
 import QtContacts 5.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components.Popups 0.1 as Popups
 
 import "ContactList.js" as Sections
 
@@ -26,6 +27,23 @@
 
     title: i18n.tr("Contacts")
 
+    Component {
+        id: dialog
+
+        Popups.Dialog {
+            id: dialogue
+
+            title: i18n.tr("Error")
+            text: i18n.tr("Fail to Load contacts")
+
+            Button {
+                text: "Cancel"
+                gradient: UbuntuColors.greyGradient
+                onClicked: PopupUtils.close(dialogue)
+            }
+        }
+    }
+
     ContactModel {
         id: contactsModel
 
@@ -46,6 +64,11 @@
                               ContactDetail.PhoneNumber]
         }
 
+        onErrorChanged: {
+            busyIndicator.busy = false
+            PopupUtils.open(dialog, null)
+        }
+
         Component.onCompleted: {
             if (manager == "memory")
                 contactsModel.importContacts(Qt.resolvedUrl("example.vcf"))
@@ -69,7 +92,7 @@
         anchors.fill: parent
         model: contactsModel
         onCountChanged: {
-            dirtyTimer.restart()
+            busyIndicator.ping()
         }
 
         function isNotEmptyString(string) {
@@ -131,23 +154,37 @@
         }
     }
 
-    Timer {
-        id: dirtyTimer
-
-        interval: 2000
-        running: false
-        repeat: false
-        onTriggered: {
-            Sections.initSectionData(contactListView)
-        }
-    }
-
-    ActivityIndicator {
+    Item {
         id: busyIndicator
 
-        running: contactListView.count == 0
-        visible: running
-        anchors.centerIn: contactListView
+        property alias busy: activity.running
+
+        function ping()
+        {
+            timer.restart()
+        }
+
+        visible: busy
+        anchors.fill: parent
+
+        // This is a workaround to make sure the spinner will disappear if the model is empty
+        // FIXME: implement a model property to say if the model still busy or not
+        Timer {
+            id: timer
+
+            interval: 6000
+            running: true
+            repeat: false
+            onTriggered: busyIndicator.busy = false
+        }
+
+        ActivityIndicator {
+            id: activity
+
+            anchors.centerIn: parent
+            running: contactListView.count == 0
+            visible: running
+        }
     }
 
     tools: ToolbarItems {