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

[Renato Araujo Oliveira Filho]

Make sure the import page still visible while importing contacts from sim.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:535
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1099/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/402
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6311
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4848
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27270

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

review: Needs Fixing (continuous-integration)

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

536. By Renato Araujo Oliveira Filho on 2016-02-03

Add debug messages.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:536
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/404
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6321
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6332
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6332/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27288

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

review: Needs Fixing (continuous-integration)

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

537. By Renato Araujo Oliveira Filho on 2016-02-04

Pop import contacts from sim page on import complet.

538. By Renato Araujo Oliveira Filho on 2016-02-04

Parent merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:537
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1102/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/405
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6332
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27317

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

review: Needs Fixing (continuous-integration)

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

539. By Renato Araujo Oliveira Filho on 2016-02-04

Removed debug messages.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:539
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/407
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6336
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4864
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6347
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27323

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

review: Needs Fixing (continuous-integration)

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

540. By Renato Araujo Oliveira Filho on 2016-02-04

Remove debug messages.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:540
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1105/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/408
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6343
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4868
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6354
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6354/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27331

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

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

541. By Renato Araujo Oliveira Filho on 2016-02-22

Trunk merged.

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2016-02-11 23:43:01 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2016-02-22 14:19:12 +0000
@@ -526,10 +526,16 @@
                     visible: (typeof(pageStack) !== "undefined") &&
                              ((simList.sims.length > 0) && (simList.present.length > 0))
                     onClicked: {
-                        pageStack.addPageToNextColumn(pageStack.primaryPage, Qt.resolvedUrl("SIMCardImportPage.qml"),
+                        if (pageStack.addPageToNextColumn)
+                            pageStack.addPageToNextColumn(pageStack.primaryPage, Qt.resolvedUrl("SIMCardImportPage.qml"),
                                                       {"objectName": "simCardImportPage",
                                                        "targetModel": view.listModel,
                                                        "sims": simList.sims})
+                        else
+                            pageStack.push(Qt.resolvedUrl("SIMCardImportPage.qml"),
+                                           {"objectName": "simCardImportPage",
+                                            "targetModel": view.listModel,
+                                            "sims": simList.sims})
                     }
                 }
             }

=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2015-12-02 13:36:03 +0000
+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml	2016-02-22 14:19:12 +0000
@@ -26,7 +26,7 @@
 Page {
     id: root
 
-    readonly property string exportFile: "file://%1/ubuntu_contacts_sim.vcf".arg(Contacts.tempPath)
+    readonly property string exportFile: Contacts.tempFile("ubuntu_contacts_XXXXXX.vcf")
     readonly property alias hasContacts: simCardContacts.hasContacts
     property var targetModel: null
     property var sims: []
@@ -98,7 +98,7 @@
         multiSelectionEnabled: true
         multipleSelection: true
         showSections: false
-        visible: !indicator.visible
+        visible: !indicator.visible && !statusMessage.visible
         showBusyIndicator: false
 
         manager: "memory"
@@ -147,7 +147,6 @@
             if (vcardFile != "" && !contactImported) {
                 contactImported = true
                 contactList.listModel.importContacts(vcardFile)
-
             }
         }
         onVcardFileChanged: {
@@ -156,7 +155,10 @@
                 contactList.listModel.importContacts(vcardFile)
             }
         }
-        onImportFail: root.state = "error"
+        onImportFail: {
+            console.error("Sim card import fail")
+            root.state = "error"
+        }
     }
 
     Connections {
@@ -168,9 +170,30 @@
 
         onExportCompleted: {
             if ((error === ContactModel.ExportNoError) && targetModel) {
+                root.state = "saving"
                 targetModel.importContacts(url)
+             } else {
+                console.error("Failt to export selected contacts")
+                root.state = "error"
+            }
+        }
+    }
+
+    Connections {
+        target: root.targetModel
+        onImportCompleted: {
+             if (error === ContactModel.ImportNoError) {
+                 Contacts.removeFile(root.exportFile)
+                 root.state = ""
+                 if (pageStack.removePages)
+                     pageStack.removePages(root)
+                 else
+                     pageStack.pop()
+                 root.importCompleted()
+             } else {
+                 console.error("Fail to import contacts on device")
+                 root.state = "error"
              }
-            root.importCompleted()
         }
     }
 
@@ -235,7 +258,15 @@
             name: "importing"
             PropertyChanges {
                 target: indicator
-                title: i18n.dtr("address-book-app", "Importing...")
+                title: i18n.dtr("address-book-app", "Reading contacts from SIM...")
+                visible: true
+            }
+        },
+        State {
+            name: "saving"
+            PropertyChanges {
+                target: indicator
+                title: i18n.dtr("address-book-app", "Saving contacts on phone...")
                 visible: true
             }
         },

=== modified file 'src/imports/Ubuntu/Contacts/contacts.cpp'
--- src/imports/Ubuntu/Contacts/contacts.cpp	2016-01-22 19:32:28 +0000
+++ src/imports/Ubuntu/Contacts/contacts.cpp	2016-02-22 14:19:12 +0000
@@ -109,6 +109,17 @@
     return QFile::exists(updaterLockFile());
 }
 
+
+QUrl UbuntuContacts::tempFile(const QString &templateName)
+{
+    QTemporaryFile tmp(QString("%1/%2").arg(tempPath()).arg(templateName));
+    tmp.setAutoRemove(false);
+    if (tmp.open())
+        return QUrl::fromLocalFile(tmp.fileName());
+    else
+        return QUrl();
+}
+
 uint UbuntuContacts::qHash(const QString &str)
 {
     return ::qHash(str);

=== modified file 'src/imports/Ubuntu/Contacts/contacts.h'
--- src/imports/Ubuntu/Contacts/contacts.h	2016-01-22 19:32:28 +0000
+++ src/imports/Ubuntu/Contacts/contacts.h	2016-02-22 14:19:12 +0000
@@ -40,6 +40,7 @@
     Q_INVOKABLE bool containsLetters(const QString &value);
     Q_INVOKABLE bool removeFile(const QUrl &file);
     Q_INVOKABLE bool updateIsRunning() const;
+    Q_INVOKABLE QUrl tempFile(const QString &suffix);
     Q_INVOKABLE uint qHash(const QString &str);
 
 Q_SIGNALS: