address-book-app

Merge lp:~renatofilho/address-book-app/multiple-addressbook into lp:address-book-app

multiple-addressbook
Merge into trunk

Proposed by Renato Araujo Oliveira Filho on 2014-03-19

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2014-03-27
Approved revision:	154
Merged at revision:	159
Proposed branch:	lp:~renatofilho/address-book-app/multiple-addressbook
Merge into:	lp:address-book-app
Prerequisite:	lp:~renatofilho/address-book-app/optimize-app
Diff against target:	306 lines (+189/-5) 9 files modified src/imports/Common/ContactDetailBase.qml (+6/-0) src/imports/ContactEdit/CMakeLists.txt (+1/-0) src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml (+106/-0) src/imports/ContactEdit/ContactEditor.qml (+15/-0) src/imports/ContactList/ContactListPage.qml (+1/-1) src/imports/ContactView/CMakeLists.txt (+1/-0) src/imports/ContactView/ContactDetailSyncTargetView.qml (+30/-0) src/imports/ContactView/ContactView.qml (+9/-0) src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+20/-4)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/multiple-addressbook
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Tiago Salem Herrmann (community)		2014-03-19	Approve on 2014-03-27
PS Jenkins bot	continuous-integration	2014-03-19	Approve on 2014-03-26
Review via email: mp+211806@code.launchpad.net

This proposal supersedes a proposal from 2014-03-05.

Commit message

Implemented support to create contacts in different sources.

Description of the change

How to test this:

- You can use this script: http://paste.ubuntu.com/7132433/ to create multitple sources on your phone. (run this as phablet user. Ex: python3 create-source.py MySource)

- You will need this service branch to have access to other sources: https://code.launchpad.net/~renatofilho/address-book-service/implement-multiple-addressbook-support/+merge/210881

- Try create contacts in different sources and check if it was correct saved on the contact view.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-05: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-20

145. By Renato Araujo Oliveira Filho on 2014-03-20: Merged parent branch.
146. By Renato Araujo Oliveira Filho on 2014-03-20: Merged parent branch.

Revision history for this message

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

FAILED: Continuous integration, rev:146
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/469/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-amd64-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-armhf-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-trusty-i386-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3723/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3725/console

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-21

147. By Renato Araujo Oliveira Filho on 2014-03-21: Added missing file.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-21

148. By Renato Araujo Oliveira Filho on 2014-03-21: Fixed problem saving contact without sync target.

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-03-25:

is this really required?

152 + z: 1000

also, can we remove the following line, or did you leave it there on purpose?

229 + //defaultIcon: "image://theme/language-chooser"

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-25

149. By Renato Araujo Oliveira Filho on 2014-03-25: Merged parent branch.
150. By Renato Araujo Oliveira Filho on 2014-03-25: Set the default icon for address-book.

Revision history for this message

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

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

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-26

151. By Renato Araujo Oliveira Filho on 2014-03-26: Merged parent branch: lp:~renatofilho/address-book-app/optimize-app

Revision history for this message

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

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

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-26

152. By Renato Araujo Oliveira Filho on 2014-03-26: Merged mainline.

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-03-26:

Are there any related MPs required for this MP to build/function as expected? NO
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): 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 (https://wiki.ubuntu.com/Process/Merges/TestPlan/address-book-app) 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 CHANGE

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-26

153. By Renato Araujo Oliveira Filho on 2014-03-26: Fixed scroll to created contact.

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/multiple-addressbook updated on 2014-03-26

154. By Renato Araujo Oliveira Filho on 2014-03-26: Scroll to contact based on the contact name if the contact id is empty

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-03-27:

looks good to me.

review: Approve

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-03-27:

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

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 'src/imports/Common/ContactDetailBase.qml'
 --- src/imports/Common/ContactDetailBase.qml	2013-11-14 13:25:28 +0000
 +++ src/imports/Common/ContactDetailBase.qml	2014-03-26 22:14:43 +0000
@@ -61,6 +61,10 @@
          imMap[QtContacts.OnlineAccount.Protocol] = "imProtocol"
          imMap[QtContacts.OnlineAccount.Capabilities] = "imCaps"
++        // SyncTarget
++        var syncTargetMap = {}
++        syncTargetMap[QtContacts.SyncTarget.SyncTarget] = "syncTarget"
++
          // all
          var detailMap = {}
          detailMap[QtContacts.ContactDetail.Name] = nameMap
@@ -68,6 +72,7 @@
          detailMap[QtContacts.ContactDetail.Email] = emailMap
          detailMap[QtContacts.ContactDetail.Address] = addressMap
          detailMap[QtContacts.ContactDetail.OnlineAccount] = imMap
++        detailMap[QtContacts.ContactDetail.SyncTarget] = syncTargetMap
          // detail name
          var detailNameMap = {}
@@ -76,6 +81,7 @@
          detailNameMap[QtContacts.ContactDetail.Email] = "email"
          detailNameMap[QtContacts.ContactDetail.Address] = "address"
          detailNameMap[QtContacts.ContactDetail.OnlineAccount] = "onlineAccount"
++        detailNameMap[QtContacts.ContactDetail.SyncTarget] = "syncTarget"
          if ((detail in detailMap) && (field in detailMap[detail])) {
              return detailMap[detail][field]
 === modified file 'src/imports/ContactEdit/CMakeLists.txt'
 --- src/imports/ContactEdit/CMakeLists.txt	2013-09-24 15:07:46 +0000
 +++ src/imports/ContactEdit/CMakeLists.txt	2014-03-26 22:14:43 +0000
@@ -7,6 +7,7 @@
      ContactDetailOnlineAccountsEditor.qml
      ContactDetailOrganizationsEditor.qml
      ContactDetailPhoneNumbersEditor.qml
++    ContactDetailSyncTargetEditor.qml
      ContactDetailWithTypeEditor.qml
      ContactEditor.qml
      ContactFetchError.qml
 === added file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
 --- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	1970-01-01 00:00:00 +0000
 +++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-03-26 22:14:43 +0000
@@ -0,0 +1,106 @@
++/*
++ * 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.0
++import QtContacts 5.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++import "../Common"
++
++ContactDetailBase {
++    id: root
++
++    function save() {
++        // only changes the target sync for new contacts
++        if (!isNewContact) {
++            return;
++        }
++        var activeSource = getSelectedSource()
++        if (!activeSource) {
++            return;
++        }
++
++        if (!root.detail) {
++            root.detail = root.contact.syncTarget
++        }
++        root.detail.syncTarget = activeSource
++    }
++
++    function getSelectedSource() {
++        var selectedContact = sourceModel.contacts[sources.selectedIndex]
++        if (selectedContact) {
++            return selectedContact.guid.guid
++        } else {
++            return -1
++        }
++    }
++
++    property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
++    property real myHeight: sources.containerHeight + units.gu(4) + label.height
++
++    detail: contact ? contact.detail(ContactDetail.SyncTarget) : null
++    implicitHeight: isNewContact ? myHeight : 0
++
++    ContactModel {
++        id: sourceModel
++
++        manager: QTCONTACTS_MANAGER_OVERRIDE && QTCONTACTS_MANAGER_OVERRIDE != "" ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
++        filter:  DetailFilter {
++            detail: ContactDetail.Type
++            field: Type.TypeField
++            value: Type.Group
++            matchFlags: DetailFilter.MatchExactly
++        }
++    }
++
++    Label {
++        id: label
++
++        text: i18n.tr("Addressbook")
++        anchors {
++            left: parent.left
++            top: parent.top
++            right: parent.right
++            margins: units.gu(2)
++        }
++        height: root.active ? units.gu(4) : units.gu(3)
++    }
++
++    OptionSelector {
++        id: sources
++
++        anchors {
++            left: parent.left
++            leftMargin: units.gu(2)
++            top: label.bottom
++            topMargin: units.gu(1)
++            right: parent.right
++            rightMargin: units.gu(2)
++            bottom: parent.bottom
++            bottomMargin: units.gu(2)
++        }
++
++        model: sourceModel
++        delegate: OptionSelectorDelegate {
++            text: contact.displayLabel.label
++            height: units.gu(5)
++        }
++
++        containerHeight: sourceModel.contacts.length > 4 ? itemHeight * 4 : itemHeight * sourceModel.contacts.length
++    }
++}
++
 === modified file 'src/imports/ContactEdit/ContactEditor.qml'
 --- src/imports/ContactEdit/ContactEditor.qml	2014-03-26 22:14:43 +0000
 +++ src/imports/ContactEdit/ContactEditor.qml	2014-03-26 22:14:43 +0000
@@ -181,6 +181,7 @@
+                 }
                  height: implicitHeight + units.gu(3)
                  KeyNavigation.tab: avatarEditor
++                KeyNavigation.backtab : syncTargetEditor
+             }
              ContactDetailAvatarEditor {
@@ -261,6 +262,20 @@
+                 }
                  height: implicitHeight
                  KeyNavigation.backtab : addressesEditor
++                KeyNavigation.tab: syncTargetEditor
++            }
++
++            ContactDetailSyncTargetEditor {
++                id: syncTargetEditor
++
++                contact: contactEditor.contact
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                }
++                height: implicitHeight
++                KeyNavigation.backtab : organizationsEditor
++                KeyNavigation.tab: nameEditor
+             }
+         }
+     }
 === modified file 'src/imports/ContactList/ContactListPage.qml'
 --- src/imports/ContactList/ContactListPage.qml	2014-03-26 22:14:43 +0000
 +++ src/imports/ContactList/ContactListPage.qml	2014-03-26 22:14:43 +0000
@@ -174,7 +174,7 @@
      Connections {
          target: mainPage.contactModel
          onContactsChanged: {
--            if (contactIndex && contactIndex.contactId != "contact:qtcontacts:::") {
++            if (contactIndex) {
                  contactList.positionViewAtContact(mainPage.contactIndex)
                  mainPage.contactIndex = null
+             }
 === modified file 'src/imports/ContactView/CMakeLists.txt'
 --- src/imports/ContactView/CMakeLists.txt	2013-10-21 19:25:51 +0000
 +++ src/imports/ContactView/CMakeLists.txt	2014-03-26 22:14:43 +0000
@@ -11,6 +11,7 @@
      ContactDetailOrganizationsView.qml
      ContactDetailPhoneNumbersView.qml
      ContactDetailPhoneNumberView.qml
++    ContactDetailSyncTargetView.qml
      ContactDetailWithTypeView.qml
      ContactHeaderView.qml
      ContactView.qml
 === added file 'src/imports/ContactView/ContactDetailSyncTargetView.qml'
 --- src/imports/ContactView/ContactDetailSyncTargetView.qml	1970-01-01 00:00:00 +0000
 +++ src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-03-26 22:14:43 +0000
@@ -0,0 +1,30 @@
++/*
++ * 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.0
++import Ubuntu.Components 0.1
++import QtContacts 5.0 as QtContacts
++
++ContactDetailGroupWithTypeView {
++    id: root
++
++    title: i18n.tr("Addressbook")
++    defaultIcon: "image://theme/contact-group"
++    detailType: QtContacts.ContactDetail.SyncTarget
++    typeModel: null
++
++    fields: [ QtContacts.SyncTarget.SyncTarget ]
++}
 === modified file 'src/imports/ContactView/ContactView.qml'
 --- src/imports/ContactView/ContactView.qml	2014-03-18 21:02:25 +0000
 +++ src/imports/ContactView/ContactView.qml	2014-03-26 22:14:43 +0000
@@ -137,6 +137,15 @@
+                 }
                  height: implicitHeight
+             }
++
++            ContactDetailSyncTargetView {
++                contact: root.contact
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                }
++                height: implicitHeight
++            }
+         }
+     }
 === modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-03-26 22:14:43 +0000
 +++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-03-26 22:14:43 +0000
@@ -191,16 +191,32 @@
      signal detailClicked(QtObject contact, QtObject detail)
      /*!
--      Retrieve the contact index inside of the list
++      Retrieve the contact index inside of the list based on contact id or contact name if the id is empty
      */
      function getIndex(contact)
+     {
--        var contacts = listModel.contacts;
++        var contacts = listModel.contacts
++        var contactId = null
++        var firstName
++        var middleName
++        var lastName
++
++        if (contact.contactId !== "qtcontacts:::") {
++            contactId = contact.contactId
++        } else {
++            firstName = contact.name.firstName
++            middleName = contact.name.middleName
++            lastName = contact.name.lastName
++        }
          for (var i = 0, count = contacts.length; i < count; i++) {
--            var itemId = contacts[i].contactId
--            if (itemId === contact.contactId) {
++            var c = contacts[i]
++            if (contactId && (c.contactId === contactId)) {
                  return i
++            } else if ((c.name.firstName === firstName) &&
++                       (c.name.middleName === middleName) &&
++                       (c.name.lastName === lastName)) {
++                    return i
+             }
+         }