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.

[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)

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

502. By Renato Araujo Oliveira Filho on 2015-11-19

Merged: lp:~renatofilho/address-book-app/fix-1511477

503. By Renato Araujo Oliveira Filho on 2015-11-19

Removed old file from cmake file.

[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

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

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

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.

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

Trunk merged.

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

Trunk merged.

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

Show a error message if the contact import fails.

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

Test import vcard.

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.

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

Avoid switch to importVcard state while loading test data.

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

Update import from sim autopilot test.

Unmerged revisions

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/ABContactListPage.qml	2015-11-19 14:41:33 +0000
@@ -89,7 +89,11 @@
 
     function showContact(contact)
     {
-        mainPage.state = "default";
+        // go back to normal state if not searching
+        if ((state !== "searching") &&
+            (state !== "vcardImported")) {
+            mainPage.state = "default";
+        }
         openViewPage({model: contactList.listModel,
                       contact: contact});
     }
@@ -109,13 +113,10 @@
 
     function importContact(urls)
     {
-        if (urls.length > 0) {
-            var importDialog = Qt.createQmlObject("VCardImportDialog{}",
-                               mainPage,
-                               "VCardImportDialog")
-            if (importDialog) {
-                importDialog.importVCards(contactList.listModel, urls)
-            }
+        for(var i=0, iMax=urls.length; i < iMax; i++) {
+            var url = urls[i]
+            if (url && url != "")
+                contactList.listModel.importContacts(url)
         }
     }
 
@@ -129,6 +130,11 @@
 
     function moveListToContact(contact)
     {
+        // skipt it if searching
+        if (state === "searching") {
+            return
+        }
+
         contactIndex = contact
         mainPage.state = "default"
         // this means a new contact was created
@@ -176,15 +182,11 @@
         filterTerm: searchField.text
         multiSelectionEnabled: true
         multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
-        highlightedContact: contactViewPage ? contactViewPage.contact :
-                            contactEditorPage ? contactEditorPage.contact : null
-
+        highlightSelected: pageStack.columns > 1
         onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
         onAddNewContactClicked: mainPage.createContactWithPhoneNumber(mainPage.newPhoneToAdd)
 
-        onContactClicked: {
-            showContact(contact);
-        }
+        onContactClicked: mainPage.showContact(contact)
         onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
         onSelectionCanceled: {
             if (pickMode) {
@@ -209,10 +211,15 @@
             right: parent.right
             rightMargin: units.gu(2)
         }
-        visible: mainPage.searching
+        focus: false
+        visible: false
         onTextChanged: contactList.currentIndex = -1
         inputMethodHints: Qt.ImhNoPredictiveText
         placeholderText: i18n.tr("Search...")
+        onFocusChanged: {
+            if (visible && focus)
+                searchField.forceActiveFocus()
+        }
     }
 
     Connections {
@@ -289,6 +296,10 @@
                 target: searchField
                 text: ""
             }
+            PropertyChanges {
+                target: contactList
+                filter: null
+            }
         },
         PageHeadState {
             id: searchingState
@@ -305,6 +316,11 @@
             }
 
             PropertyChanges {
+                target: bottomEdge
+                enabled: false
+            }
+
+            PropertyChanges {
                 target: mainPage.head
                 backAction: searchingState.backAction
                 contents: searchField
@@ -314,6 +330,12 @@
                 target: searchField
                 text: ""
             }
+
+            PropertyChanges {
+                target: searchField
+                visible: true
+                focus: true
+            }
         },
         PageHeadState {
             id: selectionState
@@ -418,12 +440,50 @@
                 target: bottomEdge
                 enabled: false
             }
+        },
+        PageHeadState {
+            id: varctImportedState
+
+            name: "vcardImported"
+            backAction: Action {
+                iconName: "back"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    contactList.forceActiveFocus()
+                    mainPage.state = "default"
+                    importedIdsFilter.ids = []
+                }
+            }
+            PropertyChanges {
+                target: mainPage.head
+                backAction: varctImportedState.backAction
+            }
+            PropertyChanges {
+                target: bottomEdge
+                enabled: false
+            }
+            PropertyChanges {
+                target: contactList
+                filter: importedIdsFilter
+            }
+            PropertyChanges {
+                target: mainPage
+                title: i18n.tr("Imported contacts")
+            }
         }
     ]
+
     onActiveChanged: {
         if (active && contactList.showAddNewButton) {
             contactList.positionViewAtBeginning()
         }
+        if (active && (state === "searching")) {
+            searchField.forceActiveFocus()
+        }
+    }
+
+    IdFilter {
+        id: importedIdsFilter
     }
 
     KeyboardRectangle {
@@ -478,16 +538,6 @@
         }
     }
 
-    Connections {
-        target: mainPage.contactModel
-        onContactsChanged: {
-            if (contactIndex) {
-                contactList.positionViewAtContact(mainPage.contactIndex)
-                mainPage.contactIndex = null
-            }
-        }
-    }
-
     ContactExporter {
         id: contactExporter
 
@@ -538,7 +588,7 @@
 
     Component.onCompleted: {
         application.elapsed()
-        if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA !== "")) {
+        if ((typeof(TEST_DATA) !== "undefined") && (TEST_DATA != "")) {
             contactList.listModel.importContacts("file://" + TEST_DATA)
         }
 
@@ -647,6 +697,27 @@
     }
 
     Connections {
+        target: mainPage.contactModel
+        onContactsChanged: {
+            if (contactIndex) {
+                contactList.positionViewAtContact(mainPage.contactIndex)
+                mainPage.contactIndex = null
+            }
+        }
+        onImportCompleted: {
+            if (error !== ContactModel.ImportNoError) {
+                console.error("Fail to import vcard:" + error)
+            } else {
+                var importedIds = ids
+                importedIds.concat(importedIdsFilter.ids)
+                importedIdsFilter.ids = importedIds
+                console.debug("Imported ids:" + importedIds)
+                mainPage.state = "vcardImported"
+            }
+        }
+    }
+
+    Connections {
         target: mainPage.contactViewPage
         onEditContact: {
             openEditPage(editPageProperties, mainPage.contactViewPage);

=== modified file 'src/imports/BottomEdge.qml'
--- src/imports/BottomEdge.qml	2015-10-23 14:32:47 +0000
+++ src/imports/BottomEdge.qml	2015-11-19 14:41:33 +0000
@@ -89,10 +89,10 @@
                 id: bottomEdgeLoader
                 sourceComponent: bottomEdge.contentComponent
                 asynchronous: true
+                active: bottomEdge.enabled
             }
         }
 
-
         BottomEdgeHint {
             id: bottomEdgeHint
 

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

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-10-28 01:07:59 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2015-11-19 14:41:33 +0000
@@ -248,12 +248,8 @@
       This property holds the vertical velocity of the list
     */
     readonly property real verticalVelocity: view.verticalVelocity
-    /*!
-      \qmlproperty Contact highlightedContact
 
-      This property holds a reference to the Contact that should be highlighted
-    */
-    property Contact highlightedContact: null
+    property alias highlightSelected: view.highlightSelected
 
     property var _busyDialog: null
 
@@ -382,7 +378,6 @@
         property bool showFavourites: true
         property alias favouritesIsSelected: contactsModel.onlyFavorites
         property bool contactsLoaded: false
-        highlightedContact: root.highlightedContact
 
         function getSectionText(index) {
             var tag = listModel.contacts[index].tag.tag

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-11-19 14:41:33 +0000
@@ -145,11 +145,11 @@
     property list<Action> rightSideActions
 
     /*!
-      \qmlproperty Contact highlightedContact
+      \qmlproperty highlightSelected
 
-      This property holds a reference to the Contact that should be highlighted
+      This property holds if the current contact should be highlighted or not
     */
-    property Contact highlightedContact: null
+    property bool highlightSelected: false
 
     /* internal */
     property var _currentSwipedItem: null
@@ -269,7 +269,7 @@
         flicking: contactListView.flicking
         width: parent.width
         selected: (contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate))
-                  || (contactListView.highlightedContact && contactListView.highlightedContact.contactId == contact.contactId)
+                  || (contactListView.highlightSelected && (contactListView.currentIndex == index))
         selectionMode: contactListView.isInSelectionMode
         defaultAvatarUrl: contactListView.defaultAvatarImageUrl
         isCurrentItem: ListView.isCurrentItem

=== 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()
-        }
-    }
-}
-
-
-