address-book-app

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

release-06-10-2014
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-10-06

Status:

Merged

Approved by:

Bill Filler on 2014-10-28

Approved revision:

321

Merged at revision:

324

Proposed branch:

lp:~renatofilho/address-book-app/release-06-10-2014

Merge into:

lp:address-book-app

Diff against target:

848 lines (+289/-207)

17 files modified

data/address-book-app.desktop.in.in (+0/-1)
debian/control (+1/-0)
src/imports/Common/CMakeLists.txt (+1/-0)
src/imports/Common/ContactExporter.qml (+72/-10)
src/imports/ContactList/CMakeLists.txt (+0/-1)
src/imports/ContactList/ContactListPage.qml (+43/-86)
src/imports/ContactList/OnlineAccountsMessage.qml (+74/-30)
src/imports/ContactShare/ContactSharePage.qml (+15/-21)
src/imports/ContentHubProxy.qml (+3/-2)
src/imports/MainWindow.qml (+12/-2)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+2/-2)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+3/-5)
src/imports/Ubuntu/Contacts/ContactListView.qml (+0/-14)
src/imports/Ubuntu/Contacts/ContactPreviewPage.qml (+7/-13)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+1/-17)
src/imports/Ubuntu/Contacts/Contacts.js (+55/-1)
src/imports/Ubuntu/Contacts/MostCalledModel.qml (+0/-2)

To merge this branch:

bzr merge lp:~renatofilho/address-book-app/release-06-10-2014

Related bugs:

Bug #1371243: Incorrectly generated vcard on ContentHub export	Critical	Fix Released
Bug #1372860: [Address Book] app sends you to "Online Accounts" and strands you there	High	Fix Released
Bug #1380094: sync failing and retries in a loop	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-10-06	Approve on 2014-10-28
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-23
Review via email: mp+237277@code.launchpad.net

Commit message

Fetch the full contact before export it on contact list.
Removed "_X-Ubuntu-Splash-Title" key from desktop file.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-06:

FAILED: Continuous integration, rev:313
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/address-book-app/release-06-10-2014/+merge/237277/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/address-book-app-ci/690/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5534
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6786
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6786/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3313
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4256
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4256/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-08:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-09:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-10-10:

tested, works

review: Approve

Revision history for this message

Bill Filler (bfiller) wrote on 2014-10-10:

Actually found an issue. Import of contacts doesn't work anymore. The way to test is send a vcard to your gmail account, then click on it from gmail and select Address Book from picker. Get this error:

file:///usr/share/address-book-app/imports/ContentHubProxy.qml:36: TypeError: Property 'importvcards' of object PageStack_QMLTYPE_22_QML_51(0x142b300) is not a function

review: Needs Fixing

lp:~renatofilho/address-book-app/release-06-10-2014 updated on 2014-10-10

318. By Renato Araujo Oliveira Filho on 2014-10-10: Fix import vcard.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-10:

PASSED: Continuous integration, rev:318
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/694/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5817
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5472
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7069
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7069/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3406
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4368
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4368/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/release-06-10-2014 updated on 2014-10-13

319. By Renato Araujo Oliveira Filho on 2014-10-13: Disabled "tst_VCardParser" until the new SDK get released.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-13:

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/release-06-10-2014 updated on 2014-10-14

320. By Renato Araujo Oliveira Filho on 2014-10-14: Revert changes on tests.
Added thumbnailer-service as build-dep to avoid problems with unit test.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-14:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-10-14:

Are there any related MPs required for this MP to build/function as expected? NO

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 UI labels, did you update the pot file? NO STRING CHANGE

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP? NO PACKAGE CHANGE

lp:~renatofilho/address-book-app/release-06-10-2014 updated on 2014-10-23

321. By Renato Araujo Oliveira Filho <renato@renato-ubuntu> on 2014-10-23: Update online account check
Format contact preview page title based on designer spec

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-23:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-10-28:

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Renato Araujo Oliveira Filho

Rufus

Ubuntu Phablet Team

 === modified file 'data/address-book-app.desktop.in.in'
 --- data/address-book-app.desktop.in.in	2014-09-29 15:10:16 +0000
 +++ data/address-book-app.desktop.in.in	2014-10-23 15:17:29 +0000
@@ -14,5 +14,4 @@
  X-Ubuntu-StageHint=SideStage
  X-Ubuntu-Single-Instance=true
  X-Ubuntu-Splash-Show-Header=true
--_X-Ubuntu-Splash-Title=Contacts
  @XSCREENSHOT@
 === modified file 'debian/control'
 --- debian/control	2014-08-19 14:40:54 +0000
 +++ debian/control	2014-10-23 15:17:29 +0000
@@ -20,6 +20,7 @@
                 qtbase5-dev,
                 qtdeclarative5-dev,
                 qtpim5-dev,
++               thumbnailer-service,
                 xvfb [i386 amd64 armhf],
  Standards-Version: 3.9.5
  Homepage: https://launchpad.net/address-book-app
 === modified file 'src/imports/Common/CMakeLists.txt'
 --- src/imports/Common/CMakeLists.txt	2014-08-13 20:52:57 +0000
 +++ src/imports/Common/CMakeLists.txt	2014-10-23 15:17:29 +0000
@@ -1,5 +1,6 @@
  set(CONTACT_COMMON_QMLS
      ContactDetailItem.qml
++    ContactExporter.qml
      KeyboardRectangle.qml
      RemoveContactsDialog.qml
      StandardAnimation.qml
 === renamed file 'src/imports/ContactList/ContactExporter.qml' => 'src/imports/Common/ContactExporter.qml'
 --- src/imports/ContactList/ContactExporter.qml	2014-05-06 13:18:07 +0000
 +++ src/imports/Common/ContactExporter.qml	2014-10-23 15:17:29 +0000
@@ -16,19 +16,21 @@
  import QtQuick 2.2
  import QtContacts 5.0
++import Ubuntu.Content 1.1
  Item {
      id: root
--    property var contacts: []
      property var contactModel
      property var outputFile
--
--    signal completed(int error)
--
--    function start() {
++    property var activeTransfer: null
++
++    signal contactsFetched(var contacts)
++    signal done()
++
++    function start(contacts) {
          if (!contactModel) {
--            console.log("No contact model defined")
++            console.error("No contact model defined")
              return
+         }
@@ -48,25 +50,85 @@
              priv.currentQueryId = contactModel.fetchContacts(ids)
+         }
+     }
++
      Item {
          id: priv
          property int currentQueryId: -1
++        readonly property var detailsBlackList: [ ContactDetail.Favorite, ContactDetail.Tag ]
++
++        function filterContactDetails(contact)
++        {
++            var newContact = Qt.createQmlObject("import QtContacts 5.0;  Contact { }", root)
++            var allDetails = contact.contactDetails
++            for(var i=0; i < allDetails.length; i++) {
++                var det = allDetails[i]
++                if (detailsBlackList.indexOf(det.type) == -1) {
++                    newContact.addDetail(det)
++                }
++            }
++            return newContact
++        }
++
++        function generateOutputFileName(contacts)
++        {
++            if (contacts.length === 1) {
++                return "file:///tmp/%1.vcf".arg(contacts[0].displayLabel.label.replace(/\s/g, ''))
++            } else {
++                return "file:///tmp/ubuntu_contacts.vcf";
++            }
++        }
          Connections {
              target: root.contactModel
              onExportCompleted: {
                  priv.currentQueryId = -1
--                root.completed(error)
++
++                // send contacts back to source app (pick mode)
++                if (error === ContactModel.ExportNoError) {
++                    var obj = Qt.createQmlObject("import Ubuntu.Content 1.1;  ContentItem { url: '" + url + "' }", root)
++                    if (root.activeTransfer) {
++                        root.activeTransfer.items = [obj]
++                        root.activeTransfer.state = ContentTransfer.Charged
++                    } else {
++                        console.error("No active transfer")
++                    }
++                } else {
++                    root.activeTransfer = ContentHub.ContentTransfer.Aborted
++                    console.error("Fail to export contacts:" + error)
++                }
++                root.done()
+             }
              onContactsFetched: {
                  // currentQueryId == -2 is used during a fetch using "memory" manager
                  if ((priv.currentQueryId == -2) || (requestId == priv.currentQueryId)) {
--                    root.contactModel.exportContacts(root.outputFile,
--                                                     [],
--                                                     fetchedContacts)
++                    if (root.outputFile !== "") {
++                        var contacts = []
++                        // remove unnecessary info from contacts
++                        for(var i=0; i < fetchedContacts.length; i++) {
++                            contacts.push(priv.filterContactDetails(fetchedContacts[i]))
++                        }
++                        // update outputFile with a friendly name
++                        root.outputFile = priv.generateOutputFileName(contacts)
++
++                        root.contactModel.exportContacts(root.outputFile,
++                                                         [],
++                                                         contacts)
++                    }
++                    root.contactsFetched(fetchedContacts)
++                }
++            }
++        }
++
++        Connections {
++            target: root.activeTransfer
++
++            onStateChanged: {
++                if (root.activeTransfer.state === ContentTransfer.Aborted) {
++                    root.activeTransfer = null
++                    root.done()
+                 }
+             }
+         }
 === modified file 'src/imports/ContactList/CMakeLists.txt'
 --- src/imports/ContactList/CMakeLists.txt	2014-07-25 08:30:04 +0000
 +++ src/imports/ContactList/CMakeLists.txt	2014-10-23 15:17:29 +0000
@@ -1,6 +1,5 @@
  set(CONTACT_LIST_QMLS
      ContactListPage.qml
--    ContactExporter.qml
      OnlineAccountsMessage.qml
      VCardImportDialog.qml
+ )
 === modified file 'src/imports/ContactList/ContactListPage.qml'
 --- src/imports/ContactList/ContactListPage.qml	2014-09-18 23:08:25 +0000
 +++ src/imports/ContactList/ContactListPage.qml	2014-10-23 15:17:29 +0000
@@ -21,7 +21,7 @@
  import Ubuntu.Components.ListItems 1.0 as ListItem
  import Ubuntu.Components.Popups 1.0 as Popups
  import Ubuntu.Contacts 0.1 as ContactsUI
--import Ubuntu.Content 0.1 as ContentHub
++import Ubuntu.Content 1.1 as ContentHub
  import "../Common"
@@ -32,7 +32,6 @@
      property bool pickMode: false
      property alias contentHubTransfer: contactExporter.activeTransfer
      property bool pickMultipleContacts: false
--    property var onlineAccountsMessageDialog: null
      property QtObject contactIndex: null
      property bool contactsLoaded: false
      property string newPhoneToAdd: ""
@@ -147,42 +146,6 @@
      bottomEdgeTitle: "+"
      bottomEdgeEnabled: !contactList.isInSelectionMode
--    Component {
--        id: onlineAccountsDialog
--
--        OnlineAccountsMessage {
--            id: onlineAccountsMessage
--            onCanceled: {
--                mainPage.onlineAccountsMessageDialog = null
--                PopupUtils.close(onlineAccountsMessage)
--                application.unsetFirstRun()
--            }
--            onAccepted: {
--                Qt.openUrlExternally("settings:///system/online-accounts")
--                mainPage.onlineAccountsMessageDialog = null
--                PopupUtils.close(onlineAccountsMessage)
--                application.unsetFirstRun()
--            }
--        }
--    }
--
--    Component {
--        id: removeContactDialog
--
--        RemoveContactsDialog {
--            id: removeContactsDialogMessage
--
--            onCanceled: {
--                PopupUtils.close(removeContactsDialogMessage)
--            }
--
--            onAccepted: {
--                removeContacts(contactList.listModel)
--                PopupUtils.close(removeContactsDialogMessage)
--            }
--        }
--    }
--
      flickable: null
      ContactsUI.ContactListView {
          id: contactList
@@ -258,9 +221,7 @@
          filterTerm: searchField.text
          detailToPick: ContactDetail.PhoneNumber
          multiSelectionEnabled: true
--        multipleSelection: !pickMode ||
--                           mainPage.pickMultipleContacts ||
--                           (contactExporter.active && contactExporter.isMultiple)
++        multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
          leftSideAction: Action {
              iconName: "delete"
@@ -305,7 +266,6 @@
+         }
          onAddDetailClicked: mainPage.addPhoneToContact(contact.contactId, " ")
--
          onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
          onSelectionCanceled: {
              if (pickMode) {
@@ -463,7 +423,7 @@
                              contactList.selectAll()
+                         }
+                     }
--                    visible: contactList.isInSelectionMode
++                    visible: contactList.multipleSelection
                  },
                  Action {
                      objectName: "share"
@@ -478,13 +438,7 @@
                              contacts.push(items.get(i).model.contact)
+                         }
--                        if (mainPage.pickMode) {
--                            contactExporter.exportContacts(contacts)
--                            mainPage.pickMode = false
--                        } else {
--                            pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
--                                           { contactModel: contactList.listModel, contacts: contacts })
--                        }
++                        contactExporter.start(contacts)
                          contactList.endSelection()
+                     }
                  },
@@ -628,49 +582,52 @@
+         }
+     }
--    QtObject {
++    ContactExporter {
          id: contactExporter
--        property var activeTransfer: null
--        readonly property bool active: activeTransfer && (activeTransfer.state === ContentHub.ContentTransfer.InProgress && activeTransfer.direction === ContentHub.ContentTransfer.Import)
--        readonly property bool isMultiple: activeTransfer && (activeTransfer.selectionType === ContentHub.ContentTransfer.Multiple)
--
--        function exportContacts(contacts)
--        {
--            if (activeTransfer) {
--                var exportUrl = "file:///tmp/address_book_app_export.vcf"
--                mainPage.contactModel.exportCompleted.connect(contactExporter.onExportCompleted)
--                mainPage.contactModel.exportContacts(exportUrl, [], contacts)
--            } else {
--                console.error("Export requested with noo active transfer")
--            }
--        }
--
--        function onExportCompleted(error, url)
--        {
--            mainPage.contactModel.exportCompleted.disconnect(contactExporter.onExportCompleted)
--            if (error === ContactModel.ExportNoError) {
--                var obj = Qt.createQmlObject("import Ubuntu.Content 0.1;  ContentItem { url: '" + url + "' }", contactExporter)
--                activeTransfer.items = [obj]
--                activeTransfer.state = ContentHub.ContentTransfer.Charged
--            } else {
--                console.error("Fail to export contacts:" + error)
--            }
--            activeTransfer = null
--            pickMode = false
--            mainPage.state = "defautl"
--            application.returnVcard(url)
++        contactModel: contactList.listModel
++        outputFile: mainPage.pickMode ? "file:///tmp/address_book_app_export.vcf" : ""
++        onDone: {
++            mainPage.pickMode = false
++            mainPage.state = "default"
++            application.returnVcard(contactExporter.outputFile)
++        }
++
++        onContactsFetched: {
++            // Share contacts to an application chosen by the user
++            if (!mainPage.pickMode) {
++                pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
++                               { contactModel: contactExporter.contactModel, contacts: contacts })
++            }
++        }
++    }
++
++    Loader {
++        id: onlineAccount
++        source: (contactList.count === 0) &&
++                application.firstRun ? Qt.resolvedUrl("./OnlineAccountsMessage.qml") : ""
++    }
++
++
++    Component {
++        id: removeContactDialog
++
++        RemoveContactsDialog {
++            id: removeContactsDialogMessage
++
++            onCanceled: {
++                PopupUtils.close(removeContactsDialogMessage)
++            }
++
++            onAccepted: {
++                removeContacts(contactList.listModel)
++                PopupUtils.close(removeContactsDialogMessage)
++            }
+         }
+     }
      Component.onCompleted: {
          application.elapsed()
--        if ((contactList.count === 0) &&
--                   application.firstRun &&
--                   !mainPage.syncEnabled) {
--            mainPage.onlineAccountsMessageDialog = PopupUtils.open(onlineAccountsDialog, null)
--        }
--
          if (TEST_DATA !== "") {
              contactList.listModel.importContacts("file://" + TEST_DATA)
+         }
 === modified file 'src/imports/ContactList/OnlineAccountsMessage.qml'
 --- src/imports/ContactList/OnlineAccountsMessage.qml	2014-07-20 20:23:20 +0000
 +++ src/imports/ContactList/OnlineAccountsMessage.qml	2014-10-23 15:17:29 +0000
@@ -17,35 +17,79 @@
  import QtQuick 2.2
  import Ubuntu.Components 1.1
  import Ubuntu.Components.Popups 1.0 as Popups
--
--Popups.Dialog {
--    width: units.gu(40)
--    height: units.gu(71)
--
--    signal canceled()
--    signal accepted()
--    title: i18n.tr("You have no contacts.")
--    text: i18n.tr("Would you like to sync contacts\nfrom online accounts now?")
--    Button {
--        objectName: "onlineAccountsDialog.yesButton"
--        anchors {
--            left: parent.left
--            right: parent.right
--            margins: units.gu(1)
--        }
--        text: i18n.tr("Yes")
--        onClicked: accepted()
--    }
--
--    Button {
--        objectName: "onlineAccountsDialog.noButton"
--        anchors {
--            left: parent.left
--            right: parent.right
--            margins: units.gu(1)
--        }
--        gradient: UbuntuColors.greyGradient
--        text: i18n.tr("No")
--        onClicked: canceled()
++import Ubuntu.OnlineAccounts 0.1
++import Ubuntu.OnlineAccounts.Client 0.1
++
++Item {
++    id: root
++
++    property var onlineAccountsMessageDialog: null
++
++    function closeDialog()
++    {
++        if (onlineAccountsMessageDialog) {
++            PopupUtils.close(onlineAccountsMessageDialog)
++            onlineAccountsMessageDialog = null
++        }
++        application.unsetFirstRun()
++    }
++
++    AccountServiceModel {
++        id: accounts
++        applicationId: "contacts-sync"
++        onCountChanged: {
++            if (count > 0) {
++                root.closeDialog()
++            }
++        }
++    }
++
++    Setup {
++        id: setup
++        applicationId: "contacts-sync"
++        providerId: "google"
++    }
++
++    Component {
++        id: noAccountDialog
++
++        Popups.Dialog {
++            width: units.gu(40)
++            height: units.gu(71)
++
++            title: i18n.tr("You have no contacts.")
++            text: i18n.tr("Would you like to sync contacts from your google online accounts now?")
++            Button {
++                objectName: "onlineAccountsDialog.yesButton"
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                    margins: units.gu(1)
++                }
++                text: i18n.tr("Yes")
++                onClicked: {
++                    root.closeDialog()
++                    setup.exec()
++                }
++            }
++
++            Button {
++                objectName: "onlineAccountsDialog.noButton"
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                    margins: units.gu(1)
++                }
++                gradient: UbuntuColors.greyGradient
++                text: i18n.tr("No")
++                onClicked: closeDialog()
++            }
++        }
++    }
++
++    Component.onCompleted: {
++        if (accounts.count === 0) {
++            root.onlineAccountsMessageDialog = PopupUtils.open(noAccountDialog, null)
++        }
+     }
+ }
 === modified file 'src/imports/ContactShare/ContactSharePage.qml'
 --- src/imports/ContactShare/ContactSharePage.qml	2014-07-24 12:22:13 +0000
 +++ src/imports/ContactShare/ContactSharePage.qml	2014-10-23 15:17:29 +0000
@@ -17,12 +17,13 @@
  import QtQuick 2.2
  import QtContacts 5.0
  import Ubuntu.Components 1.1
--import Ubuntu.Content 0.1 as ContentHub
++import Ubuntu.Content 1.1 as ContentHub
++import "../Common"
  Page {
      id: picker
--    property var contactModel
++    property alias contactModel: exporter.contactModel
      property var contacts
      property var curTransfer
@@ -33,30 +34,23 @@
          handler: ContentHub.ContentHandler.Share
          onPeerSelected: {
--            picker.curTransfer = peer.request();
--            if (picker.curTransfer.state === ContentHub.ContentTransfer.InProgress) {
--                var vCardUrl = "file:///tmp/vcard_" + encodeURIComponent(contact.contactId) + ".vcf"
--                picker.contactModel.exportContacts(vCardUrl, [], picker.contacts)
++            exporter.activeTransfer = peer.request();
++            if (exporter.activeTransfer.state === ContentHub.ContentTransfer.InProgress) {
++                exporter.start(picker.contacts)
+             }
+         }
--        onCancelPressed: pageStack.pop()
--    }
--
--    Connections {
--        target: picker.contactModel
--        onExportCompleted: {
--            if (picker.curTransfer && (picker.curTransfer.state === ContentHub.ContentTransfer.InProgress)) {
--                if (error === ContactModel.ExportNoError) {
--                    var obj = Qt.createQmlObject("import Ubuntu.Content 0.1;  ContentItem { url: '" + url + "' }", picker)
--                    picker.curTransfer.items = [ obj ]
--                    picker.curTransfer.state = ContentHub.ContentTransfer.Charged
--                } else {
--                    picker.curTransfer = ContentHub.ContentTransfer.Aborted
--                    console.error("Fail to export contact:" + error)
--                }
++        onCancelPressed: {
++            if (exporter.activeTransfer) {
++                exporter.activeTransfer.state = ContentHub.ContentTransfer.Aborted
+             }
              pageStack.pop()
+         }
+     }
++
++    ContactExporter {
++        id: exporter
++
++        onDone: pageStack.pop()
++    }
+ }
 === modified file 'src/imports/ContentHubProxy.qml'
 --- src/imports/ContentHubProxy.qml	2014-07-28 23:12:24 +0000
 +++ src/imports/ContentHubProxy.qml	2014-10-23 15:17:29 +0000
@@ -24,7 +24,8 @@
              target: ContentHub.ContentHub
              onExportRequested: {
                  // enter in pick mode
--                pageStack.contactListPage.startPickMode(false, transfer)
++                mainWindow.pickWithTransfer((transfer.selectionType === ContentHub.ContentTransfer.Single),
++                                             transfer)
+             }
              onImportRequested: {
                  if (transfer.state === ContentHub.ContentTransfer.Charged) {
@@ -32,7 +33,7 @@
                      for(var i=0; i < transfer.items.length; i++) {
                          urls.push(transfer.items[i].url)
+                     }
--                    pageStack.contactListPage.importContact(urls)
++                    mainWindow.importvcards(urls)
+                 }
+             }
+         }
 === modified file 'src/imports/MainWindow.qml'
 --- src/imports/MainWindow.qml	2014-08-14 20:26:22 +0000
 +++ src/imports/MainWindow.qml	2014-10-23 15:17:29 +0000
@@ -54,17 +54,27 @@
      function pick(single)
+     {
++        pickWithTransfer(single, null)
++    }
++
++    function pickWithTransfer(single, activeTransfer)
++    {
          mainStack.resetStack()
          if (mainStack.contactListPage) {
--            mainStack.contactListPage.startPickMode(single == "true", null)
++            mainStack.contactListPage.startPickMode(single == "true", activeTransfer)
+         }
+     }
      function importvcard(_url)
+     {
++        importvcards([_url])
++    }
++
++    function importvcards(_urls)
++    {
          mainStack.resetStack()
          if (mainStack.contactListPage) {
--            mainStack.contactListPage.importContactRequested([_url])
++            mainStack.contactListPage.importContact(_urls)
+         }
+     }
 === modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
 --- src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-08-21 00:45:37 +0000
 +++ src/imports/Ubuntu/Contacts/ContactAvatar.qml	2014-10-23 15:17:29 +0000
@@ -37,7 +37,7 @@
      function reload()
+     {
          img.avatarUrl = Qt.binding(function() { return ContactsJS.getAvatar(contactElement, fallbackAvatarUrl) })
--        initialsLabel.contactDisplayName = Qt.binding(function() { return ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName) })
++        initialsLabel.contactDisplayName = Qt.binding(function() { return ContactsJS.formatToDisplayWithDetails(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName) })
+     }
      radius: "medium"
@@ -47,7 +47,7 @@
          id: initialsLabel
          objectName: "avatarInitials"
--        property string contactDisplayName: ContactsJS.formatToDisplay(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName)
++        property string contactDisplayName: ContactsJS.formatToDisplayWithDetails(contactElement, ContactDetail.Name, [Name.FirstName, Name.LastName], fallbackDisplayName)
          anchors.centerIn: parent
          text: Contacts.contactInitialsFromString(contactDisplayName)
 === modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
 --- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-09-02 19:23:05 +0000
 +++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2014-10-23 15:17:29 +0000
@@ -26,12 +26,10 @@
      property bool showAvatar: true
      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
      property int loaderOpacity: 0.0
      property bool flicking: false
++    readonly property string displayLabel: contact ? ContactsJS.formatToDisplay(contact, "") : ""
      signal clicked(int index, QtObject contact)
      signal pressAndHold(int index, QtObject contact)
@@ -84,7 +82,7 @@
              id: avatar
              contactElement: contact
--            fallbackDisplayName: name.text
++            fallbackDisplayName: root.displayLabel
              anchors {
                  left: parent.left
                  top: parent.top
@@ -107,7 +105,7 @@
+             }
              color: UbuntuColors.lightAubergine
--            text: contact ? ContactsJS.formatToDisplay(contact, root.titleDetail, root.titleFields, "") : root.defaultTitle
++            text: root.displayLabel != "" ? root.displayLabel : i18n.dtr("address-book-app", "No name")
              elide: Text.ElideRight
+         }
 === modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-08-27 22:40:35 +0000
 +++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-10-23 15:17:29 +0000
@@ -69,20 +69,6 @@
      */
      property alias showAvatar: view.showAvatar
      /*!
--      \qmlproperty int titleDetail
--
--      This property holds the contact detail which will be used to display the contact title in the delegate
--      By default this is set to ContactDetail.Name.
--    */
--    property alias titleDetail: view.titleDetail
--    /*!
--      \qmlproperty list<int> titleFields
--
--      This property holds the list of all fields which will be used to display the contact title in the delegate
--      By default this is set to [ Name.FirstName, Name.LastName ]
--    */
--    property alias titleFields: view.titleFields
--    /*!
        \qmlproperty list<SortOrder> sortOrders
        This property holds a list of sort orders used by the contacts model.
 === modified file 'src/imports/Ubuntu/Contacts/ContactPreviewPage.qml'
 --- src/imports/Ubuntu/Contacts/ContactPreviewPage.qml	2014-09-17 18:36:48 +0000
 +++ src/imports/Ubuntu/Contacts/ContactPreviewPage.qml	2014-10-23 15:17:29 +0000
@@ -20,6 +20,7 @@
  import Ubuntu.Components.ListItems 1.0 as ListItem
  import Ubuntu.Contacts 0.1 as ContactsUI
  import Ubuntu.Components.Popups 1.0 as Popups
++import "Contacts.js" as ContactsJS
  Page {
      id: root
@@ -27,22 +28,15 @@
      property QtObject contact: null
      property alias extensions: extensionsContents.children
--    function formatNameToDisplay(contact) {
--        if (!contact) {
--            return ""
--        }
--        if (contact.name) {
--            var detail = contact.name
--            return (detail.firstName + " " + detail.lastName).trim()
--        } else if (contact.displayLabel && contact.displayLabel.label && contact.displayLabel.label !== "") {
--            return contact.displayLabel.label
--        } else {
--            return ""
++    title: ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name"))
++
++    Connections {
++        target: contact
++        onContactChanged: {
++            root.title = ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name"))
+         }
+     }
--    title: formatNameToDisplay(contact)
--
      Flickable {
          id: flickable
 === modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-09-04 18:21:29 +0000
 +++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-10-23 15:17:29 +0000
@@ -54,20 +54,6 @@
      property bool showAvatar: true
      /*!
--      \qmlproperty int titleDetail
--
--      This property holds the contact detail which will be used to display the contact title in the delegate
--      By default this is set to ContactDetail.Name.
--    */
--    property int titleDetail: ContactDetail.DisplayLabel
--    /*!
--      \qmlproperty list<int> titleFields
--
--      This property holds the list of all fields which will be used to display the contact title in the delegate
--      By default this is set to [ Name.FirstName, Name.LastName ]
--    */
--    property variant titleFields: [ DisplayLabel.Label ]
--    /*!
        \qmlproperty list<SortOrder> sortOrders
        This property holds a list of sort orders used by the contacts model.
@@ -101,7 +87,7 @@
          detailTypesHint: {
              var hints = [ ContactDetail.Tag,          // sections
                            ContactDetail.PhoneNumber,  // expansion
--                          contactListView.titleDetail ]
++                          ContactDetail.DisplayLabel ]
              if (contactListView.showAvatar) {
                  hints.push(ContactDetail.Avatar)
@@ -292,8 +278,6 @@
          selected: contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate)
          selectionMode: contactListView.isInSelectionMode
          defaultAvatarUrl: contactListView.defaultAvatarImageUrl
--        titleDetail: contactListView.titleDetail
--        titleFields: contactListView.titleFields
          isCurrentItem: ListView.isCurrentItem
          // actions
 === modified file 'src/imports/Ubuntu/Contacts/Contacts.js'
 --- src/imports/Ubuntu/Contacts/Contacts.js	2014-07-05 22:00:02 +0000
 +++ src/imports/Ubuntu/Contacts/Contacts.js	2014-10-23 15:17:29 +0000
@@ -2,7 +2,8 @@
  var phoneTypeModel = null
  // Format contact name to be displayed
--function formatToDisplay(contact, contactDetail, detailFields, defaultTitle) {
++function formatToDisplayWithDetails(contact, contactDetail, detailFields, defaultTitle)
++{
      if (!contact) {
          return defaultTitle
+     }
@@ -28,6 +29,59 @@
      return values
+ }
++function formatToDisplay(contact, defaultTitle)
++{
++    if (!contact) {
++        return defaultTitle
++    }
++
++    var detail = contact.detail(ContactDetail.DisplayLabel)
++    if (detail && (detail.label.length > 0)) {
++        return detail.label
++    }
++
++    detail = contact.detail(ContactDetail.Name)
++    if (detail) {
++        var fullName = (detail.firstName + " " + detail.lastName).trim()
++        if (fullName.length > 0) {
++            return fullName
++        }
++    }
++
++    detail = contact.detail(ContactDetail.Organization)
++    if (detail) {
++        if (detail.name && (detail.name.length > 0)) {
++            return detail.name
++        }
++    }
++
++    var details = contact.details(ContactDetail.PhoneNumber)
++    if (details.length > 0) {
++        detail = details[0]
++        if (detail.number && detail.number.length > 0) {
++            return detail.number
++        }
++    }
++
++    details = contact.details(ContactDetail.Email)
++    if (details.length > 0) {
++        detail = details[0]
++        if (detail.emailAddress && detail.emailAddress.length > 0) {
++            return detail.emailAddress
++        }
++    }
++
++    details = contact.details(ContactDetail.OnlineAccount)
++    if (details.length > 0) {
++        detail = details[0]
++        if (detail.accountUri && detail.accountUri.length > 0) {
++            return detail.accountUri
++        }
++    }
++
++    return defaultTitle
++}
++
  function getAvatar(contact, defaultValue)
+ {
      // use this verbose mode to avoid problems with binding loops
 === modified file 'src/imports/Ubuntu/Contacts/MostCalledModel.qml'
 --- src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-09-04 20:34:55 +0000
 +++ src/imports/Ubuntu/Contacts/MostCalledModel.qml	2014-10-23 15:17:29 +0000
@@ -75,8 +75,6 @@
          defaultAvatarUrl: "image://theme/contacts"
          width: parent ? parent.width : 0
--        titleDetail: ContactDetail.DisplayLabel
--        titleFields: [ DisplayLabel.Label ]
          isCurrentItem: root.currentIndex === index
          locked: true

address-book-app

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

Commit message

Description of the change

Preview Diff

Subscribers