Merge lp:~renatofilho/address-book-app/improve-vcard-import into lp:address-book-app

[Renato Araujo Oliveira Filho]

Show a list of imported contacts when importing vcards.

Test vcard import
  Import a vcard into contacts app using content-hub:
  You can use gmail webapp or messaging app to receive vcards on the phone.
  Test if a list with imported contacts appear
  Test if the imported contact was imported to default address-book.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1009/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/312/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5253/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5273/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1010/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/313/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5263/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5283/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:503
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1011/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5269
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5289
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25280

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

504. By Renato Araujo Oliveira Filho on 2015-11-20

Merged: ~renatofilho/address-book-app/vcard-does-not-export-uid

505. By Renato Araujo Oliveira Filho on 2015-11-20

Merged: ~renatofilho/address-book-app/contact-view-editable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:503
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1016/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/319
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4204/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5319
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25344

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1019/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/322
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5307
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5327
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25359

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

506. By Renato Araujo Oliveira Filho on 2015-11-23

Does not reset contact list state after edit a contact while importing contacts.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1020/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/323
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5325
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4223
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5345
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5345/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25407

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

507. By Renato Araujo Oliveira Filho on 2015-11-23

Show a 'busy' dialog while importing contacts.

508. By Renato Araujo Oliveira Filho on 2015-11-23

Make sure that the contact list is cleared before apply a new filter to avoid delays on contact populte.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1021/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/324
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5343
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5363
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5363/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25427

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

509. By Renato Araujo Oliveira Filho on 2015-11-23

Trunk merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:509
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1022/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/325
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5353
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5373
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5373/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25442

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

510. By Renato Araujo Oliveira Filho on 2015-11-24

Trunk merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1023/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/326
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5362
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4250
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5382
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25452

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

511. By Renato Araujo Oliveira Filho on 2015-11-24

Show a error message if the contact import fails.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:511
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1026/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/329
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5369
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5389
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5389/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25461

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

512. By Renato Araujo Oliveira Filho on 2015-11-24

Test import vcard.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1028/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/331
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5394
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5408
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5408/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25476

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

513. By Renato Araujo Oliveira Filho on 2015-11-25

Typo fixed.

514. By Renato Araujo Oliveira Filho on 2015-11-25

Only try to stop maliit if it is running already.

[Arthur Mello (artmello)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1029/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/332
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5405
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4270
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5419
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5419/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25497

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

515. By Renato Araujo Oliveira Filho on 2015-11-25

Avoid switch to importVcard state while loading test data.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1030/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/333
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5411/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4273/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5425
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5425/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25506

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/improve-vcard-import]

516. By Renato Araujo Oliveira Filho on 2015-11-25

Update import from sim autopilot test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1033/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/336
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5415
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4277
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5429
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5429/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25513

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-11-24 00:30:20 +0000
+++ src/imports/ABContactListPage.qml	2015-11-25 18:33:17 +0000
@@ -38,6 +38,8 @@
     property alias contactManager: contactList.manager
     property Page contactViewPage: null
     property Page contactEditorPage: null
+    property var _busyDialog: null
+    property bool _importingTestData: false
 
     readonly property bool bottomEdgePageOpened: bottomEdge.opened && bottomEdge.fullLoaded
     readonly property bool isEmpty: (contactList.count === 0)
@@ -84,7 +86,8 @@
     function showContact(contact)
     {
         // go back to normal state if not searching
-        if (state !== "searching") {
+        if ((state !== "searching") &&
+            (state !== "vcardImported")) {
             mainPage.state = "default";
         }
         openViewPage({model: contactList.listModel,
@@ -106,14 +109,21 @@
 
     function importContact(urls)
     {
-        if (urls.length > 0) {
-            var importDialog = Qt.createQmlObject("VCardImportDialog{}",
-                               mainPage,
-                               "VCardImportDialog")
-            if (importDialog) {
-                importDialog.importVCards(contactList.listModel, urls)
+        mainPage._busyDialog = PopupUtils.open(busyDialogComponent, mainPage)
+
+        var importing = false
+        for(var i=0, iMax=urls.length; i < iMax; i++) {
+            var url = urls[i]
+            if (url && url != "") {
+                importing = true
+                contactList.listModel.importContacts(url)
             }
         }
+
+        if (!importing) {
+            PopupUtils.close(mainPage._busyDialog)
+            mainPage._busyDialog = null
+        }
     }
 
     function startPickMode(isSingleSelection, activeTransfer)
@@ -126,8 +136,9 @@
 
     function moveListToContact(contact)
     {
-        // skipt it if searching
-        if (state === "searching") {
+        // skipt it if searching or importing contacts
+        if ((state === "searching") ||
+            (state === "vcardImported")) {
             return
         }
 
@@ -428,6 +439,53 @@
                 detailToPick: -1
                 showAddNewButton: true
             }
+            PropertyChanges {
+                target: bottomEdge
+                enabled: false
+            }
+        },
+        PageHeadState {
+            id: vcardImportedState
+
+            name: "vcardImported"
+            backAction: Action {
+                iconName: "back"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    contactList.forceActiveFocus()
+                    mainPage.state = "default"
+                    importedIdsFilter.ids = []
+                }
+            }
+            PropertyChanges {
+                target: mainPage.head
+                backAction: vcardImportedState.backAction
+            }
+            PropertyChanges {
+                target: bottomEdge
+                enabled: false
+            }
+            PropertyChanges {
+                target: mainPage
+                title: i18n.tr("Imported contacts")
+            }
+        }
+    ]
+
+    //WORKAROUND: we need to call 'changeFilter' manually to make sure that the model will be cleared
+    // before update it with the new model. This is faster than do a match of contacts
+    transitions: [
+         Transition {
+            from: "vcardImported"
+            ScriptAction {
+                script: contactList.listModel.changeFilter(null)
+            }
+        },
+        Transition {
+            to: "vcardImported"
+            ScriptAction {
+                script: contactList.listModel.changeFilter(importedIdsFilter)
+            }
         }
     ]
 
@@ -440,6 +498,10 @@
         }
     }
 
+    IdFilter {
+        id: importedIdsFilter
+    }
+
     KeyboardRectangle {
         id: keyboard
     }
@@ -492,16 +554,6 @@
         }
     }
 
-    Connections {
-        target: mainPage.contactModel
-        onContactsChanged: {
-            if (contactIndex) {
-                contactList.positionViewAtContact(mainPage.contactIndex)
-                mainPage.contactIndex = null
-            }
-        }
-    }
-
     ContactExporter {
         id: contactExporter
 
@@ -543,6 +595,35 @@
     }
 
     Component {
+        id: busyDialogComponent
+
+        Popups.Dialog {
+            id: busyDialog
+
+            property alias allowToClose: closeButton.visible
+            property alias showActivity: busyIndicator.visible
+
+            title: i18n.tr("Importing...")
+
+            ActivityIndicator {
+                id: busyIndicator
+                running: visible
+                visible: true
+            }
+            Button {
+                id: closeButton
+                text: i18n.tr("Close")
+                visible: false
+                color: UbuntuColors.red
+                onClicked: {
+                    PopupUtils.close(mainPage._busyDialog)
+                    mainPage._busyDialog = null
+                }
+            }
+        }
+    }
+
+    Component {
         id: contactShareComponent
 
         ContactSharePage {
@@ -552,7 +633,8 @@
 
     Component.onCompleted: {
         application.elapsed()
-        if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA !== "")) {
+        if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA != "")) {
+            mainPage._importingTestData = true
             contactList.listModel.importContacts("file://" + TEST_DATA)
         }
 
@@ -661,6 +743,40 @@
     }
 
     Connections {
+        target: mainPage.contactModel
+        onContactsChanged: {
+            if (contactIndex) {
+                contactList.positionViewAtContact(mainPage.contactIndex)
+                mainPage.contactIndex = null
+            }
+        }
+        onImportCompleted: {
+            if (mainPage._importingTestData) {
+                mainPage._importingTestData = false
+                return
+            }
+
+            if (error !== ContactModel.ImportNoError) {
+                console.error("Fail to import vcard:" + error)
+                mainPage._busyDialog.title = i18n.tr("Fail to import contacts!")
+                mainPage._busyDialog.allowToClose = true
+                mainPage._busyDialog.showActivity = false
+            } else {
+                var importedIds = ids
+                importedIds.concat(importedIdsFilter.ids)
+                importedIdsFilter.ids = importedIds
+                console.debug("Imported ids:" + importedIds)
+                mainPage.state = "vcardImported"
+
+                if (mainPage._busyDialog) {
+                    PopupUtils.close(mainPage._busyDialog)
+                    mainPage._busyDialog = null
+                }
+            }
+        }
+    }
+
+    Connections {
         target: mainPage.contactViewPage
         onEditContact: {
             openEditPage(editPageProperties, mainPage.contactViewPage);

=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2015-10-16 13:37:25 +0000
+++ src/imports/CMakeLists.txt	2015-11-25 18:33:17 +0000
@@ -6,7 +6,6 @@
     ABContactViewPage.qml
     ContentHubProxy.qml
     MainWindow.qml
-    VCardImportDialog.qml
     BottomEdgeShadow.qml
     BottomEdge.qml
 )

=== removed file 'src/imports/VCardImportDialog.qml'
--- src/imports/VCardImportDialog.qml	2015-10-26 13:18:11 +0000
+++ src/imports/VCardImportDialog.qml	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-import QtContacts 5.0
-import Ubuntu.Components 1.3
-import Ubuntu.Components.Popups 1.3 as Popups
-
-Item {
-    id: root
-
-    property alias model: modelConnections.target
-    property var vcards: []
-    property var importedVcards: []
-    property var importErrors: []
-    property var dialog: null
-
-    signal finished()
-
-    function importVCards(model, vcards)
-    {
-        if (dialog || vcards.length === 0) {
-            return
-        }
-
-        root.model = model
-        root.vcards = vcards
-        dialog = Popups.PopupUtils.open(importDialogComponent, root)
-
-        for(var i=0, iMax=vcards.length; i < iMax; i++) {
-            var vcardUrl = vcards[i]
-            model.importContacts(vcardUrl)
-        }
-    }
-
-    Connections {
-        id: modelConnections
-
-        onImportCompleted: {
-            var imported = root.importedVcards
-            var importErrors = root.importErrors
-            imported.push(url)
-            if (error !== ContactModel.ImportNoError) {
-                root.importErrors.push(error)
-                console.error("Fail to import vcard:" + error)
-            }
-            root.importedVcards = imported
-            root.importErrors = importErrors
-        }
-    }
-
-    Component {
-        id: importDialogComponent
-
-        Popups.Dialog {
-            id: importDialog
-
-            title: i18n.tr("Import vCards")
-            text: root.importedVcards.length === 0 ?  i18n.tr("Importing...") : i18n.tr("%1 vCards imported").arg(root.importedVcards.length)
-
-            Button {
-                anchors {
-                    left: parent.left
-                    right: parent.right
-                    margins: units.gu(1)
-                }
-                text: i18n.tr("Close")
-                enabled: (root.importedVcards.length === root.vcards.length)
-                onClicked: {
-                    root.dialog = null
-                    Popups.PopupUtils.close(importDialog)
-                }
-            }
-
-            Component.onDestruction: root.destroy()
-        }
-    }
-}
-
-
-

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2015-09-29 18:05:25 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2015-11-25 18:33:17 +0000
@@ -19,6 +19,7 @@
 import os
 import time
 import subprocess
+import re
 
 from autopilot.testcase import AutopilotTestCase
 from autopilot.matchers import Eventually
@@ -47,7 +48,10 @@
 
         # stop vkb
         if model() != "Desktop":
-            subprocess.check_call(["/sbin/initctl", "stop", "maliit-server"])
+            maliit_info = subprocess.Popen(['/sbin/initctl', 'status', 'maliit-server'], stdout=subprocess.PIPE)
+            result = maliit_info.stdout.read()
+            if b'start/running,' in result.split():
+                subprocess.check_call(['/sbin/initctl', 'stop', 'maliit-server'])
 
         if 'AUTOPILOT_APP' in os.environ:
             self.app_bin = os.environ['AUTOPILOT_APP']

=== modified file 'tests/autopilot/address_book_app/tests/test_import_from_sim.py'
--- tests/autopilot/address_book_app/tests/test_import_from_sim.py	2015-04-30 17:22:48 +0000
+++ tests/autopilot/address_book_app/tests/test_import_from_sim.py	2015-11-25 18:33:17 +0000
@@ -70,6 +70,9 @@
         self.assertThat(len(contacts), Equals(2))
         self.app.main_window.confirm_import()
 
+        # dismiss imported contact list
+        self.app.main_window.cancel()
+
         # verify if the contact was imported
         new_contacts = list_page.get_contacts()
         self.assertThat(len(new_contacts), Equals(2))

=== added file 'tests/autopilot/address_book_app/tests/test_import_vcard.py'
--- tests/autopilot/address_book_app/tests/test_import_vcard.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/tests/test_import_vcard.py	2015-11-25 18:33:17 +0000
@@ -0,0 +1,39 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+# Copyright 2015 Canonical
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+
+"""Tests for the Addressbook App"""
+
+from __future__ import absolute_import
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
+import os
+
+from address_book_app.tests import AddressBookAppTestCase
+
+
+class TeseImportVCard(AddressBookAppTestCase):
+    """Tests import vcard"""
+
+    def setUp(self):
+        vcard_path = AddressBookAppTestCase.VCARD_PATH_DEV
+        if os.path.exists(AddressBookAppTestCase.VCARD_PATH_BIN):
+            vcard_path = AddressBookAppTestCase.VCARD_PATH_BIN
+
+        self.ARGS.append("addressbook:///importvcard?url=file://%s" % vcard_path)
+        super(TeseImportVCard, self).setUp()
+
+    def test_import_vcard_results(self):
+        # check if app enter on import state
+        list_page = self.app.main_window.get_contact_list_page()
+        self.assertThat(list_page.state, Eventually(Equals('vcardImported')))
+        self.assertThat(list_page.title, Eventually(Equals('Imported contacts')))
+        self.assertThat(len(list_page.get_contacts()), Equals(3))
+
+        #leave import state and show full contact list
+        self.app.main_window.cancel()
+        self.assertThat(list_page.state, Eventually(Equals('default')))
+        self.assertThat(list_page.title, Eventually(Equals('Contacts')))