Merge lp:~renatofilho/address-book-app/no-sync-dep into lp:address-book-app

[Renato Araujo Oliveira Filho]

Does not show import contacts from account if sync service is not available.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:631
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/26/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1557/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1557
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1405/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1405/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/no-sync-dep]

632. By Renato Araujo Oliveira Filho on 2016-09-19

Create a option to force "import from account" button be visible without the sync service.

This option is used by unit test.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:632
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/27/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1559/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1559
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1407/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1407/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1407/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1407/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1407/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1407/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1407/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1407/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1407
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1407/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/27/rebuild

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2016-04-26 00:48:34 +0000
+++ src/imports/Settings/SettingsPage.qml	2016-09-19 20:49:23 +0000
@@ -21,6 +21,8 @@
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Contacts 0.1 as ContactsUI
 
+import Buteo 0.1
+
 Page {
     id: root
     objectName: "settingsPage"
@@ -84,6 +86,7 @@
 
                 text: i18n.tr("Add Google account")
                 progression: true
+                enabled: buteoSync.serviceAvailable
 
                 onClicked: addGoogleAccountItem.activate()
                 Keys.onRightPressed: addGoogleAccountItem.activate()
@@ -175,6 +178,10 @@
         }
     }
 
+    ButeoSync {
+        id: buteoSync
+    }
+
     Keys.onDownPressed: addGoogleAccountItem.forceActiveFocus()
     Keys.onRightPressed: addGoogleAccountItem.forceActiveFocus()
     Keys.onLeftPressed: pageStack.removePages(root)

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2016-08-18 00:18:10 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2016-09-19 20:49:23 +0000
@@ -194,7 +194,14 @@
 
       This property holds if the import options should be visible on the list
     */
-    property bool showImportOptions: false
+    property bool showImportOptions: false    
+    /*!
+      \qmlproperty bool showImportFromAccountOption
+
+      This property holds if the import from account option should be visible on the list
+    */
+    property bool showImportFromAccountOption: buteoSync.serviceAvailable
+
     /*!
       \qmlproperty bool showAddNewButton
 
@@ -674,6 +681,7 @@
         anchors.fill: parent
         asynchronous: true
         source: root.showImportOptions &&
+                root.showImportFromAccountOption &&
                 (root.count === 0) &&
                 !view.favouritesIsSelected &&
                 !isSearching ? sourceFile : ""

=== modified file 'tests/qml/tst_ContactListView.qml'
--- tests/qml/tst_ContactListView.qml	2016-06-20 17:38:35 +0000
+++ tests/qml/tst_ContactListView.qml	2016-09-19 20:49:23 +0000
@@ -44,6 +44,8 @@
             id: contactListPage
             objectName: "contactListViewTest"
             anchors.fill: parent
+            //force import from account option be visible without the service running
+            showImportFromAccountOption: true
         }
 
     }