Merge lp:~renatofilho/address-book-app/fix-1419854-rtm into lp:address-book-app/rtm-14.09

[Renato Araujo Oliveira Filho]

Show a dialog with a spinner while exporting contacts.

=== modified file 'src/imports/Common/ContactExporter.qml'
--- src/imports/Common/ContactExporter.qml	2014-10-09 18:06:08 +0000
+++ src/imports/Common/ContactExporter.qml	2015-02-13 23:38:59 +0000
@@ -16,17 +16,20 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
+
+import Ubuntu.Components 1.1
 import Ubuntu.Content 1.1
+import Ubuntu.Components.Popups 1.0
 
 Item {
     id: root
 
     property var contactModel
-    property var outputFile
+    property bool exportToDisk: true
     property var activeTransfer: null
 
     signal contactsFetched(var contacts)
-    signal done()
+    signal done(string outputFile)
 
     function start(contacts) {
         if (!contactModel) {
@@ -36,24 +39,38 @@
 
         // skip if a query is running
         if (priv.currentQueryId != -1) {
-            completed(0)
+            console.error("Export already running")
             return
         }
 
+        if (!priv.busyDialog) {
+            priv.busyDialog = PopupUtils.open(busyDialogComponent, root)
+        }
+
         var ids = []
         for (var i=0; i < contacts.length; i++) {
             ids.push(contacts[i].contactId)
         }
         if (ids.length == 0) {
-            completed(0)
+            console.debug("The contact list is empty")
+            done("")
         } else {
             priv.currentQueryId = contactModel.fetchContacts(ids)
         }
     }
 
+    function dismissBusyDialog()
+    {
+        if (priv.busyDialog) {
+            PopupUtils.close(priv.busyDialog)
+            priv.busyDialog = null
+        }
+    }
+
     Item {
         id: priv
 
+        property var busyDialog: null
         property int currentQueryId: -1
         readonly property var detailsBlackList: [ ContactDetail.Favorite, ContactDetail.Tag ]
 
@@ -83,8 +100,6 @@
             target: root.contactModel
 
             onExportCompleted: {
-                priv.currentQueryId = -1
-
                 // send contacts back to source app (pick mode)
                 if (error === ContactModel.ExportNoError) {
                     var obj = Qt.createQmlObject("import Ubuntu.Content 1.1;  ContentItem { url: '" + url + "' }", root)
@@ -98,26 +113,27 @@
                     root.activeTransfer = ContentHub.ContentTransfer.Aborted
                     console.error("Fail to export contacts:" + error)
                 }
-                root.done()
+                root.dismissBusyDialog()
+                root.done(url)
             }
 
             onContactsFetched: {
                 // currentQueryId == -2 is used during a fetch using "memory" manager
                 if ((priv.currentQueryId == -2) || (requestId == priv.currentQueryId)) {
-                    if (root.outputFile !== "") {
+                    if (root.exportToDisk) {
                         var contacts = []
                         // remove unnecessary info from contacts
                         for(var i=0; i < fetchedContacts.length; i++) {
                             contacts.push(priv.filterContactDetails(fetchedContacts[i]))
                         }
                         // update outputFile with a friendly name
-                        root.outputFile = priv.generateOutputFileName(contacts)
-
-                        root.contactModel.exportContacts(root.outputFile,
+                        var outputFile = priv.generateOutputFileName(contacts)
+                        root.contactModel.exportContacts(outputFile,
                                                          [],
                                                          contacts)
                     }
                     root.contactsFetched(fetchedContacts)
+                    priv.currentQueryId = -1
                 }
             }
         }
@@ -128,9 +144,24 @@
             onStateChanged: {
                 if (root.activeTransfer.state === ContentTransfer.Aborted) {
                     root.activeTransfer = null
-                    root.done()
+                    root.done("")
                 }
             }
         }
     }
+
+    Component {
+        id: busyDialogComponent
+
+        Dialog {
+            title: i18n.tr("Exporting contacts...")
+
+            ActivityIndicator {
+                id: activity
+
+                anchors.horizontalCenter: parent.horizontalCenter
+                running: true
+            }
+        }
+    }
 }
 
=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2015-01-21 12:56:18 +0000
+++ src/imports/ContactList/ContactListPage.qml	2015-02-13 23:38:59 +0000
@@ -430,7 +430,6 @@
                         for (var i=0, iMax=items.count; i < iMax; i++) {
                             contacts.push(items.get(i).model.contact)
                         }
-
                         contactExporter.start(contacts)
                         contactList.endSelection()
                     }
@@ -569,16 +568,17 @@
         id: contactExporter
 
         contactModel: contactList.listModel
-        outputFile: mainPage.pickMode ? "file:///tmp/address_book_app_export.vcf" : ""
+        exportToDisk: mainPage.pickMode
         onDone: {
             mainPage.pickMode = false
             mainPage.state = "default"
-            application.returnVcard(contactExporter.outputFile)
+            application.returnVcard(outputFile)
         }
 
         onContactsFetched: {
             // Share contacts to an application chosen by the user
             if (!mainPage.pickMode) {
+                contactExporter.dismissBusyDialog()
                 pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
                                { contactModel: contactExporter.contactModel, contacts: contacts })
             }