address-book-app

Merge lp:~renatofilho/address-book-app/syncevolution-to-buteo into lp:address-book-app

  1. syncevolution-to-buteo
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Michael Sheldon
Approved revision: 536
Merged at revision: 478
Proposed branch: lp:~renatofilho/address-book-app/syncevolution-to-buteo
Merge into: lp:address-book-app
Prerequisite: lp:~renatofilho/address-book-app/buteo-qml
Diff against target: 1302 lines (+275/-88)
64 files modified
CMakeLists.txt (+8/-4)
config.h.in (+4/-0)
src/app/CMakeLists.txt (+8/-1)
src/app/addressbookapp.cpp (+52/-2)
src/app/addressbookapp.h (+14/-0)
src/app/main.cpp (+0/-4)
src/imports/ABContactEditorPage.qml (+1/-1)
src/imports/ABContactListPage.qml (+11/-5)
src/imports/ABContactViewPage.qml (+1/-1)
src/imports/MainWindow.qml (+1/-2)
src/imports/Settings/SettingsPage.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml (+1/-1)
src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml (+62/-6)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+44/-6)
src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml (+1/-1)
src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml (+1/-1)
src/imports/Ubuntu/Contacts/ActionButton.qml (+1/-1)
src/imports/Ubuntu/Contacts/CMakeLists.txt (+6/-2)
src/imports/Ubuntu/Contacts/ContactAvatar.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/ContactListView.qml (+6/-2)
src/imports/Ubuntu/Contacts/ContactSimpleListView.qml (+1/-1)
src/imports/Ubuntu/Contacts/FastScroll.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1)
src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml (+1/-1)
src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml (+1/-1)
src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml (+1/-1)
src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml (+1/-1)
src/imports/Ubuntu/Contacts/SIMCardImportPage.qml (+1/-1)
src/imports/Ubuntu/Contacts/SectionDelegate.qml (+1/-1)
src/imports/Ubuntu/Contacts/SubtitledWithColors.qml (+1/-1)
src/imports/Ubuntu/Contacts/contacts.cpp (+8/-0)
src/imports/Ubuntu/Contacts/contacts.h (+1/-0)
src/imports/VCardImportDialog.qml (+1/-1)
tests/qml/tst_ContactEditor.qml (+1/-2)
tests/qml/tst_ContactList.qml (+1/-2)
tests/qml/tst_ContactListModel.qml (+1/-1)
tests/qml/tst_ContactListView.qml (+1/-2)
tests/qml/tst_ContactPreviewPage.qml (+1/-2)
tests/qml/tst_ListWithActions.qml (+1/-1)
To merge this branch: bzr merge lp:~renatofilho/address-book-app/syncevolution-to-buteo
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Michael Sheldon (community) Approve
Review via email: mp+266135@code.launchpad.net

Commit message

Implemented the migration code from syncevolution to buteo.

Description of the change

Are there any related MPs required for this MP to build/function as expected?
~renatofilho/address-book-app/buteo-qml

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

If you changed UI labels, did you update the pot file?
YES

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:461
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/849/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/152/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3483/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3480/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
462. By Renato Araujo Oliveira Filho

Added missing build dep.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:462
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/850/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/153/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3482/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
463. By Renato Araujo Oliveira Filho

Added missing build dep.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:463
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/851/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/154/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3486/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3483/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
464. By Renato Araujo Oliveira Filho

Added missing build dep.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:464
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/852/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/155/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3487/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3484/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
465. By Renato Araujo Oliveira Filho

Added missing build dep.

466. By Renato Araujo Oliveira Filho

Fix unit tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:465
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/853/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/156/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3489/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3486/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:466
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/854/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/157/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3490/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3487/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
467. By Renato Araujo Oliveira Filho

Improve test coverability

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:467
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/855/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/158/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3495/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3492/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
468. By Renato Araujo Oliveira Filho

Remove spaces.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:468
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/856/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/159/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3497/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3494/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
469. By Renato Araujo Oliveira Filho

Fix unit test.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:469
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/857/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3498/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3495/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
470. By Renato Araujo Oliveira Filho

Implemented View interface in galera mock object.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/858/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/161/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3500/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3497/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
471. By Renato Araujo Oliveira Filho

Make sure that dbus call was successfully

472. By Renato Araujo Oliveira Filho

Added missing build dep used by tests.

473. By Renato Araujo Oliveira Filho

Check for 'galera' manager necessary for tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:471
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/859/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/162/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3505/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3502/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:473
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/860/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3507/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3504/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
474. By Renato Araujo Oliveira Filho

Enable "contacts" service when importing accounts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:474
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/861/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/164/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3517/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3514/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
475. By Renato Araujo Oliveira Filho

Updated "Import dialog error" layout.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:475
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/862/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/165/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3519/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3516/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
476. By Renato Araujo Oliveira Filho

Enable all available services of type "contacts" during the import.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:476
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/863/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/166/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3520/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3517/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
477. By Renato Araujo Oliveira Filho

Remove recently created source in case of sync fails.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:477
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/865/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/168/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3541/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
478. By Renato Araujo Oliveira Filho

Avoid remove system address-book.

479. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:479
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/866/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/169/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3549/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3546/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
480. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:480
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/867/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3550/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3547/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
481. By Renato Araujo Oliveira Filho

Does not allow create contacts on read-only sources.

482. By Renato Araujo Oliveira Filho

Block contact edit if the contact is in a read-only source.

483. By Renato Araujo Oliveira Filho

Avoid use of deprecated API.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/868/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/171/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3683/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3680/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
484. By Renato Araujo Oliveira Filho

Update server "safe-mode" on buteo import finished.

485. By Renato Araujo Oliveira Filho

Remove missing include.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/869/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3706/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3703/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/870/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/173/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3709/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3706/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
486. By Renato Araujo Oliveira Filho

Check if buteo is available before start the migration.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:486
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/871/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/174/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3714/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3711/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
487. By Renato Araujo Oliveira Filho

Update SDK import to version 1.3

488. By Renato Araujo Oliveira Filho

Show a warning message if the address-book is marked as read-only.

489. By Renato Araujo Oliveira Filho

Avoid set application name twice.

490. By Renato Araujo Oliveira Filho

Revert changes to use new SDK API.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:488
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/872/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/175/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3766/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3763/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/873/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/176/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3771/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3768/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
491. By Renato Araujo Oliveira Filho

Make sure the "read-only" dialog appear if server is running on safe-mode.
Disable server safe mode if there is no account to update.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:491
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/874/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3773/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3770/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
492. By Renato Araujo Oliveira Filho

Use sync button to update contact import.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:492
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/875/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/178/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3784/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3781/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
493. By Renato Araujo Oliveira Filho

Does not start buteo migration if a contact sync is in progress.

494. By Renato Araujo Oliveira Filho

Show error message if the buteo import fails.

495. By Renato Araujo Oliveira Filho

Does not start buteo migration if application is on pick mode.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:495
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/881/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/184/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3806/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3803/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
496. By Renato Araujo Oliveira Filho

Trunk merged.

497. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/882/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/185/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3811/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3808/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
498. By Renato Araujo Oliveira Filho

FIX: Does not show import dialog if the app was launched from content-hub.

Requires: https://code.launchpad.net/~ken-vandine/content-hub/has_pending/+merge/268618

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/883/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/186/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3817/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3814/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
499. By Renato Araujo Oliveira Filho

Only loads ButeoImportDialog if the app does not have been updated in the past.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/884/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/187/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3821/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3818/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
500. By Renato Araujo Oliveira Filho

Mark dialog as dismissed when import is completed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/886/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/189/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3840/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3837/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
501. By Renato Araujo Oliveira Filho

Updated error messages for buteo import.

Added account name in case of fail to sync account.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/887/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3872/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3869/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
502. By Renato Araujo Oliveira Filho

Make sure that sources created during the migration is removed if the sync fails.

503. By Renato Araujo Oliveira Filho

Show "no-network" only on application startup. If the sync fails due the lack of network show sync error message.

504. By Renato Araujo Oliveira Filho

Updated string syntax.

505. By Renato Araujo Oliveira Filho

Re-enable screensaver before destroy the dialog.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:504
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/888/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/191/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3874/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3871/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/889/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/192/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3875/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3872/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
506. By Renato Araujo Oliveira Filho

Restore migration session if the application was closed.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/890/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/193/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3876/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3873/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
507. By Renato Araujo Oliveira Filho

Removed debug symbols on dialog message.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/891/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/194/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3877/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3874/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
508. By Renato Araujo Oliveira Filho

Make sure that new accounts get fully synced before mark applicaion as ready to use.

509. By Renato Araujo Oliveira Filho

Clear dialog value after close the buteo import dialog.

510. By Renato Araujo Oliveira Filho

Keep a busy entry in config file to notify that the app still running the upgrade.

Check for busy key in components to avoid show inconsistend state.

511. By Renato Araujo Oliveira Filho

Fixed ambiguous warning.

512. By Renato Araujo Oliveira Filho

Fixed typo in function name.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/892/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3886/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3883/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/893/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3887/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3884/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
513. By Renato Araujo Oliveira Filho

Does not show "+ add new" button if the app is upgrading.

514. By Renato Araujo Oliveira Filho

Restore favorite contacts before erase old sources.

515. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/894/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/197/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3889/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3886/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:515
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/895/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/198/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3890/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3887/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
516. By Renato Araujo Oliveira Filho

Does not show contact list in content picker if the app still updating.

517. By Renato Araujo Oliveira Filho

Updated busy message in contact list component.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/896/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/199/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3897/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3894/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:517
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/897/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/200/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3899/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3896/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
518. By Renato Araujo Oliveira Filho

Pop contact list page after close busy dialog.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/898/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/201/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3903/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3900/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
519. By Renato Araujo Oliveira Filho

Show the busy dialog on contact list component after return from inactive state.

520. By Renato Araujo Oliveira Filho

Updated "read-only" messages.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:520
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/899/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/202/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3905/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3902/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
521. By Renato Araujo Oliveira Filho

Avoid query for contacts while app is updating.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:521
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/900/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/203/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3936/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3933/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
522. By Renato Araujo Oliveira Filho

Fixed fileWatcher setup.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:522
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/901/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/204/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3966/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3963/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
523. By Renato Araujo Oliveira Filho

Remove buteo import code.

Code was moved to address-book-service repository.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:523
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/902/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/205/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4002/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3999/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
524. By Renato Araujo Oliveira Filho

Fixed build dep list.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/903/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/206/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4003/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4000/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
525. By Renato Araujo Oliveira Filho

Show a different icon in the sync button if server is on safe-mode.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:525
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/904/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/207/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4007/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4004/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
526. By Renato Araujo Oliveira Filho

Fixed typo.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:526
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/911/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/214/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4035/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4032/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
527. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:527
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/915/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/218/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4142/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
528. By Renato Araujo Oliveira Filho

Disable sync button while updating is running.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:528
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/918/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/221/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4176/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4173/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
529. By Renato Araujo Oliveira Filho

Show a "Upgrade in process..." message if the user try to edit a contact while upgrading the database.

530. By Renato Araujo Oliveira Filho

Split the updater dialog message in multiple lines.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:529
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/920/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/223/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4253/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4250/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:530
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/921/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/224/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4263/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
531. By Renato Araujo Oliveira Filho

Updated upgrade messages.

532. By Renato Araujo Oliveira Filho

Use single lines for string messages.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:531
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/923/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/226/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4286/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4283/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:532
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/927/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/230/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4297/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4294/console

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

review: Needs Fixing (continuous-integration)
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
533. By Renato Araujo Oliveira Filho

Trunk merged.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:533
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/935/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/238/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4332/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Couple of small issues added as diff comments, apart from those this look good.

review: Needs Fixing
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
534. By Renato Araujo Oliveira Filho

Minor fixes.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> Couple of small issues added as diff comments, apart from those this look
> good.
fixed

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

It looks like you you've renamed the call to the contactIsReadyOnly function, but haven't actually renamed the function itself.

review: Needs Fixing
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
535. By Renato Araujo Oliveira Filho

Trunk merged.

536. By Renato Araujo Oliveira Filho

Fixed function name.

Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good :)

review: Approve
lp:~renatofilho/address-book-app/syncevolution-to-buteo updated
537. By Renato Araujo Oliveira Filho

Avoid check for selected source if the source model is empty.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:534
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/940/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/243/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4421/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4418/console

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-05-14 21:23:43 +0000
3+++ CMakeLists.txt 2015-09-30 04:57:46 +0000
4@@ -13,12 +13,16 @@
5 include(GNUInstallDirs)
6 include(autopilot)
7
8-find_package(Qt5Qml)
9-find_package(Qt5Quick)
10-find_package(Qt5DBus)
11 find_package(PkgConfig REQUIRED)
12+find_package(Qt5Core REQUIRED)
13+find_package(Qt5Gui REQUIRED)
14+find_package(Qt5Qml REQUIRED)
15+find_package(Qt5Quick REQUIRED)
16+find_package(Qt5DBus REQUIRED)
17+find_package(Qt5Test REQUIRED)
18+find_package(Qt5Contacts REQUIRED)
19
20-pkg_check_modules(QOfono qofono-qt5)
21+pkg_check_modules(QOfono REQUIRED qofono-qt5)
22
23 find_program(INTLTOOL_MERGE intltool-merge)
24 find_program(INTLTOOL_EXTRACT intltool-extract)
25
26=== modified file 'config.h.in'
27--- config.h.in 2014-07-04 22:36:06 +0000
28+++ config.h.in 2015-09-30 04:57:46 +0000
29@@ -11,4 +11,8 @@
30 #define ADDRESS_BOOK_APP_CLICK_PACKAGE "@CLICK_MODE@"
31 #define I18N_DIRECTORY "@CMAKE_INSTALL_PREFIX@/share/locale"
32
33+#define SETTINGS_ORGANIZATION_NAME "com.ubuntu.address-book"
34+#define SETTINGS_ORGANIZATION_DOMAIN "canonical.com"
35+#define SETTINGS_APP_NAME "AddressBookApp"
36+
37 #endif
38
39=== modified file 'src/app/CMakeLists.txt'
40--- src/app/CMakeLists.txt 2015-04-30 21:17:11 +0000
41+++ src/app/CMakeLists.txt 2015-09-30 04:57:46 +0000
42@@ -4,6 +4,7 @@
43
44 include_directories(
45 ${CMAKE_BINARY_DIR}
46+ ${AccountsQt5_INCLUDE_DIRS}
47 )
48
49 set(ADDRESS_BOOK_APP_SRCS
50@@ -16,7 +17,13 @@
51 ${ADDRESS_BOOK_APP_SRCS}
52 )
53
54-qt5_use_modules(${ADDRESS_BOOK_APP_BIN} Gui Core Qml Quick DBus)
55+target_link_libraries(${ADDRESS_BOOK_APP_BIN}
56+ Qt5::Core
57+ Qt5::Gui
58+ Qt5::Qml
59+ Qt5::Quick
60+ Qt5::DBus
61+)
62
63 install(TARGETS ${ADDRESS_BOOK_APP_BIN}
64 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
65
66=== modified file 'src/app/addressbookapp.cpp'
67--- src/app/addressbookapp.cpp 2015-09-30 04:57:46 +0000
68+++ src/app/addressbookapp.cpp 2015-09-30 04:57:46 +0000
69@@ -32,6 +32,7 @@
70 #include <QSettings>
71 #include <QTimer>
72 #include <QElapsedTimer>
73+#include <QDBusReply>
74
75 #include <QQmlEngine>
76
77@@ -106,8 +107,9 @@
78 m_withArgs(false)
79 {
80 s_elapsed.start();
81- setOrganizationName("com.ubuntu.address-book");
82- setApplicationName("AddressBookApp");
83+ setOrganizationName(SETTINGS_ORGANIZATION_NAME);
84+ setApplicationName(SETTINGS_APP_NAME);
85+ setOrganizationDomain(SETTINGS_ORGANIZATION_DOMAIN);
86 connect(m_netManager.data(),
87 SIGNAL(onlineStateChanged(bool)),
88 SIGNAL(isOnlineChanged()),
89@@ -117,6 +119,8 @@
90 bool AddressBookApp::setup()
91 {
92 installIconPath();
93+ connectWithServer();
94+
95 bool fullScreen = false;
96
97 QString contactKey;
98@@ -275,6 +279,29 @@
99 }
100 }
101
102+void AddressBookApp::startUpdate()
103+{
104+ if (m_updateWatcher) {
105+ return;
106+ }
107+
108+ QDBusMessage startUpdateCall = QDBusMessage::createMethodCall("com.canonical.pim.updater",
109+ "/com/canonical/pim/Updater",
110+ "com.canonical.pim.Updater",
111+ "startUpdate");
112+ QDBusPendingCall pcall = QDBusConnection::sessionBus().asyncCall(startUpdateCall);
113+ m_updateWatcher.reset(new QDBusPendingCallWatcher(pcall, this));
114+ QObject::connect(m_updateWatcher.data(), SIGNAL(finished(QDBusPendingCallWatcher*)),
115+ this, SLOT(onUpdateCallFinished(QDBusPendingCallWatcher*)));
116+ Q_EMIT updatingChanged();
117+}
118+
119+void AddressBookApp::onUpdateCallFinished(QDBusPendingCallWatcher *watcher)
120+{
121+ m_updateWatcher.reset(0);
122+ Q_EMIT updatingChanged();
123+}
124+
125 void AddressBookApp::parseUrl(const QString &arg)
126 {
127 QUrl url = QUrl::fromPercentEncoding(arg.toUtf8());
128@@ -394,6 +421,18 @@
129 m_pickingMode = (name == "pick");
130 }
131
132+void AddressBookApp::connectWithServer()
133+{
134+ m_server.reset(new QDBusInterface("com.canonical.pim",
135+ "/com/canonical/pim/AddressBook",
136+ "com.canonical.pim.AddressBook"));
137+ if (!m_server->isValid()) {
138+ qWarning() << "Fail to connect with pim service.";
139+ }
140+ connect(m_server.data(), SIGNAL(safeModeChanged()), SIGNAL(serverSafeModeChanged()));
141+ Q_EMIT serverSafeModeChanged();
142+}
143+
144 void AddressBookApp::activateWindow()
145 {
146 if (m_view) {
147@@ -424,3 +463,14 @@
148 {
149 return m_netManager->isOnline();
150 }
151+
152+bool AddressBookApp::serverSafeMode() const
153+{
154+ QDBusReply<bool> reply = m_server->call("safeMode");
155+ return reply.value();
156+}
157+
158+bool AddressBookApp::updating() const
159+{
160+ return !m_updateWatcher.isNull();
161+}
162
163=== modified file 'src/app/addressbookapp.h'
164--- src/app/addressbookapp.h 2015-09-30 04:57:46 +0000
165+++ src/app/addressbookapp.h 2015-09-30 04:57:46 +0000
166@@ -19,6 +19,7 @@
167
168 #include <QtCore/QObject>
169 #include <QtDBus/QDBusInterface>
170+#include <QtDBus/QDBusPendingCallWatcher>
171 #include <QtGui/QGuiApplication>
172 #include <QtQuick/QQuickView>
173 #include <QtNetwork/QNetworkConfigurationManager>
174@@ -29,6 +30,8 @@
175 Q_PROPERTY(bool firstRun READ isFirstRun CONSTANT)
176 Q_PROPERTY(QString callbackApplication READ callbackApplication WRITE setCallbackApplication NOTIFY callbackApplicationChanged)
177 Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
178+ Q_PROPERTY(bool serverSafeMode READ serverSafeMode NOTIFY serverSafeModeChanged)
179+ Q_PROPERTY(bool updating READ updating NOTIFY updatingChanged)
180
181 public:
182 AddressBookApp(int &argc, char **argv);
183@@ -40,10 +43,14 @@
184 void setCallbackApplication(const QString &application);
185
186 bool isOnline() const;
187+ bool serverSafeMode() const;
188+ bool updating() const;
189
190 Q_SIGNALS:
191 void callbackApplicationChanged();
192 void isOnlineChanged();
193+ void serverSafeModeChanged();
194+ void updatingChanged();
195
196 public Q_SLOTS:
197 void activateWindow();
198@@ -53,16 +60,23 @@
199 bool isFirstRun() const;
200 void unsetFirstRun() const;
201 void goBackToSourceApp();
202+ void startUpdate();
203
204 // debug
205 void elapsed() const;
206
207+private Q_SLOTS:
208+ void onUpdateCallFinished(QDBusPendingCallWatcher *watcher);
209+
210 private:
211 void callQMLMethod(const QString name, QStringList args);
212+ void connectWithServer();
213
214 private:
215 QQuickView *m_view;
216 QScopedPointer<QNetworkConfigurationManager> m_netManager;
217+ QScopedPointer<QDBusInterface> m_server;
218+ QScopedPointer<QDBusPendingCallWatcher> m_updateWatcher;
219 QString m_initialArg;
220 QString m_callbackApplication;
221 bool m_viewReady;
222
223=== modified file 'src/app/main.cpp'
224--- src/app/main.cpp 2015-05-07 17:27:16 +0000
225+++ src/app/main.cpp 2015-09-30 04:57:46 +0000
226@@ -22,10 +22,6 @@
227
228 int main(int argc, char** argv)
229 {
230- QCoreApplication::setOrganizationName("Canonical");
231- QCoreApplication::setOrganizationDomain("canonical.com");
232- QCoreApplication::setApplicationName("Address Book App");
233-
234 AddressBookApp application(argc, argv);
235
236 if (!application.setup()) {
237
238=== modified file 'src/imports/ABContactEditorPage.qml'
239--- src/imports/ABContactEditorPage.qml 2015-05-07 17:27:16 +0000
240+++ src/imports/ABContactEditorPage.qml 2015-09-30 04:57:46 +0000
241@@ -17,7 +17,7 @@
242 import QtQuick 2.2
243 import QtContacts 5.0
244
245-import Ubuntu.Components 1.1
246+import Ubuntu.Components 1.2
247
248 import Ubuntu.AddressBook.ContactEditor 0.1
249
250
251=== modified file 'src/imports/ABContactListPage.qml'
252--- src/imports/ABContactListPage.qml 2015-09-30 04:57:46 +0000
253+++ src/imports/ABContactListPage.qml 2015-09-30 04:57:46 +0000
254@@ -17,7 +17,7 @@
255 import QtQuick 2.2
256 import QtContacts 5.0
257
258-import Ubuntu.Components 1.1
259+import Ubuntu.Components 1.2
260 import Ubuntu.Components.ListItems 1.0 as ListItem
261 import Ubuntu.Components.Popups 1.0 as Popups
262 import Ubuntu.Contacts 0.1 as ContactsUI
263@@ -226,11 +226,17 @@
264 }
265 },
266 Action {
267- visible: (application.isOnline && contactList.syncEnabled)
268+ visible: (application.isOnline && (contactList.syncEnabled || application.serverSafeMode))
269 text: contactList.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
270- iconName: "reload"
271- enabled: !contactList.syncing
272- onTriggered: contactList.sync()
273+ iconName: application.serverSafeMode ? "reset" : "reload"
274+ enabled: !contactList.syncing && !application.updating
275+ onTriggered: {
276+ if (application.serverSafeMode) {
277+ application.startUpdate()
278+ } else {
279+ contactList.sync()
280+ }
281+ }
282 },
283 Action {
284 text: i18n.tr("Settings")
285
286=== modified file 'src/imports/ABContactViewPage.qml'
287--- src/imports/ABContactViewPage.qml 2015-05-15 15:14:14 +0000
288+++ src/imports/ABContactViewPage.qml 2015-09-30 04:57:46 +0000
289@@ -15,7 +15,7 @@
290 */
291
292 import QtQuick 2.2
293-import Ubuntu.Components 1.1
294+import Ubuntu.Components 1.2
295 import Ubuntu.Components.Popups 1.0 as Popups
296 import Ubuntu.Contacts 0.1
297
298
299=== modified file 'src/imports/MainWindow.qml'
300--- src/imports/MainWindow.qml 2015-07-01 17:50:29 +0000
301+++ src/imports/MainWindow.qml 2015-09-30 04:57:46 +0000
302@@ -15,7 +15,7 @@
303 */
304
305 import QtQuick 2.2
306-import Ubuntu.Components 1.0
307+import Ubuntu.Components 1.2
308 import Ubuntu.Components.Popups 1.0 as Popups
309
310 MainView {
311@@ -102,7 +102,6 @@
312 width: units.gu(40)
313 height: units.gu(71)
314 anchorToKeyboard: false
315- useDeprecatedToolbar: false
316
317 PageStack {
318 id: mainStack
319
320=== modified file 'src/imports/Settings/SettingsPage.qml'
321--- src/imports/Settings/SettingsPage.qml 2015-03-17 17:14:09 +0000
322+++ src/imports/Settings/SettingsPage.qml 2015-09-30 04:57:46 +0000
323@@ -17,7 +17,7 @@
324 import QtQuick 2.2
325 import QtContacts 5.0
326
327-import Ubuntu.Components 1.1
328+import Ubuntu.Components 1.2
329 import Ubuntu.Components.ListItems 1.0 as ListItem
330 import Ubuntu.Contacts 0.1 as ContactsUI
331
332
333=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml'
334--- src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml 2015-05-07 17:27:16 +0000
335+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailItem.qml 2015-09-30 04:57:46 +0000
336@@ -16,7 +16,7 @@
337
338 import QtQuick 2.2
339
340-import Ubuntu.Components 1.1
341+import Ubuntu.Components 1.2
342 import Ubuntu.Contacts 0.1
343
344 ContactDetailBase {
345
346=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml'
347--- src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-06-10 17:25:15 +0000
348+++ src/imports/Ubuntu/AddressBook/Base/ContactExporter.qml 2015-09-30 04:57:46 +0000
349@@ -17,7 +17,7 @@
350 import QtQuick 2.2
351 import QtContacts 5.0
352
353-import Ubuntu.Components 1.1
354+import Ubuntu.Components 1.2
355 import Ubuntu.Content 1.1
356 import Ubuntu.Components.Popups 1.0
357
358
359=== modified file 'src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml'
360--- src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml 2015-04-29 18:39:01 +0000
361+++ src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml 2015-09-30 04:57:46 +0000
362@@ -15,7 +15,7 @@
363 */
364
365 import QtQuick 2.2
366-import Ubuntu.Components 1.1
367+import Ubuntu.Components 1.2
368 import Ubuntu.Components.Popups 1.0
369
370 Dialog {
371
372=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml'
373--- src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2014-08-13 20:52:57 +0000
374+++ src/imports/Ubuntu/AddressBook/ContactEditor/AvatarImport.qml 2015-09-30 04:57:46 +0000
375@@ -16,7 +16,7 @@
376
377 import QtQuick 2.2
378
379-import Ubuntu.Components 1.1
380+import Ubuntu.Components 1.2
381 import Ubuntu.Components.Popups 1.0
382 import Ubuntu.Content 0.1
383
384
385=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml'
386--- src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml 2015-04-29 18:39:01 +0000
387+++ src/imports/Ubuntu/AddressBook/ContactEditor/ComboButtonAddField.qml 2015-09-30 04:57:46 +0000
388@@ -17,7 +17,7 @@
389 import QtQuick 2.2
390 import QtContacts 5.0
391
392-import Ubuntu.Components 1.1
393+import Ubuntu.Components 1.2
394 import Ubuntu.Components.ListItems 1.0
395
396 ComboButton {
397
398=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
399--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml 2015-04-30 21:17:11 +0000
400+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml 2015-09-30 04:57:46 +0000
401@@ -17,7 +17,7 @@
402 import QtQuick 2.2
403 import QtContacts 5.0
404
405-import Ubuntu.Components 1.1
406+import Ubuntu.Components 1.2
407
408 import Ubuntu.Contacts 0.1
409 import Ubuntu.AddressBook.Base 0.1
410
411=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml'
412--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml 2015-05-07 17:27:16 +0000
413+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml 2015-09-30 04:57:46 +0000
414@@ -17,7 +17,7 @@
415 import QtQuick 2.2
416 import QtContacts 5.0
417
418-import Ubuntu.Components 1.1
419+import Ubuntu.Components 1.2
420 import Ubuntu.Components.ListItems 1.0
421 import Ubuntu.Contacts 0.1
422
423
424=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml'
425--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml 2015-05-07 17:27:16 +0000
426+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml 2015-09-30 04:57:46 +0000
427@@ -17,7 +17,7 @@
428 import QtQuick 2.2
429 import QtContacts 5.0
430
431-import Ubuntu.Components 1.1
432+import Ubuntu.Components 1.2
433
434 import Ubuntu.AddressBook.Base 0.1
435
436
437=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
438--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml 2015-09-30 04:57:46 +0000
439+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml 2015-09-30 04:57:46 +0000
440@@ -17,7 +17,7 @@
441 import QtQuick 2.2
442 import QtContacts 5.0
443
444-import Ubuntu.Components 1.1
445+import Ubuntu.Components 1.2
446 import Ubuntu.Components.ListItems 1.0
447
448 import Ubuntu.Contacts 0.1
449@@ -27,6 +27,7 @@
450 id: root
451
452 property alias active: sourceModel.autoUpdate
453+ signal changed()
454
455 function save() {
456 // only changes the target sync for new contacts
457@@ -45,7 +46,10 @@
458 }
459
460 function getSelectedSource() {
461- var selectedContact = sources.model.contacts[sources.selectedIndex]
462+ if (sources.model.count <= 0)
463+ return -1
464+
465+ var selectedContact = sources.model.get(sources.selectedIndex).contact
466 if (selectedContact) {
467 return selectedContact.guid.guid
468 } else {
469@@ -53,23 +57,75 @@
470 }
471 }
472
473+ function contactIsReadOnly(contact) {
474+ var sources = sourceModel.contacts
475+ var contactSyncTarget = contact.syncTarget.value(SyncTarget.SyncTarget + 1)
476+
477+ for (var i = 0; i < writableSources.count; i++) {
478+ if (writableSources.get(i).contact.guid.guid === contactSyncTarget) {
479+ return false
480+ }
481+ }
482+ return true
483+ }
484+
485+ function targetIsReadOnly(target) {
486+ if (!target)
487+ return true
488+
489+ var details = target.details(ContactDetail.ExtendedDetail)
490+ for(var d in details) {
491+ if ((details[d].name === "READ-ONLY") && (details[d].data === true)) {
492+ return true
493+ }
494+ }
495+
496+ return false
497+ }
498+
499 property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
500 property real myHeight: sources.currentlyExpanded ? sources.containerHeight + units.gu(6) + label.height : sources.itemHeight + units.gu(6) + label.height
501
502 detail: root.contact ? contact.detail(ContactDetail.SyncTarget) : null
503- implicitHeight: root.isNewContact && sources.model && (sources.model.contacts.length > 1) ? myHeight : 0
504+ implicitHeight: root.isNewContact && sources.model && (sources.model.count > 1) ? myHeight : 0
505
506 ContactModel {
507 id: sourceModel
508
509 manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ? QTCONTACTS_MANAGER_OVERRIDE : "galera"
510- filter: DetailFilter {
511+ filter: DetailFilter {
512 detail: ContactDetail.Type
513 field: Type.TypeField
514 value: Type.Group
515 matchFlags: DetailFilter.MatchExactly
516 }
517 autoUpdate: false
518+ onContactsChanged: {
519+ if (contacts.length > 0) {
520+ writableSources.reload()
521+ root.changed()
522+ }
523+ }
524+ }
525+
526+ ListModel {
527+ id: writableSources
528+
529+ function reload() {
530+ clear()
531+
532+ // filter out read-only sources
533+ var contacts = sourceModel.contacts
534+ if (contacts.length === 0) {
535+ return
536+ }
537+
538+ for(var i in contacts) {
539+ if (!targetIsReadOnly(contacts[i])) {
540+ append({'contact': contacts[i]})
541+ }
542+ }
543+ }
544 }
545
546 Label {
547@@ -94,7 +150,7 @@
548 OptionSelector {
549 id: sources
550
551- model: sourceModel
552+ model: writableSources
553 anchors {
554 left: parent.left
555 leftMargin: units.gu(2)
556@@ -125,7 +181,7 @@
557 height: units.gu(4)
558 }
559
560- containerHeight: sources.model && sources.model.contacts.length > 4 ? itemHeight * 4 : sources.model ? itemHeight * sources.model.contacts.length : 0
561+ containerHeight: sources.model && sources.model.count > 4 ? itemHeight * 4 : sources.model ? itemHeight * sources.model.count : 0
562 }
563
564 onActiveChanged: {
565
566=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml'
567--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml 2015-05-07 17:27:16 +0000
568+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml 2015-09-30 04:57:46 +0000
569@@ -17,7 +17,7 @@
570 import QtQuick 2.2
571 import QtContacts 5.0
572
573-import Ubuntu.Components 1.1
574+import Ubuntu.Components 1.2
575
576 import Ubuntu.Contacts 0.1
577 import Ubuntu.AddressBook.Base 0.1
578
579=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
580--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml 2015-05-11 14:21:03 +0000
581+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml 2015-09-30 04:57:46 +0000
582@@ -17,9 +17,10 @@
583 import QtQuick 2.2
584 import QtContacts 5.0
585
586-import Ubuntu.Components 1.1
587+import Ubuntu.Components 1.2
588 import Ubuntu.Components.ListItems 1.0
589 import Ubuntu.Components.Popups 1.0
590+import Ubuntu.Contacts 0.1 as ContactsUI
591
592 import Ubuntu.AddressBook.Base 0.1
593
594@@ -123,7 +124,6 @@
595
596 function ready()
597 {
598- console.debug("READYYYYY: " + contactEditor.initialFocusSection)
599 enabled = true
600 _edgeReady = true
601
602@@ -142,8 +142,6 @@
603 function focusToLastPhoneField()
604 {
605 var lastPhoneField = phonesEditor.detailDelegates[phonesEditor.detailDelegates.length - 2].item
606- console.debug("Focus last phone field:" + lastPhoneField)
607- console.debug("PHONES SIZE>" + phonesEditor.detailDelegates.length)
608 lastPhoneField.forceActiveFocus()
609 }
610
611@@ -297,6 +295,14 @@
612 right: parent.right
613 }
614 height: implicitHeight
615+
616+ onChanged: {
617+ if (contactEditor.enabled &&
618+ !contactEditor.isNewContact &&
619+ syncTargetEditor.contactIsReadOnly(contactEditor.contact)) {
620+ PopupUtils.open(alertMessage)
621+ }
622+ }
623 }
624
625 ThinDivider {}
626@@ -398,12 +404,10 @@
627 }
628
629 Component.onCompleted: {
630- console.debug("Editor completed: " + enabled)
631 if (!enabled) {
632 return
633 }
634
635- console.debug("initialFocusSection: " + contactEditor.initialFocusSection)
636 if (contactEditor.initialFocusSection != "") {
637 focusTimer.restart()
638 } else {
639@@ -412,6 +416,40 @@
640 }
641
642 Component {
643+ id: alertMessage
644+
645+ Dialog {
646+ id: aletMessageDialog
647+
648+ title: i18n.dtr("address-book-app", "Contact Editor")
649+ text: {
650+ if (ContactsUI.Contacts.updateIsRunning()) {
651+ return i18n.dtr("address-book-app",
652+ "Your <b>%1</b> contact sync account needs to be upgraded.\nWait until the upgrade is complete to edit contacts.")
653+ .arg(contactEditor.contact.syncTarget.syncTarget)
654+ }
655+ if (Qt.application.name === "AddressBookApp") {
656+ i18n.dtr("address-book-app",
657+ "Your <b>%1</b> contact sync account needs to be upgraded. Use the sync button to upgrade the Contacts app.\nOnly local contacts will be editable until upgrade is complete.")
658+ .arg(contactEditor.contact.syncTarget.syncTarget)
659+ } else {
660+ i18n.dtr("address-book-app",
661+ "Your <b>%1</b> contact sync account needs to be upgraded by running Contacts app.\nOnly local contacts will be editable until upgrade is complete.")
662+ .arg(contactEditor.contact.syncTarget.syncTarget);
663+ }
664+ }
665+
666+ Button {
667+ text: i18n.dtr("address-book-app", "Close")
668+ onClicked: PopupUtils.close(aletMessageDialog)
669+ }
670+
671+ Component.onCompleted: Qt.inputMethod.hide()
672+ Component.onDestruction: contactEditor.pageStack.pop()
673+ }
674+ }
675+
676+ Component {
677 id: removeContactDialog
678
679 RemoveContactsDialog {
680
681=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
682--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml 2015-08-19 14:30:18 +0000
683+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml 2015-09-30 04:57:46 +0000
684@@ -15,7 +15,7 @@
685 */
686
687 import QtQuick 2.2
688-import Ubuntu.Components 1.1
689+import Ubuntu.Components 1.2
690 import Ubuntu.Keyboard 0.1
691 import Ubuntu.Telephony.PhoneNumber 0.1
692
693
694=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml'
695--- src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml 2015-05-07 17:27:16 +0000
696+++ src/imports/Ubuntu/AddressBook/ContactEditor/ValueSelector.qml 2015-09-30 04:57:46 +0000
697@@ -15,7 +15,7 @@
698 */
699
700 import QtQuick 2.2
701-import Ubuntu.Components 1.1
702+import Ubuntu.Components 1.2
703
704 Item {
705 id: root
706
707=== modified file 'src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml'
708--- src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-04-28 16:29:44 +0000
709+++ src/imports/Ubuntu/AddressBook/ContactShare/ContactSharePage.qml 2015-09-30 04:57:46 +0000
710@@ -17,7 +17,7 @@
711 import QtQuick 2.2
712 import QtContacts 5.0
713
714-import Ubuntu.Components 1.1
715+import Ubuntu.Components 1.2
716 import Ubuntu.Content 1.1 as ContentHub
717
718 import Ubuntu.AddressBook.Base 0.1
719
720=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml'
721--- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml 2015-05-07 17:27:16 +0000
722+++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml 2015-09-30 04:57:46 +0000
723@@ -15,7 +15,7 @@
724 */
725
726 import QtQuick 2.2
727-import Ubuntu.Components 1.1
728+import Ubuntu.Components 1.2
729
730 AbstractButton {
731 id: root
732
733=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml'
734--- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml 2015-05-07 17:27:16 +0000
735+++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml 2015-09-30 04:57:46 +0000
736@@ -15,7 +15,7 @@
737 */
738
739 import QtQuick 2.2
740-import Ubuntu.Components 1.1
741+import Ubuntu.Components 1.2
742
743 Item {
744 id: root
745
746=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml'
747--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml 2015-05-07 17:27:16 +0000
748+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAddressesView.qml 2015-09-30 04:57:46 +0000
749@@ -16,7 +16,7 @@
750
751 import QtQuick 2.2
752 import QtContacts 5.0 as QtContacts
753-import Ubuntu.Components 1.1
754+import Ubuntu.Components 1.2
755
756 ContactDetailGroupWithTypeView {
757 id: root
758
759=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml'
760--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml 2015-05-07 17:27:16 +0000
761+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml 2015-09-30 04:57:46 +0000
762@@ -17,7 +17,7 @@
763 import QtQuick 2.2
764 import QtGraphicalEffects 1.0
765 import QtContacts 5.0
766-import Ubuntu.Components 1.1
767+import Ubuntu.Components 1.2
768
769 import Ubuntu.Contacts 0.1
770 import Ubuntu.AddressBook.Base 0.1
771
772=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml'
773--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml 2015-05-14 18:12:33 +0000
774+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailEmailsView.qml 2015-09-30 04:57:46 +0000
775@@ -16,7 +16,7 @@
776
777 import QtQuick 2.2
778 import QtContacts 5.0 as QtContacts
779-import Ubuntu.Components 1.1
780+import Ubuntu.Components 1.2
781
782 ContactDetailGroupWithTypeView {
783 id: root
784
785=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml'
786--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml 2015-05-15 20:04:29 +0000
787+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml 2015-09-30 04:57:46 +0000
788@@ -17,7 +17,7 @@
789 import QtQuick 2.2
790 import QtContacts 5.0 as QtContacts
791
792-import Ubuntu.Components 1.1
793+import Ubuntu.Components 1.2
794 import Ubuntu.Components.ListItems 1.0 as ListItem
795
796 import Ubuntu.AddressBook.Base 0.1
797
798=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml'
799--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml 2015-05-07 17:27:16 +0000
800+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml 2015-09-30 04:57:46 +0000
801@@ -15,7 +15,7 @@
802 */
803
804 import QtQuick 2.2
805-import Ubuntu.Components 1.1
806+import Ubuntu.Components 1.2
807 import QtContacts 5.0
808
809 import Ubuntu.AddressBook.Base 0.1
810
811=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml'
812--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml 2015-05-07 17:27:16 +0000
813+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailOnlineAccountsView.qml 2015-09-30 04:57:46 +0000
814@@ -17,7 +17,7 @@
815 import QtQuick 2.2
816 import QtContacts 5.0 as QtContacts
817
818-import Ubuntu.Components 1.1
819+import Ubuntu.Components 1.2
820 import Ubuntu.Contacts 0.1
821
822 ContactDetailGroupWithTypeView {
823
824=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml'
825--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml 2015-05-15 20:04:29 +0000
826+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailPhoneNumbersView.qml 2015-09-30 04:57:46 +0000
827@@ -18,7 +18,7 @@
828 import QtContacts 5.0 as QtContacts
829
830 import Ubuntu.Contacts 0.1
831-import Ubuntu.Components 1.1
832+import Ubuntu.Components 1.2
833
834 ContactDetailGroupWithTypeView {
835 id: root
836
837=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml'
838--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml 2015-04-29 18:39:01 +0000
839+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml 2015-09-30 04:57:46 +0000
840@@ -15,7 +15,7 @@
841 */
842
843 import QtQuick 2.2
844-import Ubuntu.Components 1.1
845+import Ubuntu.Components 1.2
846 import QtContacts 5.0
847 import Ubuntu.Contacts 0.1
848
849
850=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml'
851--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml 2015-05-15 20:04:29 +0000
852+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml 2015-09-30 04:57:46 +0000
853@@ -17,7 +17,7 @@
854 import QtQuick 2.2
855 import QtContacts 5.0
856
857-import Ubuntu.Components 1.1
858+import Ubuntu.Components 1.2
859 import Ubuntu.AddressBook.Base 0.1
860
861 ContactDetailBase {
862
863=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml'
864--- src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml 2015-05-11 20:24:42 +0000
865+++ src/imports/Ubuntu/AddressBook/ContactView/ContactFetchError.qml 2015-09-30 04:57:46 +0000
866@@ -15,7 +15,7 @@
867 */
868
869 import QtQuick 2.2
870-import Ubuntu.Components 1.1
871+import Ubuntu.Components 1.2
872 import Ubuntu.Components.Popups 1.0
873
874 Component {
875
876=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
877--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml 2015-06-01 22:13:53 +0000
878+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml 2015-09-30 04:57:46 +0000
879@@ -17,7 +17,7 @@
880 import QtQuick 2.2
881 import QtContacts 5.0
882
883-import Ubuntu.Components 1.1
884+import Ubuntu.Components 1.2
885 import Ubuntu.Components.Popups 1.0
886 import Ubuntu.Contacts 0.1
887
888
889=== modified file 'src/imports/Ubuntu/Contacts/ActionButton.qml'
890--- src/imports/Ubuntu/Contacts/ActionButton.qml 2015-05-07 17:27:16 +0000
891+++ src/imports/Ubuntu/Contacts/ActionButton.qml 2015-09-30 04:57:46 +0000
892@@ -15,7 +15,7 @@
893 */
894
895 import QtQuick 2.2
896-import Ubuntu.Components 1.1
897+import Ubuntu.Components 1.2
898
899 AbstractButton {
900 id: root
901
902=== modified file 'src/imports/Ubuntu/Contacts/CMakeLists.txt'
903--- src/imports/Ubuntu/Contacts/CMakeLists.txt 2015-04-30 21:17:11 +0000
904+++ src/imports/Ubuntu/Contacts/CMakeLists.txt 2015-09-30 04:57:46 +0000
905@@ -48,6 +48,7 @@
906 )
907
908 include_directories(
909+ ${CMAKE_BINARY_DIR}
910 ${QOfono_INCLUDE_DIRS}
911 )
912
913@@ -57,10 +58,13 @@
914
915 target_link_libraries(${CONTACT_COMPONENTS_PLUGIN}
916 ${QOfono_LIBRARIES}
917+ Qt5::Core
918+ Qt5::Contacts
919+ Qt5::Qml
920+ Qt5::Quick
921+ Qt5::DBus
922 )
923
924-qt5_use_modules(${CONTACT_COMPONENTS_PLUGIN} Core Contacts Qml Quick DBus)
925-
926 # make the files visible on qtcreator
927 add_custom_target(contact_components_QmlFiles ALL SOURCES ${CONTACT_COMPONENTS_QMLS})
928
929
930=== modified file 'src/imports/Ubuntu/Contacts/ContactAvatar.qml'
931--- src/imports/Ubuntu/Contacts/ContactAvatar.qml 2014-10-13 16:04:14 +0000
932+++ src/imports/Ubuntu/Contacts/ContactAvatar.qml 2015-09-30 04:57:46 +0000
933@@ -16,7 +16,7 @@
934
935 import QtQuick 2.2
936 import QtContacts 5.0
937-import Ubuntu.Components 1.1
938+import Ubuntu.Components 1.2
939 import Ubuntu.Contacts 0.1
940 import "Contacts.js" as ContactsJS
941
942
943=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
944--- src/imports/Ubuntu/Contacts/ContactDelegate.qml 2015-05-07 17:58:18 +0000
945+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml 2015-09-30 04:57:46 +0000
946@@ -16,7 +16,7 @@
947
948 import QtQuick 2.2
949 import QtContacts 5.0
950-import Ubuntu.Components 1.1
951+import Ubuntu.Components 1.2
952 import Ubuntu.Components.ListItems 1.0 as ListItem
953 import "Contacts.js" as ContactsJS
954
955
956=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml'
957--- src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2015-05-07 17:27:16 +0000
958+++ src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml 2015-09-30 04:57:46 +0000
959@@ -15,7 +15,7 @@
960 */
961
962 import QtQuick 2.2
963-import Ubuntu.Components 1.1
964+import Ubuntu.Components 1.2
965 import QtContacts 5.0 as QtContacts
966
967 Item {
968
969=== modified file 'src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml'
970--- src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-03-06 15:41:06 +0000
971+++ src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml 2015-09-30 04:57:46 +0000
972@@ -15,7 +15,7 @@
973 */
974
975 import QtQuick 2.0
976-import Ubuntu.Components 1.1
977+import Ubuntu.Components 1.2
978
979 Item {
980 id: root
981
982=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
983--- src/imports/Ubuntu/Contacts/ContactListView.qml 2015-09-30 04:57:46 +0000
984+++ src/imports/Ubuntu/Contacts/ContactListView.qml 2015-09-30 04:57:46 +0000
985@@ -17,8 +17,10 @@
986 import QtQuick 2.2
987 import QtContacts 5.0
988
989-import Ubuntu.Components 1.1
990+import Ubuntu.Components 1.2
991 import Ubuntu.Components.ListItems 1.0 as ListItem
992+import Ubuntu.Components.Popups 1.0
993+import Ubuntu.Contacts 0.1 as Contacts
994 import Buteo 0.1
995
996 /*!
997@@ -214,7 +216,7 @@
998 // and will re-check if the property changes.
999 // Using only '(buteoSync.syncProfilesByCategory("contacts").length > 0)'
1000 // the value will be checked only on app startup
1001- readonly property bool syncEnabled: buteoSync.visibleSyncProfiles &&
1002+ readonly property bool syncEnabled: (buteoSync.profilesCount > 0) &&
1003 (buteoSync.syncProfilesByCategory("contacts").length > 0)
1004 /*!
1005 \qmlproperty bool busy
1006@@ -229,6 +231,8 @@
1007 */
1008 property bool showBusyIndicator: true
1009
1010+ property var _busyDialog: null
1011+
1012 /*!
1013 This handler is called when the selection mode is finished without be canceled
1014 */
1015
1016=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
1017--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-05-13 15:52:55 +0000
1018+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml 2015-09-30 04:57:46 +0000
1019@@ -16,7 +16,7 @@
1020
1021 import QtQuick 2.2
1022 import QtContacts 5.0
1023-import Ubuntu.Components 1.1
1024+import Ubuntu.Components 1.2
1025 import Ubuntu.Components.ListItems 1.0 as ListItem
1026
1027 import "ContactList.js" as Sections
1028
1029=== modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml'
1030--- src/imports/Ubuntu/Contacts/FastScroll.qml 2014-08-18 19:09:34 +0000
1031+++ src/imports/Ubuntu/Contacts/FastScroll.qml 2015-09-30 04:57:46 +0000
1032@@ -41,7 +41,7 @@
1033
1034 // FastScroll.qml
1035 import QtQuick 2.2
1036-import Ubuntu.Components 1.1
1037+import Ubuntu.Components 1.2
1038 import "FastScroll.js" as Sections
1039
1040 Item {
1041
1042=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActions.qml'
1043--- src/imports/Ubuntu/Contacts/ListItemWithActions.qml 2015-02-26 13:46:28 +0000
1044+++ src/imports/Ubuntu/Contacts/ListItemWithActions.qml 2015-09-30 04:57:46 +0000
1045@@ -15,7 +15,7 @@
1046 */
1047
1048 import QtQuick 2.2
1049-import Ubuntu.Components 1.1
1050+import Ubuntu.Components 1.2
1051
1052 Item {
1053 id: root
1054
1055=== modified file 'src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml'
1056--- src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml 2014-07-28 16:14:53 +0000
1057+++ src/imports/Ubuntu/Contacts/ListItemWithActionsCheckBox.qml 2015-09-30 04:57:46 +0000
1058@@ -15,7 +15,7 @@
1059 */
1060
1061 import QtQuick 2.2
1062-import Ubuntu.Components 1.1
1063+import Ubuntu.Components 1.2
1064
1065 CheckBox {
1066 checked: root.selected
1067
1068=== modified file 'src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml'
1069--- src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml 2014-07-20 20:23:20 +0000
1070+++ src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml 2015-09-30 04:57:46 +0000
1071@@ -15,7 +15,7 @@
1072 */
1073
1074 import QtQuick 2.2
1075-import Ubuntu.Components 1.1
1076+import Ubuntu.Components 1.2
1077 import Ubuntu.Components.Popups 1.0 as Popups
1078
1079 /*!
1080
1081=== modified file 'src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml'
1082--- src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml 2015-09-30 04:57:46 +0000
1083+++ src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml 2015-09-30 04:57:46 +0000
1084@@ -15,7 +15,7 @@
1085 */
1086
1087 import QtQuick 2.2
1088-import Ubuntu.Components 1.1
1089+import Ubuntu.Components 1.2
1090 import Ubuntu.OnlineAccounts 0.1
1091 import Ubuntu.OnlineAccounts.Client 0.1
1092
1093
1094=== modified file 'src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml'
1095--- src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-05-22 13:31:32 +0000
1096+++ src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml 2015-09-30 04:57:46 +0000
1097@@ -63,7 +63,7 @@
1098 */
1099
1100 import QtQuick 2.2
1101-import Ubuntu.Components 1.1
1102+import Ubuntu.Components 1.2
1103
1104 Page {
1105 id: page
1106
1107=== modified file 'src/imports/Ubuntu/Contacts/SIMCardImportPage.qml'
1108--- src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-06-01 14:33:13 +0000
1109+++ src/imports/Ubuntu/Contacts/SIMCardImportPage.qml 2015-09-30 04:57:46 +0000
1110@@ -17,7 +17,7 @@
1111 import QtQuick 2.2
1112 import QtContacts 5.0
1113
1114-import Ubuntu.Components 1.1
1115+import Ubuntu.Components 1.2
1116 import Ubuntu.Contacts 0.1
1117 import Ubuntu.Components.ListItems 1.0 as ListItem
1118
1119
1120=== modified file 'src/imports/Ubuntu/Contacts/SectionDelegate.qml'
1121--- src/imports/Ubuntu/Contacts/SectionDelegate.qml 2014-09-11 19:16:20 +0000
1122+++ src/imports/Ubuntu/Contacts/SectionDelegate.qml 2015-09-30 04:57:46 +0000
1123@@ -15,7 +15,7 @@
1124 */
1125
1126 import QtQuick 2.2
1127-import Ubuntu.Components 1.1
1128+import Ubuntu.Components 1.2
1129 import Ubuntu.Components.ListItems 1.0
1130
1131 Rectangle {
1132
1133=== modified file 'src/imports/Ubuntu/Contacts/SubtitledWithColors.qml'
1134--- src/imports/Ubuntu/Contacts/SubtitledWithColors.qml 2014-07-31 10:46:27 +0000
1135+++ src/imports/Ubuntu/Contacts/SubtitledWithColors.qml 2015-09-30 04:57:46 +0000
1136@@ -15,7 +15,7 @@
1137 */
1138
1139 import QtQuick 2.0
1140-import Ubuntu.Components 1.1
1141+import Ubuntu.Components 1.2
1142
1143 MouseArea {
1144 id: subtitledListItem
1145
1146=== modified file 'src/imports/Ubuntu/Contacts/contacts.cpp'
1147--- src/imports/Ubuntu/Contacts/contacts.cpp 2015-06-29 15:35:07 +0000
1148+++ src/imports/Ubuntu/Contacts/contacts.cpp 2015-09-30 04:57:46 +0000
1149@@ -22,6 +22,9 @@
1150 #include <QtCore/QDebug>
1151 #include <QtCore/QDir>
1152 #include <QtCore/QUrl>
1153+#include <QtCore/QLockFile>
1154+
1155+#include "config.h"
1156
1157 UbuntuContacts::UbuntuContacts(QObject *parent)
1158 : QObject(parent)
1159@@ -102,3 +105,8 @@
1160 {
1161 return QFile::remove(file.toLocalFile());
1162 }
1163+
1164+bool UbuntuContacts::updateIsRunning() const
1165+{
1166+ return QFile::exists(QDir::tempPath() + "/address-book-updater.lock");
1167+}
1168
1169=== modified file 'src/imports/Ubuntu/Contacts/contacts.h'
1170--- src/imports/Ubuntu/Contacts/contacts.h 2015-06-29 15:35:07 +0000
1171+++ src/imports/Ubuntu/Contacts/contacts.h 2015-09-30 04:57:46 +0000
1172@@ -36,6 +36,7 @@
1173 Q_INVOKABLE QUrl copyImage(QObject *contact, const QUrl &imageUrl);
1174 Q_INVOKABLE bool containsLetters(const QString &value);
1175 Q_INVOKABLE bool removeFile(const QUrl &file);
1176+ Q_INVOKABLE bool updateIsRunning() const;
1177 };
1178
1179 #endif //_UBUNTU_CONTACTS_H_
1180
1181=== modified file 'src/imports/VCardImportDialog.qml'
1182--- src/imports/VCardImportDialog.qml 2015-06-01 22:08:31 +0000
1183+++ src/imports/VCardImportDialog.qml 2015-09-30 04:57:46 +0000
1184@@ -16,7 +16,7 @@
1185
1186 import QtQuick 2.2
1187 import QtContacts 5.0
1188-import Ubuntu.Components 1.1
1189+import Ubuntu.Components 1.2
1190 import Ubuntu.Components.Popups 1.0 as Popups
1191
1192 Item {
1193
1194=== modified file 'tests/qml/tst_ContactEditor.qml'
1195--- tests/qml/tst_ContactEditor.qml 2015-06-08 15:59:32 +0000
1196+++ tests/qml/tst_ContactEditor.qml 2015-09-30 04:57:46 +0000
1197@@ -16,7 +16,7 @@
1198
1199 import QtQuick 2.2
1200 import QtTest 1.0
1201-import Ubuntu.Components 1.1
1202+import Ubuntu.Components 1.2
1203 import Ubuntu.Test 0.1
1204 import Ubuntu.Contacts 0.1
1205
1206@@ -33,7 +33,6 @@
1207 MainView {
1208 id: mainView
1209 anchors.fill: parent
1210- useDeprecatedToolbar: false
1211
1212 ListModel {
1213 // dummy data model.
1214
1215=== modified file 'tests/qml/tst_ContactList.qml'
1216--- tests/qml/tst_ContactList.qml 2015-07-01 17:50:29 +0000
1217+++ tests/qml/tst_ContactList.qml 2015-09-30 04:57:46 +0000
1218@@ -16,7 +16,7 @@
1219
1220 import QtQuick 2.2
1221 import QtTest 1.0
1222-import Ubuntu.Components 1.1
1223+import Ubuntu.Components 1.2
1224 import Ubuntu.Test 0.1
1225 import Ubuntu.Contacts 0.1
1226
1227@@ -60,7 +60,6 @@
1228 MainView {
1229 id: mainView
1230 anchors.fill: parent
1231- useDeprecatedToolbar: false
1232 }
1233
1234 function createContact(firstName, phoneNumber, email) {
1235
1236=== modified file 'tests/qml/tst_ContactListModel.qml'
1237--- tests/qml/tst_ContactListModel.qml 2015-06-29 15:02:45 +0000
1238+++ tests/qml/tst_ContactListModel.qml 2015-09-30 04:57:46 +0000
1239@@ -16,7 +16,7 @@
1240
1241 import QtQuick 2.2
1242 import QtTest 1.0
1243-import Ubuntu.Components 1.1
1244+import Ubuntu.Components 1.2
1245 import Ubuntu.Test 0.1
1246 import Ubuntu.Contacts 0.1
1247
1248
1249=== modified file 'tests/qml/tst_ContactListView.qml'
1250--- tests/qml/tst_ContactListView.qml 2015-04-29 14:22:40 +0000
1251+++ tests/qml/tst_ContactListView.qml 2015-09-30 04:57:46 +0000
1252@@ -16,7 +16,7 @@
1253
1254 import QtQuick 2.2
1255 import QtTest 1.0
1256-import Ubuntu.Components 1.1
1257+import Ubuntu.Components 1.2
1258 import Ubuntu.Test 0.1
1259 import Ubuntu.Contacts 0.1
1260
1261@@ -48,7 +48,6 @@
1262 MainView {
1263 id: mainView
1264 anchors.fill: parent
1265- useDeprecatedToolbar: false
1266 }
1267
1268 function createContact(firstName, phoneNumber, email) {
1269
1270=== modified file 'tests/qml/tst_ContactPreviewPage.qml'
1271--- tests/qml/tst_ContactPreviewPage.qml 2015-05-15 20:13:39 +0000
1272+++ tests/qml/tst_ContactPreviewPage.qml 2015-09-30 04:57:46 +0000
1273@@ -19,7 +19,7 @@
1274 import Ubuntu.Test 0.1
1275 import QtContacts 5.0
1276
1277-import Ubuntu.Components 1.1
1278+import Ubuntu.Components 1.2
1279 import Ubuntu.Contacts 0.1
1280 import Ubuntu.AddressBook.ContactView 0.1
1281
1282@@ -63,7 +63,6 @@
1283 MainView {
1284 id: mainView
1285 anchors.fill: parent
1286- useDeprecatedToolbar: false
1287
1288 ContactViewPage {
1289 id: contactPreviewPage
1290
1291=== modified file 'tests/qml/tst_ListWithActions.qml'
1292--- tests/qml/tst_ListWithActions.qml 2014-09-16 20:10:07 +0000
1293+++ tests/qml/tst_ListWithActions.qml 2015-09-30 04:57:46 +0000
1294@@ -15,7 +15,7 @@
1295 */
1296
1297 import QtQuick 2.2
1298-import Ubuntu.Components 1.1
1299+import Ubuntu.Components 1.2
1300 import QtTest 1.0
1301 import Ubuntu.Test 0.1
1302 import Ubuntu.Contacts 0.1

Subscribers

People subscribed via source and target branches