address-book-app

Merge lp:~renatofilho/address-book-app/fix-1371243 into lp:~phablet-team/address-book-app/staging

fix-1371243
Merge into staging

Proposed by Renato Araujo Oliveira Filho on 2014-09-23

Status:

Merged

Approved by:

Michał Karnicki on 2014-10-03

Approved revision:

312

Merged at revision:

312

Proposed branch:

lp:~renatofilho/address-book-app/fix-1371243

Merge into:

lp:~phablet-team/address-book-app/staging

Diff against target:

189 lines (+39/-43)

4 files modified

src/imports/ContactList/ContactExporter.qml (+12/-8)
src/imports/ContactList/ContactListPage.qml (+24/-33)
src/imports/ContactShare/ContactSharePage.qml (+1/-1)
src/imports/ContentHubProxy.qml (+2/-1)

To merge this branch:

bzr merge lp:~renatofilho/address-book-app/fix-1371243

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Karnicki (community)		2014-09-23	Approve on 2014-10-02
PS Jenkins bot	continuous-integration		Approve on 2014-10-01
Review via email: mp+235708@code.launchpad.net

Commit message

Fetch the full contact before export it on contact list.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/fix-1371243 updated on 2014-09-30

309. By Renato Araujo Oliveira Filho on 2014-09-30: Hide select all button if the list is in single selection mode.

Revision history for this message

Michał Karnicki (karni) wrote on 2014-09-30:

Left some in-line questions. Marking as "needs information" only because I have questions, since I'm not familiar with the code base.

review: Needs Information

lp:~renatofilho/address-book-app/fix-1371243 updated on 2014-09-30

310. By Renato Araujo Oliveira Filho on 2014-09-30: Renamed ContactExporter signal name from contactFetched to contactsFetched
311. By Renato Araujo Oliveira Filho on 2014-09-30: Used contact name on vcard file used during the contact export process.

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) on 2014-09-30:

Revision history for this message

Michał Karnicki (karni) wrote on 2014-09-30:

Lookds good to me. I would advise at least another review from the apps team.

review: Approve

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michał Karnicki (karni) wrote on 2014-10-01:

Renato, I'm getting 404, can't test the deb.

Revision history for this message

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

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

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/fix-1371243 updated on 2014-10-01

312. By Renato Araujo Oliveira Filho on 2014-10-01: Fixed content hub import in single mode.

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michał Karnicki (karni) wrote on 2014-10-02:

Works fine, although I find it confusing to see checkboxes in a single select mode. Clicking on a contact should be, in my opinion, sufficient to pick it. The 'share' button seems artifical, but I can guess that has been 'designed that way'.

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:

Michał Karnicki

Renato Araujo Oliveira Filho

Ubuntu Phablet Team

 === modified file 'src/imports/ContactList/ContactExporter.qml'
 --- src/imports/ContactList/ContactExporter.qml	2014-05-06 13:18:07 +0000
 +++ src/imports/ContactList/ContactExporter.qml	2014-10-01 18:56:48 +0000
@@ -20,15 +20,15 @@
  Item {
      id: root
--    property var contacts: []
      property var contactModel
      property var outputFile
--    signal completed(int error)
++    signal contactExported(int error, string url)
++    signal contactsFetched(var contacts)
--    function start() {
++    function start(contacts) {
          if (!contactModel) {
--            console.log("No contact model defined")
++            console.error("No contact model defined")
              return
+         }
@@ -48,6 +48,7 @@
              priv.currentQueryId = contactModel.fetchContacts(ids)
+         }
+     }
++
      Item {
          id: priv
@@ -58,15 +59,18 @@
              onExportCompleted: {
                  priv.currentQueryId = -1
--                root.completed(error)
++                root.contactExported(error, root.outputFile)
+             }
              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 !== "") {
++                        root.contactModel.exportContacts(root.outputFile,
++                                                         [],
++                                                         fetchedContacts)
++                    }
++                    root.contactsFetched(fetchedContacts)
+                 }
+             }
+         }
 === 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-01 18:56:48 +0000
@@ -258,9 +258,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 +303,6 @@
+         }
          onAddDetailClicked: mainPage.addPhoneToContact(contact.contactId, " ")
--
          onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
          onSelectionCanceled: {
              if (pickMode) {
@@ -463,7 +460,7 @@
                              contactList.selectAll()
+                         }
+                     }
--                    visible: contactList.isInSelectionMode
++                    visible: contactList.multipleSelection
                  },
                  Action {
                      objectName: "share"
@@ -478,13 +475,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,39 +619,39 @@
+         }
+     }
--    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)
++
++        contactModel: contactList.listModel
++        outputFile: mainPage.pickMode ? "file:///tmp/address_book_app_export.vcf" : ""
++        onContactExported: {
++            // send contacts back to source app (pick mode)
              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
++                if (activeTransfer) {
++                    activeTransfer.items = [obj]
++                    activeTransfer.state = ContentHub.ContentTransfer.Charged
++                }  else {
++                    console.error("No active transfer")
++                }
              } else {
                  console.error("Fail to export contacts:" + error)
+             }
              activeTransfer = null
--            pickMode = false
++            mainPage.pickMode = false
              mainPage.state = "defautl"
              application.returnVcard(url)
+         }
++
++        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 })
++            }
++        }
+     }
      Component.onCompleted: {
 === 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-01 18:56:48 +0000
@@ -35,7 +35,7 @@
          onPeerSelected: {
              picker.curTransfer = peer.request();
              if (picker.curTransfer.state === ContentHub.ContentTransfer.InProgress) {
--                var vCardUrl = "file:///tmp/vcard_" + encodeURIComponent(contact.contactId) + ".vcf"
++                var vCardUrl = "file:///tmp/vcard_" + (picker.contacts[0].displayLabel.label.replace(/\s/g, '')) + ".vcf"
                  picker.contactModel.exportContacts(vCardUrl, [], picker.contacts)
+             }
+         }
 === modified file 'src/imports/ContentHubProxy.qml'
 --- src/imports/ContentHubProxy.qml	2014-07-28 23:12:24 +0000
 +++ src/imports/ContentHubProxy.qml	2014-10-01 18:56:48 +0000
@@ -24,7 +24,8 @@
              target: ContentHub.ContentHub
              onExportRequested: {
                  // enter in pick mode
--                pageStack.contactListPage.startPickMode(false, transfer)
++                pageStack.contactListPage.startPickMode((transfer.selectionType === ContentHub.ContentTransfer.Single),
++                                                        transfer)
+             }
              onImportRequested: {
                  if (transfer.state === ContentHub.ContentTransfer.Charged) {

address-book-app

Merge lp:~renatofilho/address-book-app/fix-1371243 into lp:~phablet-team/address-book-app/staging

Commit message

Description of the change

Preview Diff

Subscribers