Merge lp:~renatofilho/address-book-app/release-2014-06-27 into lp:address-book-app

[Renato Araujo Oliveira Filho]

* Updated pot file.
* Implemented frequently called list.
* Implemented vcard import.
* Search contacts by phone number and name.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected? YES
  * https://code.launchpad.net/~renatofilho/history-service/qml-fetch-more/+merge/224169

Is your branch in sync with latest trunk? YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator? YES

Did you successfully run all tests found in your component's Test Plan on device or emulator? YES

If you changed the UI, was the change specified/approved by design? NO UI CHANGE

If you changed the packaging (debian), did you subscribe a core-dev to this MP? NO PACKAGE CHANGED

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

[lp:~renatofilho/address-book-app/release-2014-06-27]

197. By Renato Araujo Oliveira Filho on 2014-06-27

Fixed MostCalled list visibility.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:196
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/593/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1294
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1609
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2195
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2195/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8944
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/937
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1280
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1280/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'click/CMakeLists.txt'
--- click/CMakeLists.txt	2014-03-12 01:34:34 +0000
+++ click/CMakeLists.txt	2014-06-27 21:27:44 +0000
@@ -9,4 +9,8 @@
             DESTINATION ${CMAKE_INSTALL_PREFIX})
     install(FILES address-book-content.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})
+else(CLICK_MODE)
+    install(FILES address-book-content.json
+            DESTINATION ${CMAKE_INSTALL_DATADIR}/content-hub/peers
+            RENAME address-book-app)
 endif(CLICK_MODE)
 
=== modified file 'debian/address-book-app.install'
--- debian/address-book-app.install	2014-02-10 21:09:43 +0000
+++ debian/address-book-app.install	2014-06-27 21:27:44 +0000
@@ -3,4 +3,5 @@
 usr/share/address-book-app/imports
 usr/share/applications/address-book-app.desktop
 usr/share/url-dispatcher/urls/
+usr/share/content-hub/peers/address-book-app
 usr/share/locale/*/LC_MESSAGES/address-book-app.mo
 
=== modified file 'debian/control'
--- debian/control	2014-06-11 21:25:08 +0000
+++ debian/control	2014-06-27 21:27:44 +0000
@@ -25,12 +25,14 @@
          libqt5versit5,
          qmlscene,
          qtcontact5-galera,
+         qtdeclarative5-qtcontacts-plugin,
+         qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}),
-         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
          qtdeclarative5-ubuntu-content0.1,
+         qtdeclarative5-ubuntu-history0.1,
          qtdeclarative5-ubuntu-keyboard-extensions0.1,
-         qtdeclarative5-qtcontacts-plugin,
-         qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-telephony-phonenumber0.1,
+         qtdeclarative5-ubuntu-telephony0.1,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Address Book application
 
=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot	2014-05-13 18:53:02 +0000
+++ po/address-book-app.pot	2014-06-27 21:27:44 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: address-book-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-13 15:51-0300\n"
+"POT-Creation-Date: 2014-06-27 09:54-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,16 +17,22 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/imports/ContactList/ContactListPage.qml:193
-msgid "Add"
-msgstr ""
-
+#: src/imports/ContactList/VCardImportDialog.qml:72
+#, qt-format
+msgid "%1 vCards imported"
+msgstr ""
+
+#: src/imports/ContactEdit/ContactEditor.qml:322
+msgid "Add Field"
+msgstr ""
+
+#: src/imports/ContactEdit/AddFieldDialog.qml:59
 #: src/imports/ContactEdit/ContactDetailAddressesEditor.qml:23
 #: src/imports/ContactView/ContactDetailAddressesView.qml:24
 msgid "Address"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml:73
+#: src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml:77
 #: src/imports/ContactView/ContactDetailSyncTargetView.qml:48
 msgid "Addressbook"
 msgstr ""
@@ -35,22 +41,39 @@
 msgid "Aim"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactListView.qml:66
+#: src/imports/Ubuntu/Contacts/ContactListView.qml:316
 msgid "All"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactEditor.qml:300
-#: src/imports/ContactEdit/EditToolbar.qml:42
+#: src/imports/Common/RemoveContactsDialog.qml:51
+msgid "Are you sure that you want to remove all selected contacts?"
+msgstr ""
+
+#: src/imports/Common/RemoveContactsDialog.qml:49
+msgid "Are you sure that you want to remove this contact?"
+msgstr ""
+
+#: src/imports/ContactEdit/AddFieldDialog.qml:133
+#: src/imports/ContactEdit/ContactEditor.qml:372
+#: src/imports/ContactList/ContactListPage.qml:324
 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:37
 msgid "Cancel"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactFetchError.qml:26
+#: src/imports/ContactList/ContactListPage.qml:252
+msgid "Cancel selection"
+msgstr ""
+
+#: src/imports/ContactList/VCardImportDialog.qml:80
+msgid "Close"
+msgstr ""
+
+#: src/imports/ContactView/ContactFetchError.qml:26
 msgid "Contact not found"
 msgstr ""
 
 #: data/address-book-app.desktop.in:6 data/address-book-app.desktop.in:7
-#: src/imports/ContactList/ContactListPage.qml:57
+#: src/imports/ContactList/ContactListPage.qml:75
 msgid "Contacts"
 msgstr ""
 
@@ -62,21 +85,22 @@
 msgid "Country"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:83
-#: src/imports/ContactView/ContactView.qml:181
-#: src/imports/Ubuntu/Contacts/ContactSimpleListView.qml:288
+#: src/imports/ContactEdit/ContactEditor.qml:337
+#: src/imports/ContactList/ContactListPage.qml:148
+#: src/imports/ContactList/ContactListPage.qml:277
 msgid "Delete"
 msgstr ""
 
-#: src/imports/ContactEdit/EditToolbar.qml:57
 #: src/imports/Ubuntu/Contacts/DialogButtons.qml:53
 msgid "Done"
 msgstr ""
 
-#: src/imports/ContactView/ContactView.qml:193
+#: src/imports/ContactEdit/ContactEditor.qml:141
+#: src/imports/ContactView/ContactView.qml:219
 msgid "Edit"
 msgstr ""
 
+#: src/imports/ContactEdit/AddFieldDialog.qml:57
 #: src/imports/ContactEdit/ContactDetailEmailsEditor.qml:23
 #: src/imports/ContactView/ContactDetailEmailsView.qml:23
 #: src/imports/ContactView/ContactDetailEmailsView.qml:26
@@ -95,23 +119,27 @@
 msgid "Enter an email address"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactFetchError.qml:25
-#: src/imports/MainWindow.qml:94
+#: src/imports/ContactView/ContactFetchError.qml:25
+#: src/imports/MainWindow.qml:98
 msgid "Error"
 msgstr ""
 
-#: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:33
+#: src/imports/ContactView/ContactView.qml:195
 msgid "Favorite"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactListView.qml:93
+#: src/imports/Ubuntu/Contacts/ContactListView.qml:348
 msgid "Favourites"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactDetailNameEditor.qml:81
+#: src/imports/ContactEdit/ContactDetailNameEditor.qml:83
 msgid "First name"
 msgstr ""
 
+#: src/imports/Ubuntu/Contacts/ContactListView.qml:427
+msgid "Frequently called"
+msgstr ""
+
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:116
 #: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:94
 msgid "Home"
@@ -125,19 +153,27 @@
 msgid "IM"
 msgstr ""
 
+#: src/imports/ContactList/VCardImportDialog.qml:71
+msgid "Import vCards"
+msgstr ""
+
+#: src/imports/ContactList/VCardImportDialog.qml:72
+msgid "Importing..."
+msgstr ""
+
 #: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:64
 msgid "Jabber"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactDetailNameEditor.qml:81
+#: src/imports/ContactEdit/ContactDetailNameEditor.qml:83
 msgid "Last name"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactDetailAvatarEditor.qml:85
+#: src/imports/ContactEdit/AvatarImport.qml:71
 msgid "Loading"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:163
+#: src/imports/ContactList/ContactListPage.qml:242
 msgid "Loading..."
 msgstr ""
 
@@ -153,14 +189,23 @@
 msgid "Mobile"
 msgstr ""
 
-#: src/imports/ContactEdit/TextInputDetail.qml:46
+#: src/imports/Common/RemoveContactsDialog.qml:44
+msgid "Multiple contacts"
+msgstr ""
+
+#: src/imports/ContactEdit/TextInputDetail.qml:77
 msgid "Next"
 msgstr ""
 
+#: src/imports/Common/RemoveContactsDialog.qml:74
 #: src/imports/ContactList/OnlineAccountsMessage.qml:48
 msgid "No"
 msgstr ""
 
+#: src/imports/Common/RemoveContactsDialog.qml:40
+msgid "No contact selected."
+msgstr ""
+
 #: src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml:30
 msgid "Organization"
 msgstr ""
@@ -170,6 +215,7 @@
 msgid "Other"
 msgstr ""
 
+#: src/imports/ContactEdit/AddFieldDialog.qml:55
 #: src/imports/ContactEdit/ContactDetailPhoneNumbersEditor.qml:24
 #: src/imports/ContactView/ContactDetailPhoneNumbersView.qml:30
 msgid "Phone"
@@ -179,6 +225,10 @@
 msgid "Post code"
 msgstr ""
 
+#: src/imports/ContactEdit/AddFieldDialog.qml:63
+msgid "Professional Details"
+msgstr ""
+
 #: src/imports/ContactEdit/ContactDetailOrganizationsEditor.qml:23
 #: src/imports/ContactView/ContactDetailOrganizationsView.qml:27
 msgid "Professional details"
@@ -192,19 +242,35 @@
 msgid "Role"
 msgstr ""
 
-#: src/imports/ContactEdit/ContactEditor.qml:295
+#: src/imports/ContactEdit/ContactEditor.qml:385
 msgid "Save"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:83
-#: src/imports/ContactList/ContactListPage.qml:185
+#: src/imports/ContactList/ContactListPage.qml:302
+msgid "Search"
+msgstr ""
+
+#: src/imports/ContactList/ContactListPage.qml:277
 msgid "Select"
 msgstr ""
 
+#: src/imports/ContactList/ContactListPage.qml:261
+msgid "Select All"
+msgstr ""
+
+#: src/imports/ContactList/ContactListPage.qml:75
+msgid "Select Contacts"
+msgstr ""
+
+#: src/imports/ContactEdit/AddFieldDialog.qml:116
+msgid "Select a field"
+msgstr ""
+
 #: src/imports/Ubuntu/Contacts/ContactDetailOnlineAccountTypeModel.qml:67
 msgid "Skype"
 msgstr ""
 
+#: src/imports/ContactEdit/AddFieldDialog.qml:61
 #: src/imports/ContactView/ContactDetailOnlineAccountsView.qml:27
 msgid "Social"
 msgstr ""
@@ -213,15 +279,15 @@
 msgid "Street"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:176
+#: src/imports/ContactList/ContactListPage.qml:293
 msgid "Sync"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:176
+#: src/imports/ContactList/ContactListPage.qml:293
 msgid "Syncing"
 msgstr ""
 
-#: src/imports/ContactList/ContactListPage.qml:163
+#: src/imports/ContactList/ContactListPage.qml:242
 msgid "Syncing..."
 msgstr ""
 
@@ -235,14 +301,10 @@
 
 #. TRANSLATORS: This value is used as default value for phone number format, when no coutry code is provided
 #. the supported values can be found in: https://www.iso.org/obp/ui/#search
-#: src/imports/ContactEdit/TextInputDetail.qml:41
+#: src/imports/ContactEdit/TextInputDetail.qml:73
 msgid "US"
 msgstr ""
 
-#: src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml:111
-msgid "View contact's profile"
-msgstr ""
-
 #: src/imports/Common/ContactDetailGroupWithTypeBase.qml:117
 #: src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml:96
 msgid "Work"
@@ -262,6 +324,7 @@
 msgid "Yahoo"
 msgstr ""
 
+#: src/imports/Common/RemoveContactsDialog.qml:62
 #: src/imports/ContactList/OnlineAccountsMessage.qml:36
 msgid "Yes"
 msgstr ""
 
=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2014-06-11 21:25:08 +0000
+++ src/app/addressbookapp.cpp	2014-06-27 21:27:44 +0000
@@ -43,6 +43,7 @@
              << "[addressbook:///contact?id=<contact-id>"
              << "[addressbook:///create?phone=<phone-number>"
              << "[addressbook:///pick?single=<true/false>"
+             << "[addressbook:///importvcard?url=<vcard-file>"
              << "[--fullscreen]"
              << "[--help]"
              << "[-testability]";
@@ -297,6 +298,11 @@
         args << "single";
         methodsMetaData.insert("pick", args);
         args.clear();
+
+        //vcard
+        args << "url";
+        methodsMetaData.insert("importvcard", args);
+        args.clear();
     }
 
     QUrlQuery query(url);
@@ -356,7 +362,7 @@
             method.invoke(mainView);
             break;
         case 1:
-            method.invoke(mainView, Q_ARG(QVariant, QVariant(args[0].toUtf8())));
+            method.invoke(mainView, Q_ARG(QVariant, QVariant(args[0])));
             break;
         case 2:
             method.invoke(mainView, Q_ARG(QVariant, QVariant(args[0].toUtf8())),
 
=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-06-13 19:54:01 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-06-27 21:27:44 +0000
@@ -52,7 +52,7 @@
 
         if (avatarDetail) {
             var avatarValue = avatarDetail.value(Avatar.ImageUrl)
-            if (avatarValue != "") {
+            if (avatarValue && (avatarValue != "")) {
                 avatarUrl = avatarValue
             }
         }
 
=== modified file 'src/imports/ContactList/CMakeLists.txt'
--- src/imports/ContactList/CMakeLists.txt	2014-05-07 13:14:28 +0000
+++ src/imports/ContactList/CMakeLists.txt	2014-06-27 21:27:44 +0000
@@ -3,6 +3,7 @@
     ContactExporter.qml
     OnlineAccountsMessage.qml
     PageWithBottomEdge.qml
+    VCardImportDialog.qml
 )
 
 install(FILES ${CONTACT_LIST_QMLS}
 
=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-06-17 14:25:22 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-06-27 21:27:44 +0000
@@ -58,6 +58,20 @@
         return newContact
     }
 
+    function createContactWithPhoneNumber(phoneNumber)
+    {
+        var newContact = mainPage.createEmptyContact(phoneNumber)
+        //WORKAROUND: SKD changes the page header as soon as the page get created
+        // setting active false will avoid that
+        mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                                    {model: contactList.listModel,
+                                     contact: newContact,
+                                     active: false,
+                                     enabled: false,
+                                     initialFocusSection: "name"})
+
+    }
+
     title: contactList.isInSelectionMode ? i18n.tr("Select Contacts") : i18n.tr("Contacts")
 
     //bottom edge page
@@ -121,7 +135,7 @@
             bottom: keyboard.top
             right: parent.right
         }
-        contactNameFilter: searchField.text
+        filterTerm: searchField.text
         detailToPick: ContactDetail.PhoneNumber
         multiSelectionEnabled: true
         multipleSelection: !pickMode ||
@@ -160,6 +174,8 @@
             }
         }
 
+        onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
+
         onInfoRequested: {
             mainPage.state = ""
             pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
@@ -343,6 +359,10 @@
                 __customHeaderContents: searchField
                 tools: toolbarItemsSearch
             }
+            PropertyChanges {
+                target: contactList
+                showFavourites: false
+            }
         },
         State {
             name: "selection"
@@ -388,21 +408,11 @@
 
     Connections {
         target: pageStack
+        onCreateContactRequested: mainPage.createContactWithPhoneNumber(phoneNumber)
         onContactRequested: {
             pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
                            {model: contactList.listModel, contactId: contactId})
         }
-        onCreateContactRequested: {
-            var newContact = mainPage.createEmptyContact(phoneNumber)
-            //WORKAROUND: SKD changes the page header as soon as the page get created
-            // setting active false will avoid that
-            mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                        {model: contactList.listModel,
-                                         contact: newContact,
-                                         active: false,
-                                         enabled: false,
-                                         initialFocusSection: "name"})
-        }
         onEditContatRequested: {
             pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
                            {model: contactList.listModel,
@@ -412,6 +422,17 @@
         onContactCreated: {
             mainPage.contactIndex = contact
         }
+
+        onImportContactRequested: {
+            if (urls.length > 0) {
+                var importDialog = Qt.createQmlObject("VCardImportDialog{}",
+                                   mainPage,
+                                   "VCardImportDialog")
+                if (importDialog) {
+                    importDialog.importVCards(contactList.listModel, urls)
+                }
+            }
+        }
     }
 
     KeyboardRectangle {
 
=== added file 'src/imports/ContactList/VCardImportDialog.qml'
--- src/imports/ContactList/VCardImportDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactList/VCardImportDialog.qml	2014-06-27 21:27:44 +0000
@@ -0,0 +1,94 @@
+/*
+ * 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.2
+import QtContacts 5.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 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 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-06-11 21:25:08 +0000
+++ src/imports/MainWindow.qml	2014-06-27 21:27:44 +0000
@@ -50,6 +50,10 @@
         mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"), { pickMode: true, pickMultipleContacts: !isSingle})
     }
 
+    function importvcard(_url) {
+        mainStack.importContactRequested([_url])
+    }
+
     PageStack {
         id: mainStack
 
@@ -60,6 +64,7 @@
         signal editContatRequested(string contactId, string phoneNumber)
         signal contactCreated(QtObject contact)
         signal contactModelError(string errorMessage)
+        signal importContactRequested(var urls)
 
         anchors {
             fill: parent
@@ -118,5 +123,14 @@
                            {pickMode: true,
                             contentHubTransfer: transfer})
         }
+        onImportRequested: {
+            if (transfer.state === ContentHub.ContentTransfer.Charged) {
+                var urls = []
+                for(var i=0; i < transfer.items.length; i++) {
+                    urls.push(transfer.items[i].url)
+                }
+                mainStack.importContactRequested(urls)
+            }
+        }
     }
 }
 
=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
--- src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-06-09 14:12:58 +0000
+++ src/imports/Ubuntu/Contacts/CMakeLists.txt	2014-06-27 21:27:44 +0000
@@ -12,6 +12,7 @@
     DialogButtons.qml
     FastScroll.qml
     FastScroll.js
+    MostCalledModel.qml
     MultipleSelectionListView.qml
     MultipleSelectionVisualModel.qml
     qmldir
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
--- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-06-16 17:25:21 +0000
+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-06-27 21:27:44 +0000
@@ -26,7 +26,7 @@
     property string displayName: ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName])
     readonly property string defaultAvatar: "image://theme/contact"
     readonly property string avatarUrl: ContactsJS.getAvatar(contactElement, "")
-    readonly property bool useDefaultAvatar: (displayName === "" || contact.tag.tag === "") && (avatarUrl === "")
+    readonly property bool useDefaultAvatar: (contactElement == null) || (displayName === "" || contactElement.tag.tag === "") && (avatarUrl === "")
 
     function reload()
     {
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-06-18 21:27:05 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-06-27 21:27:44 +0000
@@ -25,7 +25,9 @@
 
     property bool showAvatar: true
     property bool selected: false
+    property bool isCurrentItem: false
     property string defaultAvatarUrl: ""
+    property string defaultTitle: ""
     property int titleDetail: ContactDetail.Name
     property variant titleFields: [ Name.FirstName, Name.LastName ]
     property bool detailsShown: false
@@ -35,16 +37,13 @@
     signal pressAndHold(int index, QtObject contact)
     signal detailClicked(QtObject contact, QtObject detail, string action)
     signal infoRequested(int index, QtObject contact)
+    signal addContactClicked(string label)
 
     function _onDetailClicked(detail, action)
     {
         detailClicked(contact, detail, action)
     }
 
-    // ListItemWithActions
-    //onItemClicked: root.clicked(index, contact)
-    //onItemPressAndHold: root.pressAndHold(index, contact)
-
     height: delegate.height
     implicitHeight: delegate.height + (pickerLoader.item ? pickerLoader.item.height : 0)
     width: parent ? parent.width : 0
@@ -100,7 +99,7 @@
             }
             font.pointSize: 88
             color: UbuntuColors.lightAubergine
-            text: ContactsJS.formatToDisplay(contact, root.titleDetail, root.titleFields)
+            text: contact ? ContactsJS.formatToDisplay(contact, root.titleDetail, root.titleFields, "") : root.defaultTitle
             elide: Text.ElideRight
         }
 
@@ -113,7 +112,7 @@
                 rightMargin: units.gu(2)
                 verticalCenter: parent.verticalCenter
             }
-            name: "contact"
+            name: contact ? "contact" : "new-contact"
             height: units.gu(3)
             width: opacity > 0.0 ? height : 0
             opacity: root.detailsShown ? 1.0 : 0.0
@@ -122,8 +121,14 @@
             }
 
             MouseArea {
-               anchors.fill: parent
-               onClicked: root.infoRequested(index, contact)
+                anchors.fill: parent
+                onClicked: {
+                    if (contact) {
+                        root.infoRequested(index, contact)
+                    } else {
+                        root.addContactClicked(name.text)
+                    }
+                }
             }
         }
 
@@ -139,7 +144,7 @@
                 return Qt.resolvedUrl("ContactDetailPickerPhoneNumberDelegate.qml")
             }
         }
-        active: root.detailsShown
+        active: contact && root.detailsShown
         asynchronous: true
         anchors {
             top: delegate.bottom
@@ -153,10 +158,79 @@
         }
 
         onStatusChanged: {
-            if (status == Loader.Ready) {
+            if ((status == Loader.Ready) && contact) {
                 pickerLoader.item.updateDetails(contact)
                 pickerLoader.item.detailClicked.connect(root._onDetailClicked)
             }
         }
     }
+
+    Behavior on height {
+        id: behaviorOnHeight
+
+        enabled: false
+        UbuntuNumberAnimation { }
+    }
+
+    state: isCurrentItem ? "expanded" : ""
+    states: [
+        State {
+            name: "expanded"
+            PropertyChanges {
+                target: root
+                clip: true
+                height: root.implicitHeight
+                loaderOpacity: 1.0
+                // FIXME: Setting detailsShown to true on expanded state cause the property to change to false and true during the state transition, and that
+                // causes the loader to load twice
+                //detailsShown: true
+            }
+            PropertyChanges {
+                target: behaviorOnHeight
+                enabled: true
+            }
+        }
+    ]
+    transitions: [
+        Transition {
+            from: "expanded"
+            to: ""
+            SequentialAnimation {
+                UbuntuNumberAnimation {
+                    target: root
+                    properties: "height, loaderOpacity"
+                }
+                PropertyAction {
+                    target: root
+                    property: "clip"
+                }
+                PropertyAction {
+                    target: root
+                    property: "detailsShown"
+                    value: false
+                }
+                PropertyAction {
+                    target: root
+                    property: "ListView.delayRemove"
+                    value: false
+                }
+            }
+        },
+        Transition {
+            from: ""
+            to: "expanded"
+            SequentialAnimation {
+                PropertyAction {
+                    target: root
+                    properties: "detailsShown"
+                    value: true
+                }
+                PropertyAction {
+                    target: root
+                    properties: "ListView.delayRemove"
+                    value: true
+                }
+            }
+        }
+    ]
 }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-18 15:56:42 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-27 21:27:44 +0000
@@ -45,12 +45,12 @@
     readonly property alias count: view.count
 
     /*!
-      \qmlproperty string contactNameFilter
+      \qmlproperty string contactStringFilter
 
       This property holds a string that will be used to filter contacts on the list
       By default this is set to empty
     */
-    property string contactNameFilter: ""
+    property string filterTerm: ""
     /*!
       \qmlproperty Filter filter
 
@@ -223,6 +223,10 @@
     */
     signal detailClicked(QtObject contact, QtObject detail, string action)
     /*!
+      This handler is called when a unknown contact is clicked, the label contains the phone number
+    */
+    signal addContactClicked(string label)
+    /*!
       This handler is called when the contact delegate disapear (height === 0) caused by the function call makeDisappear
     */
     signal contactDisappeared(QtObject contact)
@@ -290,7 +294,8 @@
     Rectangle {
         id: itemHeader
 
-        height: units.gu(2)
+        visible: root.showFavourites && (root.filterTerm.length === 0)
+        height: visible ? units.gu(2) : 0
         anchors {
             left: parent.left
             right: parent.right
@@ -311,14 +316,14 @@
                 text: i18n.dtr("address-book-app", "All")
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                color: root.showFavourites ? UbuntuColors.warmGrey : UbuntuColors.orange
+                color: view.favouritesIsSelected ? UbuntuColors.warmGrey : UbuntuColors.orange
                 MouseArea {
                     anchors.fill: parent
                     onClicked: {
                         //WORKAROUND: clear the model before start populate it with the new contacts
                         //otherwise the model will wait for all contacts before show any new contact
                         root.changeFilter(root.filter)
-                        root.showFavourites = false
+                        view.favouritesIsSelected = false
                     }
                 }
             }
@@ -343,21 +348,22 @@
                 text: i18n.dtr("address-book-app", "Favourites")
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignVCenter
-                color: root.showFavourites ? UbuntuColors.orange : UbuntuColors.warmGrey
+                color: view.favouritesIsSelected ? UbuntuColors.orange : UbuntuColors.warmGrey
                 MouseArea {
                     anchors.fill: parent
-                    onClicked: root.showFavourites = true
+                    onClicked: view.favouritesIsSelected = true
                 }
             }
         }
     }
 
-    onContactNameFilterChanged: contactSearchTimeout.restart()
+    onFilterTermChanged: contactSearchTimeout.restart()
 
     ContactSimpleListView {
         id: view
 
-        property bool showFavourites: false
+        property bool showFavourites: true
+        property bool favouritesIsSelected: false
 
         function getSectionText(index) {
             var tag = listModel.contacts[index].tag.tag
@@ -371,14 +377,93 @@
             top: itemHeader.bottom
             left: parent.left
             right: parent.right
+            bottom: parent.bottom
             rightMargin: fastScroll.showing ? fastScroll.width - units.gu(1) : 0
-            bottom: parent.bottom
-
             Behavior on rightMargin {
                 UbuntuNumberAnimation {}
             }
         }
 
+        header: Column {
+            id: mostCalledView
+
+            function makeItemVisible(item)
+            {
+                var itemY = mostCalledView.y + item.y
+                var areaY = view.contentY
+                if (itemY < areaY) {
+                    view.contentY = itemY
+                }
+            }
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: visible ? childrenRect.height : 0
+            visible: view.favouritesIsSelected && (callerRepeat.count > 0)
+            onHeightChanged: {
+                // make selected item fully visible
+                if (calledModel.currentIndex != -1) {
+                    mostCalledView.makeItemVisible(callerRepeat.itemAt(calledModel.currentIndex))
+                } else {
+                    // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
+                    // this should fix the Y position (630 is the header height)
+                    view.contentY = -630
+                }
+            }
+
+            Rectangle {
+                color: Theme.palette.normal.background
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    margins: units.gu(1)
+                }
+                height: units.gu(3)
+                Label {
+                    anchors.fill: parent
+                    verticalAlignment: Text.AlignVCenter
+                    text: i18n.tr("Frequently called")
+                    font.pointSize: 76
+                }
+                ListItem.ThinDivider {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                    }
+                }
+            }
+            Repeater {
+                id: callerRepeat
+
+                model: MostCalledModel {
+                    id: calledModel
+                    maxCount: 20
+
+                    onInfoRequested: root.infoRequested(contact)
+                    onDetailClicked: root.detailClicked(contact, detail, action)
+                    onAddContactClicked: root.addContactClicked(label)
+                    onCurrentIndexChanged:  {
+                        if (currentIndex !== -1) {
+                            view.currentIndex = -1
+                        }
+                    }
+                }
+            }
+
+            Connections {
+                target: view
+                onCurrentIndexChanged: {
+                    if (view.currentIndex !== -1) {
+                        calledModel.currentIndex = -1
+                    }
+                }
+            }
+        }
+
+        height: Math.min(root.height, contentHeight)
         onError: root.error(message)
         onInfoRequested: root.infoRequested(contact)
         onDetailClicked: root.detailClicked(contact, detail, action)
@@ -400,6 +485,34 @@
             matchFlags: DetailFilter.MatchExactly
         }
 
+        UnionFilter {
+            id: contactTermFilter
+
+            property string value: ""
+
+            DetailFilter {
+                detail: ContactDetail.DisplayLabel
+                field: DisplayLabel.Label
+                value: contactTermFilter.value
+                matchFlags: DetailFilter.MatchContains
+            }
+
+            DetailFilter {
+                detail: ContactDetail.PhoneNumber
+                field: PhoneNumber.Number
+                value: contactTermFilter.value
+                matchFlags: DetailFilter.MatchPhoneNumber
+            }
+
+            DetailFilter {
+                detail: ContactDetail.PhoneNumber
+                field: PhoneNumber.Number
+                value: contactTermFilter.value
+                matchFlags: DetailFilter.MatchContains
+            }
+        }
+
+
         IntersectionFilter {
             id: contactsFilter
 
@@ -407,29 +520,21 @@
 
             filters: {
                 var filters = []
-                if (root.showFavourites) {
+                if (contactTermFilter.value.length > 0) {
+                    filters.push(contactTermFilter)
+                } else if (view.showFavourites && view.favouritesIsSelected) {
                     filters.push(favouritesFilter)
                 }
+
                 if (root.filter) {
                     filters.push(root.filter)
                 }
-                if (nameFilter.value && (nameFilter.value.length > 0)) {
-                    filters.push(nameFilter)
-                }
+
                 active = (filters.length > 0)
                 return filters
             }
         }
 
-        DetailFilter {
-            id: nameFilter
-
-            detail: ContactDetail.DisplayLabel
-            field: DisplayLabel.Label
-            value: root.nameFilter
-            matchFlags: DetailFilter.MatchContains
-        }
-
         Timer {
             id: contactSearchTimeout
 
@@ -437,14 +542,26 @@
             repeat: false
             interval: 300
             onTriggered: {
-                if (root.contactNameFilter === "") { // if the search criteria is empty clear the list before show all contacts
-                    contactList.changeFilter(root.filter)
-                    nameFilter.value = ""
+                var needUpdate = false
+                if (root.filterTerm === "") { // if the search criteria is empty clear the list before show all contacts
+                    if (contactTermFilter.value !== "") {
+                        root.changeFilter(root.filter)
+                        contactTermFilter.value = ""
+                        needUpdate = true
+                    }
                 } else {
-                    if (nameFilter.value === "") { // if the search starts clear the list before show results
-                        contactList.changeFilter(root.filter)
+                    if (contactTermFilter.value !== root.filterTerm) {
+                        if (contactTermFilter.value === "") { // if the search starts clear the list before show results
+                            root.changeFilter(root.filter)
+                        }
+                        contactTermFilter.value = root.filterTerm
+                        needUpdate = true
                     }
-                    nameFilter.value = root.contactNameFilter
+                }
+
+                // manually update if autoUpdate is disabled
+                if (needUpdate && !root.autoUpdate) {
+                    contactsModel.update()
                 }
             }
         }
@@ -499,9 +616,9 @@
         enabled: view.contentHeight > (view.height * 2)
 
         anchors {
-            top: itemHeader.bottom
+            top: view.top
             topMargin: units.gu(0.5)
-            bottom: parent.bottom
+            bottom: view.bottom
             right: parent.right
         }
     }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-16 17:33:52 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-27 21:27:44 +0000
@@ -268,34 +268,16 @@
     listDelegate: ContactDelegate {
         id: contactDelegate
 
-        // overwrite
-        function disappeared()
-        {
-            contactListView.contactDisappeared(contact)
-        }
-
         width: parent.width
         selected: contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate)
         defaultAvatarUrl: contactListView.defaultAvatarImageUrl
         titleDetail: contactListView.titleDetail
         titleFields: contactListView.titleFields
-
-        // ListItemWithActions
-        //locked: contactListView.isInSelectionMode || detailsShown
-        //triggerActionOnMouseRelease: true
-        //leftSideAction: contactListView.leftSideAction
-        //rightSideActions: contactListView.rightSideActions
+        isCurrentItem: ListView.isCurrentItem
 
         onDetailClicked: contactListView.detailClicked(contact, detail, action)
         onInfoRequested: contactListView._fetchContact(index, contact)
 
-        Behavior on height {
-            id: behaviorOnHeight
-
-            enabled: false
-            UbuntuNumberAnimation { }
-        }
-
         // collapse the item before remove it, to avoid crash
         ListView.onRemove: SequentialAnimation {
             ScriptAction {
@@ -333,67 +315,6 @@
                 contactListView.selectItem(contactDelegate)
             }
         }
-        state: ListView.isCurrentItem ? "expanded" : ""
-        states: [
-            State {
-                name: "expanded"
-                PropertyChanges {
-                    target: contactDelegate
-                    clip: true
-                    height: contactDelegate.implicitHeight
-                    loaderOpacity: 1.0
-                    // FIXME: Setting detailsShown to true on expanded state cause the property to change to false and true during the state transition, and that
-                    // causes the loader to load twice
-                    //detailsShown: true
-                }
-                PropertyChanges {
-                    target: behaviorOnHeight
-                    enabled: true
-                }
-            }
-        ]
-        transitions: [
-            Transition {
-                from: "expanded"
-                to: ""
-                SequentialAnimation {
-                    UbuntuNumberAnimation {
-                        target: contactDelegate
-                        properties: "height, loaderOpacity"
-                    }
-                    PropertyAction {
-                        target: contactDelegate
-                        property: "clip"
-                    }
-                    PropertyAction {
-                        target: contactDelegate
-                        property: "detailsShown"
-                        value: false
-                    }
-                    PropertyAction {
-                        target: contactDelegate
-                        property: "ListView.delayRemove"
-                        value: false
-                    }
-                }
-            },
-            Transition {
-                from: ""
-                to: "expanded"
-                SequentialAnimation {
-                    PropertyAction {
-                        target: contactDelegate
-                        properties: "detailsShown"
-                        value: true
-                    }
-                    PropertyAction {
-                        target: contactDelegate
-                        properties: "ListView.delayRemove"
-                        value: true
-                    }
-                }
-            }
-        ]
     }
 
     ContactFetch {
 
=== modified file 'src/imports/Ubuntu/Contacts/Contacts.js'
--- src/imports/Ubuntu/Contacts/Contacts.js	2014-06-06 17:52:58 +0000
+++ src/imports/Ubuntu/Contacts/Contacts.js	2014-06-27 21:27:44 +0000
@@ -2,9 +2,9 @@
 var phoneTypeModel = null
 
 // Format contact name to be displayed
-function formatToDisplay(contact, contactDetail, detailFields, detail) {
+function formatToDisplay(contact, contactDetail, detailFields, detail, defaultTitle) {
     if (!contact) {
-        return ""
+        return defaultTitle
     }
 
     if (!detail) {
 
=== added file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
--- src/imports/Ubuntu/Contacts/MostCalledModel.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-06-27 21:27:44 +0000
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2012-2013 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.2
+import QtContacts 5.0
+import Ubuntu.History 0.1
+import Ubuntu.Telephony 0.1
+
+VisualDataModel {
+    id: root
+
+    property int maxCount: 10
+    property var contactModel: null
+    property var historyModel
+    property int currentIndex: -1
+
+    signal clicked(int index, QtObject contact)
+    signal detailClicked(QtObject contact, QtObject detail, string action)
+    signal infoRequested(int index, QtObject contact)
+    signal addContactClicked(string label)
+
+    function filterEntries()
+    {
+        var contacts = {}
+        var interval = new Date()
+        var secs = (interval.getTime() - 2592000000) // one month ago
+        interval.setTime(secs)
+
+        var totalCount = 0
+        var i = 0;
+        while(true) {
+            var event = historyModel.getItem(i)
+            if (!event) {
+                break
+            }
+
+            if (event.timestamp < interval) {
+                break
+            }
+
+            var participants = event.participants
+            for (var p=0; p < participants.length; p++) {
+                var phoneNumber = participants[p]
+                if (phoneNumber) {
+                    if (contacts[phoneNumber] === undefined) {
+                        contacts[phoneNumber] = 1
+                    } else {
+                        var count = contacts[phoneNumber]
+                        contacts[phoneNumber] = count + 1
+                    }
+                    totalCount += 1
+                }
+            }
+            i++
+        }
+
+        listModel.clear()
+        if (totalCount == 0) {
+            return
+        }
+
+        // sort phones most called first
+        var mostCalledFirst = []
+        for (var key in contacts) {
+            mostCalledFirst.push([key, contacts[key]]);
+        }
+
+        mostCalledFirst.sort(function(a, b) {
+            a = a[1];
+            b = b[1];
+
+            return a < b ? -1 : (a > b ? 1 : 0);
+        });
+
+        contacts = {}
+        for (var i = 0; i < mostCalledFirst.length; i++) {
+            var key = mostCalledFirst[i][0];
+            var value = mostCalledFirst[i][1];
+            contacts[key] = value
+        }
+
+        // get the avarage frequency
+        var average = totalCount / mostCalledFirst.length
+
+        for (var phone in contacts) {
+            if (contacts[phone] >= average) {
+                listModel.insert(0, {"participant": phone})
+                if (listModel.count >= root.maxCount) {
+                    return;
+                }
+            }
+        }
+    }
+
+    model: ListModel {
+        id: listModel
+    }
+
+    historyModel: HistoryEventModel {
+
+        function getItem(row) {
+            while ((row >= count) && (canFetchMore())) {
+                fetchMore()
+            }
+            return get(row)
+        }
+
+        type: HistoryThreadModel.EventTypeVoice
+        sort: HistorySort {
+            sortField: "timestamp"
+            sortOrder: HistorySort.DescendingOrder
+        }
+        Component.onCompleted: root.filterEntries()
+    }
+
+
+    delegate: ContactDelegate {
+        id: contactDelegate
+
+        readonly property alias contact: contactFetch.contact
+
+        onDetailClicked: root.detailClicked(contact, detail, action)
+        onInfoRequested: root.infoRequested(index, contact)
+        onAddContactClicked: root.addContactClicked(label)
+
+        defaultAvatarUrl: "image://theme/contacts"
+        defaultTitle: participant
+        width: parent.width
+        titleDetail: ContactDetail.DisplayLabel
+        titleFields: [ DisplayLabel.Label ]
+        isCurrentItem: root.currentIndex === index
+
+        // collapse the item before remove it, to avoid crash
+        ListView.onRemove: SequentialAnimation {
+            ScriptAction {
+                script: {
+                    if (contactDelegate.state !== "") {
+                        historyModel.currentIndex = -1
+                    }
+                }
+            }
+        }
+
+        onClicked: {
+            if (root.currentIndex === index) {
+                root.currentIndex = -1
+                return
+            } else if (detailToPick !== 0) {
+                root.currentIndex = index
+                return
+            } else if (detailToPick == 0) {
+                contactListView.detailClicked(contact, null, "")
+            }
+        }
+
+        ContactWatcher {
+            id: contactWatcher
+
+            phoneNumber: participant
+            onContactIdChanged: contactFetch.fetchContact(contactId)
+        }
+
+        ContactFetch {
+            id: contactFetch
+
+            model: contactsModel
+        }
+    }
+}
 
=== modified file 'src/imports/Ubuntu/Contacts/qmldir'
--- src/imports/Ubuntu/Contacts/qmldir	2014-06-09 15:52:06 +0000
+++ src/imports/Ubuntu/Contacts/qmldir	2014-06-27 21:27:44 +0000
@@ -16,3 +16,4 @@
 internal ContactJs Contacts.js
 internal FastScroll FastScroll.qml
 internal FastScrollJs FastScroll.js
+internal MostCalledModel MostCalledModel.qml