address-book-app

Merge lp:~renatofilho/address-book-app/contact-share into lp:~phablet-team/address-book-app/staging

contact-share
Merge into staging

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

Status:	Merged
Merged at revision:	185
Proposed branch:	lp:~renatofilho/address-book-app/contact-share
Merge into:	lp:~phablet-team/address-book-app/staging
Diff against target:	608 lines (+137/-247) 14 files modified CMakeLists.txt (+0/-1) click/address-book-content.json (+3/-0) debian/control (+0/-1) src/app/CMakeLists.txt (+0/-7) src/app/addressbookapp.cpp (+0/-10) src/app/addressbookapp.h (+0/-3) src/app/contentcommunicator.cpp (+0/-140) src/app/contentcommunicator.h (+0/-61) src/imports/CMakeLists.txt (+1/-0) src/imports/ContactList/ContactListPage.qml (+43/-18) src/imports/ContactShare/CMakeLists.txt (+10/-0) src/imports/ContactShare/ContactSharePage.qml (+62/-0) src/imports/ContactView/ContactView.qml (+11/-0) src/imports/MainWindow.qml (+7/-6)
To merge this branch:	bzr merge lp:~renatofilho/address-book-app/contact-share
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-06-11	Needs Fixing on 2014-06-12
Michael Sheldon (community)		2014-06-11	Approve on 2014-06-11
Review via email: mp+222879@code.launchpad.net

This proposal supersedes a proposal from 2014-06-02.

Commit message

Implemented contact share.
Replaced ContentHub API with QML API.

Revision history for this message

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

FAILED: Continuous integration, rev:234
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/610
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/80/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1051
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1176
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1176/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7990
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/698
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/698/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:235
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/613
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/81/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1053
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1182
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1182/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7996
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/703
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/703/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-06-03: Posted in a previous version of this proposal

Couple of issue, when sharing I'm now getting:

file:///usr/share/address-book-app/imports/ContactShare/ContactSharePage.qml:51: ReferenceError: contactExporter is not defined

And when either exporting to another application or sharing, the exported .vcf file contains *all* contacts, not just the selected/shared ones.

Also as a minor thing the import of Ubuntu.Components.Popups 0.1 in ContactView.qml doesn't seem to be needed any more

review: Needs Fixing

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-06-03: Posted in a previous version of this proposal

Are there any related MPs required for this MP to build/function as expected? YES
lp:~renatofilho/address-book-app/new-designer-contact-list

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 CHANGE

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-06-03: Posted in a previous version of this proposal

Are there any related MPs required for this MP to build/function as expected? YES
lp:~renatofilho/address-book-app/new-designer-contact-list

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? YES

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-06-03: Posted in a previous version of this proposal

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.

* Failed due to unrelated issues (old SDK package in Jenkins)

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

* Yes

review: Approve

Revision history for this message

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

FAILED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/626
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1205
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8020
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/510
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/713
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/713/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Continuous integration, rev:236
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/648
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/593
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1082
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1240
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8050
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/525
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/732
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/732/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-autolanding/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/805/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/745/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1494/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/884/console

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

Michael Sheldon (michael-sheldon) wrote on 2014-06-11:

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

Revision history for this message

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-autolanding/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/750/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1499/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/889/console

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

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

review: Needs Fixing (continuous-integration)

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

Ubuntu Phablet Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2014-06-05 16:35:45 +0000
 +++ CMakeLists.txt	2014-06-12 12:40:31 +0000
@@ -17,7 +17,6 @@
  find_package(Qt5Quick)
  find_package(Qt5DBus)
  find_package(PkgConfig REQUIRED)
--pkg_check_modules(CONTENTHUB REQUIRED libcontent-hub)
  set(ADDRESS_BOOK_APP_DIR ${CMAKE_INSTALL_DATADIR}/address-book-app)
  set(ADDRESS_BOOK_APP_FULL_DIR ${CMAKE_INSTALL_FULL_DATADIR}/address-book-app)
 === modified file 'click/address-book-content.json'
 --- click/address-book-content.json	2014-03-12 01:34:34 +0000
 +++ click/address-book-content.json	2014-06-12 12:40:31 +0000
@@ -1,4 +1,7 @@
+ {
++    "destination": [
++        "contacts"
++    ],
      "source": [
          "contacts"
+     ]
 === modified file 'debian/control'
 --- debian/control	2014-06-06 21:02:16 +0000
 +++ debian/control	2014-06-12 12:40:31 +0000
@@ -5,7 +5,6 @@
  Build-Depends: cmake,
                 debhelper (>= 9),
                 dh-translations,
--               libcontent-hub-dev,
                 libgl1-mesa-dev | libgl-dev,
                 libgles2-mesa-dev,
                 python3,
 === modified file 'src/app/CMakeLists.txt'
 --- src/app/CMakeLists.txt	2014-05-28 20:25:19 +0000
 +++ src/app/CMakeLists.txt	2014-06-12 12:40:31 +0000
@@ -4,14 +4,11 @@
  include_directories(
      ${CMAKE_BINARY_DIR}
--    ${CONTENTHUB_INCLUDE_DIRS}
+ )
  set(ADDRESS_BOOK_APP_SRCS
      addressbookapp.h
      addressbookapp.cpp
--    contentcommunicator.h
--    contentcommunicator.cpp
      imagescalethread.h
      imagescalethread.cpp
      main.cpp
@@ -23,10 +20,6 @@
  qt5_use_modules(${ADDRESS_BOOK_APP_BIN} Gui Core Qml Quick DBus)
--target_link_libraries(${ADDRESS_BOOK_APP_BIN}
--    ${CONTENTHUB_LIBRARIES}
--)
--
  install(TARGETS ${ADDRESS_BOOK_APP_BIN}
      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ )
 === modified file 'src/app/addressbookapp.cpp'
 --- src/app/addressbookapp.cpp	2014-06-05 19:22:08 +0000
 +++ src/app/addressbookapp.cpp	2014-06-12 12:40:31 +0000
@@ -17,7 +17,6 @@
  #include "config.h"
  #include "addressbookapp.h"
  #include "imagescalethread.h"
--#include "contentcommunicator.h"
  #include <QDir>
  #include <QUrl>
@@ -94,7 +93,6 @@
  AddressBookApp::AddressBookApp(int &argc, char **argv)
      : QGuiApplication(argc, argv),
        m_view(0),
--      m_contentComm(0),
        m_syncMonitor(0),
        m_pickingMode(false),
        m_testMode(false),
@@ -151,10 +149,7 @@
              qCritical("Library qttestability load failed!");
+         }
          m_testMode = true;
--    } else {
--        m_contentComm = new ContentCommunicator(this);
+     }
--
      /* Ubuntu APP Manager gathers info on the list of running applications from the .desktop
         file specified on the command line with the desktop_file_hint switch, and will also pass a stage hint
         So app will be launched like this:
@@ -186,7 +181,6 @@
      m_view->setTitle("AddressBook");
      m_view->engine()->addImportPath(QCoreApplication::applicationDirPath() + "/" + importPath(""));
      m_view->rootContext()->setContextProperty("QTCONTACTS_MANAGER_OVERRIDE", defaultManager);
--    m_view->rootContext()->setContextProperty("contactContentHub", m_contentComm);
      m_view->rootContext()->setContextProperty("application", this);
      m_view->rootContext()->setContextProperty("contactKey", contactKey);
      m_view->rootContext()->setContextProperty("TEST_DATA", testData);
@@ -220,10 +214,6 @@
      if (m_view) {
          delete m_view;
+     }
--
--    if (m_contentComm) {
--        delete m_contentComm;
--    }
+ }
  void AddressBookApp::onViewStatusChanged(QQuickView::Status status)
 === modified file 'src/app/addressbookapp.h'
 --- src/app/addressbookapp.h	2014-05-09 20:00:09 +0000
 +++ src/app/addressbookapp.h	2014-06-12 12:40:31 +0000
@@ -22,8 +22,6 @@
  #include <QtGui/QGuiApplication>
  #include <QtQuick/QQuickView>
--class ContentCommunicator;
--
  class AddressBookApp : public QGuiApplication
+ {
      Q_OBJECT
@@ -62,7 +60,6 @@
  private:
      QQuickView *m_view;
--    ContentCommunicator *m_contentComm;
      QDBusInterface *m_syncMonitor;
      QString m_initialArg;
      bool m_viewReady;
 === removed file 'src/app/contentcommunicator.cpp'
 --- src/app/contentcommunicator.cpp	2014-03-12 00:58:11 +0000
 +++ src/app/contentcommunicator.cpp	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
--/*
-- * Copyright (C) 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/>.
-- *
-- */
--
--#include <contentcommunicator.h>
--
--#include <QDebug>
--#include <QTemporaryFile>
--#include <QDir>
--
--#include <com/ubuntu/content/hub.h>
--#include <com/ubuntu/content/item.h>
--#include <com/ubuntu/content/transfer.h>
--
--using namespace com::ubuntu::content;
--
--/*!
-- * \brief ContentCommunicator::ContentCommunicator
-- * \param parent
-- */
--ContentCommunicator::ContentCommunicator(QObject *parent)
--    : ImportExportHandler(parent),
--      m_transfer(0)
--{
--    Hub *hub = Hub::Client::instance();
--    if (hub) {
--        hub->register_import_export_handler(this);
--    } else {
--        qWarning() << "Fail to get Hub client instance";
--    }
--}
--
--/*!
-- * \brief \reimp
-- */
--void ContentCommunicator::handle_import(content::Transfer *)
--{
--    qDebug() << Q_FUNC_INFO << "address book app does not import content";
--}
--
--/*!
-- * \brief \reimp
-- */
--void ContentCommunicator::handle_export(content::Transfer *transfer)
--{
--    if (m_transfer != 0) {
--        qWarning() << "address book app does only one content export at a time";
--        transfer->abort();
--        m_transfer = 0;
--        return;
--    }
--
--    if (transfer) {
--        m_transfer = transfer;
--        connect(m_transfer, SIGNAL(selectionTypeChanged()), SIGNAL(multipleItemsChanged()));
--    } else {
--        qWarning() << "Transfer pointer is null in handle_export";
--    }
--    Q_EMIT contactRequested();
--    Q_EMIT activeChanged();
--    Q_EMIT multipleItemsChanged();
--}
--
--/*!
-- * \brief \reimp
-- */
--void ContentCommunicator::handle_share(content::Transfer *)
--{
--    qDebug() << Q_FUNC_INFO << "address book app does not share content";
--}
--
--/*!
-- * \brief ContentCommunicator::cancelTransfer aborts the current transfer
-- */
--void ContentCommunicator::cancelTransfer()
--{
--    if (!m_transfer) {
--        qWarning() << "No ongoing transfer to cancel";
--        return;
--    }
--
--    m_transfer->abort();
--    m_transfer = 0;
--    Q_EMIT activeChanged();
--}
--
--/*!
-- * \brief ContentCommunicator::returnContacts returns the given contacts
-- * via content hub to the requester
-- * \param urls
-- */
--void ContentCommunicator::returnContacts(const QUrl &contactsFile)
--{
--    if (!m_transfer) {
--        qWarning() << "No ongoing transfer to return a contact";
--        return;
--    }
--
--    QVector<Item> items;
--    items << contactsFile;
--    m_transfer->charge(items);
--    m_transfer = 0;
--    Q_EMIT activeChanged();
--}
--
--bool ContentCommunicator::isActive() const
--{
--    return (m_transfer != 0);
--}
--
--bool ContentCommunicator::isMultipleItems() const
--{
--    return (m_transfer && m_transfer->selectionType() == Transfer::multiple);
--}
--
--QUrl ContentCommunicator::createTemporaryFile() const
--{
--    QTemporaryFile tmp(QDir::tempPath() + "/vcard_XXXXXX.vcf");
--    tmp.setAutoRemove(false);
--    if (!tmp.open()) {
--        qWarning() << "Fail to create temporary file for vcard.";
--        return QUrl();
--    }
--    QString tmpFileName = tmp.fileName();
--    tmp.close();
--    return QUrl::fromLocalFile(tmpFileName);
--}
 === removed file 'src/app/contentcommunicator.h'
 --- src/app/contentcommunicator.h	2014-03-12 00:58:11 +0000
 +++ src/app/contentcommunicator.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
--/*
-- * Copyright (C) 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/>.
-- *
-- */
--
--#ifndef CONTENTCOMMUNICATOR_H
--#define CONTENTCOMMUNICATOR_H
--
--#include <com/ubuntu/content/import_export_handler.h>
--#include <com/ubuntu/content/transfer.h>
--
--#include <QStringList>
--
--using namespace com::ubuntu;
--
--/*!
-- * Class to handle the communication with the content manager
-- */
--class ContentCommunicator : public content::ImportExportHandler
--{
--    Q_OBJECT
--    Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)
--    Q_PROPERTY(bool multipleItems READ isMultipleItems NOTIFY multipleItemsChanged)
--
--public:
--    ContentCommunicator(QObject *parent = 0);
--
--    virtual void handle_import(content::Transfer*);
--    virtual void handle_export(content::Transfer *transfer);
--    virtual void handle_share(content::Transfer*);
--
--    bool isActive() const;
--    bool isMultipleItems() const;
--
--public Q_SLOTS:
--    void cancelTransfer();
--    void returnContacts(const QUrl &contactsFile);
--    QUrl createTemporaryFile() const;
--
--Q_SIGNALS:
--    void contactRequested();
--    void activeChanged();
--    void multipleItemsChanged();
--
--private:
--    content::Transfer *m_transfer;
--};
--
--#endif // CONTENTCOMMUNICATOR_H
 === modified file 'src/imports/CMakeLists.txt'
 --- src/imports/CMakeLists.txt	2013-11-12 15:52:18 +0000
 +++ src/imports/CMakeLists.txt	2014-06-12 12:40:31 +0000
@@ -13,4 +13,5 @@
  add_subdirectory(ContactList)
  add_subdirectory(ContactView)
  add_subdirectory(ContactEdit)
++add_subdirectory(ContactShare)
  add_subdirectory(Ubuntu)
 === modified file 'src/imports/ContactList/ContactListPage.qml'
 --- src/imports/ContactList/ContactListPage.qml	2014-06-11 22:05:50 +0000
 +++ src/imports/ContactList/ContactListPage.qml	2014-06-12 12:40:31 +0000
@@ -21,6 +21,7 @@
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import Ubuntu.Contacts 0.1 as ContactsUI
  import Ubuntu.Components.Popups 0.1 as Popups
++import Ubuntu.Content 0.1 as ContentHub
  import "../ContactEdit"
  import "../Common"
@@ -29,6 +30,7 @@
      objectName: "contactListPage"
      property bool pickMode: false
++    property alias contentHubTransfer: contactExporter.activeTransfer
      property bool pickMultipleContacts: false
      property var onlineAccountsMessageDialog: null
      property QtObject contactIndex: null
@@ -126,7 +128,7 @@
          detailToPick: ContactDetail.PhoneNumber
          multiSelectionEnabled: true
          multipleSelection: !pickMode ||
--                           ((contactContentHub && contactContentHub.multipleItems) || mainPage.pickMultipleContacts)
++                           mainPage.pickMultipleContacts || (contactExporter.active && contactExporter.isMultiple)
          anchors.fill: parent
@@ -181,9 +183,7 @@
                  for (var i=0; i < items.count; i++) {
                      contacts.push(items.get(i).model.contact)
+                 }
--                exporter.contactModel = contactList.listModel
--                exporter.contacts = contacts
--                exporter.start()
++                contactExporter.exportContacts(contacts)
              } else {
                  var contacts = []
@@ -198,8 +198,8 @@
          onSelectionCanceled: {
              if (pickMode) {
--                if (contactContentHub) {
--                    contactContentHub.cancelTransfer()
++                if (contentHubTransfer) {
++                    contentHubTransfer.state = ContentTransfer.Aborted
+                 }
                  pageStack.pop()
                  application.returnVcard("")
@@ -430,20 +430,37 @@
+         }
+     }
--    ContactExporter {
--        id: exporter
--        contactModel: contactList.listModel ? contactList.listModel : null
--        outputFile: contactContentHub ? contactContentHub.createTemporaryFile() : "/tmp/vcard_address_book_app.vcf"
--        onCompleted: {
--            if (contactContentHub) {
--                if (error == ContactModel.ExportNoError) {
--                    contactContentHub.returnContacts(exporter.outputFile)
--                } else {
--                    contactContentHub.cancelTransfer()
--                }
++
++    QtObject {
++        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)
+             }
              pageStack.pop()
--            application.returnVcard(exporter.outputFile)
++            application.returnVcard(url)
+         }
+     }
@@ -459,5 +476,13 @@
          if (TEST_DATA != "") {
              contactList.listModel.importContacts("file://" + TEST_DATA)
+         }
++
++        if (!pickMode) {
++            mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
++                                       {model: contactList.listModel,
++                                        contact: mainPage.createEmptyContact(""),
++                                        active: false,
++                                        enabled: false})
++        }
+     }
+ }
 === added directory 'src/imports/ContactShare'
 === added file 'src/imports/ContactShare/CMakeLists.txt'
 --- src/imports/ContactShare/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ src/imports/ContactShare/CMakeLists.txt	2014-06-12 12:40:31 +0000
@@ -0,0 +1,10 @@
++set(CONTACT_SHARE_QMLS
++    ContactSharePage.qml
++)
++
++install(FILES ${CONTACT_SHARE_QMLS}
++    DESTINATION ${ADDRESS_BOOK_APP_DIR}/imports/ContactShare
++)
++
++# make the files visible on qtcreator
++add_custom_target(contact_share_QmlFiles ALL SOURCES ${CONTACT_SHARE_QMLS})
 === added file 'src/imports/ContactShare/ContactSharePage.qml'
 --- src/imports/ContactShare/ContactSharePage.qml	1970-01-01 00:00:00 +0000
 +++ src/imports/ContactShare/ContactSharePage.qml	2014-06-12 12:40:31 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2012-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.Content 0.1 as ContentHub
++
++Page {
++    id: picker
++
++    property var contactModel
++    property var contact
++    property var curTransfer
++
++    ContentHub.ContentPeerPicker {
++        visible: true
++        anchors.fill: parent
++        contentType: ContentHub.ContentType.Contacts
++        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.contact])
++            }
++        }
++
++        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)
++                }
++            }
++            pageStack.pop()
++        }
++    }
++}
 === modified file 'src/imports/ContactView/ContactView.qml'
 --- src/imports/ContactView/ContactView.qml	2014-06-10 12:27:54 +0000
 +++ src/imports/ContactView/ContactView.qml	2014-06-12 12:40:31 +0000
@@ -202,6 +202,17 @@
      tools: ToolbarItems {
          ToolbarButton {
              action: Action {
++                objectName: "share"
++                text: i18n.tr("Share")
++                iconName: "share"
++                onTriggered: {
++                    pageStack.push(Qt.resolvedUrl("../ContactShare/ContactSharePage.qml"),
++                                   { contactModel: root.model, contact: root.contact})
++                }
++            }
++        }
++        ToolbarButton {
++            action: Action {
                  objectName: "edit"
                  text: i18n.tr("Edit")
                  iconSource: "artwork:/edit.png"
 === modified file 'src/imports/MainWindow.qml'
 --- src/imports/MainWindow.qml	2014-06-05 19:20:12 +0000
 +++ src/imports/MainWindow.qml	2014-06-12 12:40:31 +0000
@@ -18,6 +18,7 @@
  import QtContacts 5.0
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 0.1 as Popups
++import Ubuntu.Content 0.1 as ContentHub
  MainView {
      id: mainWindow
@@ -110,12 +111,12 @@
+     }
      Connections {
--        target: contactContentHub
--        onActiveChanged: {
--            if (contactContentHub && contactContentHub.active) {
--                // enter in pick mode
--                mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"), {pickMode: true})
--            }
++        target: ContentHub.ContentHub
++        onExportRequested: {
++            // enter in pick mode
++            mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"),
++                           {pickMode: true,
++                            contentHubTransfer: transfer})
+         }
+     }
+ }

address-book-app

Merge lp:~renatofilho/address-book-app/contact-share into lp:~phablet-team/address-book-app/staging

Commit message

Description of the change

Preview Diff

Subscribers