Merge lp:~renatofilho/address-book-app/choose-default-address-book into lp:address-book-app

[Renato Araujo Oliveira Filho]

Implemented the ability to choose the default address-book from settings page.

TESTING
========

 * Test change the default address-book:
  * Open address-book app
  * Enter on settings page
  * Select a different "Default address book"
  * Close settings page
  * Do a bottom edge swipe to create a new contact
  * Check if the selected address-book is the one that you choose on settings page.
  * Save the contact
  * Open the recent created contact and check if the address-book is the correct one

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1038/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/341
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5530
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4331
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5544
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5544/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25673

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

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Just a couple remarks.

review: Needs Fixing

[Renato Araujo Oliveira Filho (renatofilho)]

All comments fixed on rev.497

[Gustavo Pichorim Boiko (boiko)]

Looks good now!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1045/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/348
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5574
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5588
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5588/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25776

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

If I switch off contact syncing for any account in the list, it should be removed from the list. If the account was the default account, then Personal should be made the new default account.

review: Needs Fixing

[Bill Filler (bfiller)]

If I switch contact-sync back on for the account then it should be added back to the list, but not made the default

review: Needs Fixing

[lp:~renatofilho/address-book-app/choose-default-address-book]

498. By Renato Araujo Oliveira Filho on 2015-12-07

Update source list on application active to keep it in sync.

499. By Renato Araujo Oliveira Filho on 2015-12-07

Make sure the correct source is selected after reload source list.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1053/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/356
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5632
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25854

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/choose-default-address-book]

500. By Renato Araujo Oliveira Filho on 2015-12-11

Trunk merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1065/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/368
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5730/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5743/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/choose-default-address-book]

501. By Renato Araujo Oliveira Filho on 2015-12-11

Created 'saveActionEnabled' property to avoid problems on tests.
Used that new property instead of search for Action.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1067/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/370
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5734/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5747/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/choose-default-address-book]

502. By Renato Araujo Oliveira Filho on 2015-12-11

Update source list if sources change while the settings and edit page are visible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/1068/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/371
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5737
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5750
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25988

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2015-09-29 19:03:44 +0000
+++ src/app/addressbookapp.cpp	2015-12-11 16:43:55 +0000
@@ -430,6 +430,7 @@
         qWarning() << "Fail to connect with pim service.";
     }
     connect(m_server.data(), SIGNAL(safeModeChanged()), SIGNAL(serverSafeModeChanged()));
+    connect(m_server.data(), SIGNAL(sourcesChanged()), SIGNAL(sourcesChanged()));
     Q_EMIT serverSafeModeChanged();
 }
 
 
=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2015-09-16 01:08:07 +0000
+++ src/app/addressbookapp.h	2015-12-11 16:43:55 +0000
@@ -51,6 +51,7 @@
     void isOnlineChanged();
     void serverSafeModeChanged();
     void updatingChanged();
+    void sourcesChanged();
 
 public Q_SLOTS:
     void activateWindow();
 
=== modified file 'src/imports/ABContactEditorPage.qml'
--- src/imports/ABContactEditorPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/ABContactEditorPage.qml	2015-12-11 16:43:55 +0000
@@ -27,6 +27,9 @@
 
     property alias backIconName: backAction.iconName
 
+    // Property used on unit tests
+    readonly property alias saveActionEnabled: saveAction.enabled
+
     head.backAction: Action {
         id: backAction
 
@@ -42,6 +45,7 @@
 
     head.actions: [
         Action {
+            id: saveAction
             objectName: "save"
             name: "save"
 
 
=== modified file 'src/imports/Settings/CMakeLists.txt'
--- src/imports/Settings/CMakeLists.txt	2015-03-17 17:14:09 +0000
+++ src/imports/Settings/CMakeLists.txt	2015-12-11 16:43:55 +0000
@@ -1,5 +1,6 @@
 set(CONTACT_SETTINGS_QMLS
     MyselfPhoneNumbersModel.qml
+    SettingsDefaultSyncTarget.qml
     SettingsPage.qml
 )
 
 
=== added file 'src/imports/Settings/SettingsDefaultSyncTarget.qml'
--- src/imports/Settings/SettingsDefaultSyncTarget.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Settings/SettingsDefaultSyncTarget.qml	2015-12-11 16:43:55 +0000
@@ -0,0 +1,229 @@
+/*
+* Copyright (C) 2015 Canonical, Ltd.
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; version 3.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+import QtQuick 2.4
+import QtContacts 5.0
+
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3
+
+import Ubuntu.Contacts 0.1
+import Ubuntu.AddressBook.Base 0.1
+
+Empty {
+   id: root
+
+   signal changed()
+
+   function update()
+   {
+       sourceModel.update()
+   }
+
+   function save()
+   {
+       var changed = false
+       var selectedSource = getSelectedSource()
+       if (!selectedSource) {
+           return
+       }
+
+       var details = selectedSource.details(ContactDetail.ExtendedDetail)
+       for(var d in details) {
+           if (details[d].name === "IS-PRIMARY") {
+               if (!details[d].data) {
+                   details[d].data = true
+                   changed = true
+                   break
+               }
+           }
+       }
+       if (changed) {
+           sourceModel.saveContact(selectedSource)
+       }
+   }
+
+   function getSelectedSource() {
+       if (sources.model.count <= 0)
+           return -1
+
+       return sources.model.get(sources.selectedIndex).source
+   }
+
+   height: sources.currentlyExpanded ?
+              sources.containerHeight + units.gu(6) + label.height :
+              sources.itemHeight + units.gu(6) + label.height
+
+   ContactModel {
+       id: sourceModel
+
+       manager: (typeof(QTCONTACTS_MANAGER_OVERRIDE) !== "undefined") && (QTCONTACTS_MANAGER_OVERRIDE != "") ?
+                    QTCONTACTS_MANAGER_OVERRIDE : "galera"
+       filter: DetailFilter {
+           detail: ContactDetail.Type
+           field: Type.TypeField
+           value: Type.Group
+           matchFlags: DetailFilter.MatchExactly
+       }
+       autoUpdate: false
+       onContactsChanged: {
+           if (contacts.length > 0) {
+               writableSources.reload()
+               root.changed()
+           }
+       }
+   }
+
+   ListModel {
+       id: writableSources
+
+       function getSourceMetaData(contact) {
+           var metaData = {'read-only' : false,
+                           'account-provider': '',
+                           'account-id': 0,
+                           'is-primary': false}
+
+           var details = contact.details(ContactDetail.ExtendedDetail)
+           for(var d in details) {
+               if (details[d].name === "READ-ONLY") {
+                   metaData['read-only'] = details[d].data
+               } else if (details[d].name === "PROVIDER") {
+                   metaData['account-provider'] = details[d].data
+               } else if (details[d].name === "APPLICATION-ID") {
+                   metaData['account-id'] = details[d].data
+               } else if (details[d].name === "IS-PRIMARY") {
+                   metaData['is-primary'] = details[d].data
+               }
+           }
+           return metaData
+       }
+
+       function reload() {
+           sources._notify = false
+
+           clear()
+           // filter out read-only sources
+           var contacts = sourceModel.contacts
+           if (contacts.length === 0) {
+               return
+           }
+
+           var data = []
+           for(var i in contacts) {
+               var sourceMetaData = getSourceMetaData(contacts[i])
+               if (!sourceMetaData['readOnly']) {
+                   data.push({'sourceId': contacts[i].guid.guid,
+                              'sourceName': contacts[i].displayLabel.label,
+                              'accountId': sourceMetaData['account-id'],
+                              'accountProvider': sourceMetaData['account-provider'],
+                              'readOnly': sourceMetaData['read-only'],
+                              'isPrimary': sourceMetaData['is-primary'],
+                              'source': contacts[i]
+                               })
+               }
+           }
+
+           data.sort(function(a, b) {
+               var valA = a.accountId
+               var valB = b.accountId
+               if (a.accountId == b.accountId) {
+                   valA = a.sourceName
+                   valB = b.sourceName
+               }
+
+               if (valA == valB) {
+                   return 0
+               } else if (valA < valB) {
+                   return -1
+               } else {
+                   return 1
+               }
+           })
+
+            sources.selectedIndex = 0
+           var primaryIndex = 0
+           for (var i in data) {
+               if (data[i].isPrimary) {
+                   primaryIndex = i
+               }
+               append(data[i])
+           }
+
+           // select primary account
+           sources.selectedIndex = primaryIndex
+           sources._notify = true
+       }
+   }
+
+   Label {
+       id: label
+
+       text: i18n.tr("Default Addressbook")
+       anchors {
+           left: parent.left
+           top: parent.top
+           right: parent.right
+           margins: units.gu(2)
+       }
+       height: units.gu(4)
+   }
+
+   OptionSelector {
+       id: sources
+       property bool _notify: true
+
+       model: writableSources
+       anchors {
+           left: parent.left
+           leftMargin: units.gu(2)
+           top: label.bottom
+           right: parent.right
+           rightMargin: units.gu(2)
+           bottom: parent.bottom
+           bottomMargin: units.gu(2)
+       }
+
+       delegate: OptionSelectorDelegate {
+           text: {
+               if ((sourceId != "system-address-book") &&
+                   (iconSource == "image://theme/address-book-app-symbolic")) {
+                   return i18n.dtr("address-book-app", "Personal - %1").arg(sourceName)
+               } else {
+                   return sourceName
+               }
+           }
+           constrainImage: true
+           iconSource: accountProvider == "" ?
+                           "image://theme/address-book-app-symbolic" :
+                           "image://theme/online-accounts-%1".arg(accountProvider)
+           height: units.gu(4)
+       }
+
+       containerHeight: sources.model && sources.model.count > 4 ? itemHeight * 4 : sources.model ? itemHeight * sources.model.count : 0
+       onSelectedIndexChanged: {
+           if (_notify && selectedIndex >= 0) {
+               root.changed()
+           }
+       }
+   }
+
+   // In case of sources changed we need to update the model
+   Connections {
+       target: application
+       onSourcesChanged: root.update()
+   }
+}
+
 
=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2015-12-02 13:36:03 +0000
+++ src/imports/Settings/SettingsPage.qml	2015-12-11 16:43:55 +0000
@@ -74,6 +74,10 @@
                 onClicked: pageStack.addPageToCurrentColumn(root, simCardImportPageComponent)
                 enabled: (simList.sims.length > 0) && (simList.present.length > 0)
             }
+            SettingsDefaultSyncTarget {
+                id: defaultSyncTarget
+                onChanged: save()
+            }
         }
     }
     ContactsUI.OnlineAccountsHelper {
@@ -92,4 +96,10 @@
             onImportCompleted: pageStack.removePages(root)
         }
     }
+
+    onActiveChanged: {
+        if (active) {
+            defaultSyncTarget.update()
+        }
+    }
 }
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-12-11 16:43:55 +0000
@@ -27,6 +27,10 @@
     id: root
 
     property alias active: sourceModel.autoUpdate
+    property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
+    property real myHeight: label.height + units.gu(6) + (sources.currentlyExpanded ? sources.containerHeight :
+                                                                                      sources.itemHeight)
+
     signal changed()
 
     function save() {
@@ -49,9 +53,9 @@
         if (sources.model.count <= 0)
             return -1
 
-        var selectedContact = sources.model.get(sources.selectedIndex).contact
-        if (selectedContact) {
-            return selectedContact.guid.guid
+        var selectedSourceId = sources.model.get(sources.selectedIndex).sourceId
+        if (selectedSourceId) {
+            return selectedSourceId
         } else {
             return -1
         }
@@ -69,23 +73,6 @@
         return true
     }
 
-    function targetIsReadOnly(target) {
-        if (!target)
-            return true
-
-        var details = target.details(ContactDetail.ExtendedDetail)
-        for(var d in details) {
-            if ((details[d].name === "READ-ONLY") && (details[d].data === true)) {
-                return true
-            }
-        }
-
-        return false
-    }
-
-    property bool isNewContact: contact && contact.contactId === "qtcontacts:::"
-    property real myHeight: sources.currentlyExpanded ? sources.containerHeight + units.gu(6) + label.height : sources.itemHeight + units.gu(6) + label.height
-
     detail: root.contact ? contact.detail(ContactDetail.SyncTarget) : null
     implicitHeight: root.isNewContact &&  sources.model && (sources.model.count > 1) ? myHeight : 0
 
@@ -111,6 +98,27 @@
     ListModel {
         id: writableSources
 
+        function getSourceMetaData(contact) {
+            var metaData = {'read-only' : false,
+                            'account-provider': '',
+                            'account-id': 0,
+                            'is-primary': false}
+
+            var details = contact.details(ContactDetail.ExtendedDetail)
+            for(var d in details) {
+                if (details[d].name === "READ-ONLY") {
+                    metaData['read-only'] = details[d].data
+                } else if (details[d].name === "PROVIDER") {
+                    metaData['account-provider'] = details[d].data
+                } else if (details[d].name === "APPLICATION-ID") {
+                    metaData['account-id'] = details[d].data
+                } else if (details[d].name === "IS-PRIMARY") {
+                    metaData['is-primary'] = details[d].data
+                }
+            }
+            return metaData
+        }
+
         function reload() {
             clear()
 
@@ -120,11 +128,47 @@
                 return
             }
 
+            var data = []
             for(var i in contacts) {
-                if (!targetIsReadOnly(contacts[i])) {
-                    append({'contact': contacts[i]})
-                }
-            }
+                var sourceMetaData = getSourceMetaData(contacts[i])
+                if (!sourceMetaData['readOnly']) {
+                    data.push({'sourceId': contacts[i].guid.guid,
+                               'sourceName': contacts[i].displayLabel.label,
+                               'accountId': sourceMetaData['account-id'],
+                               'accountProvider': sourceMetaData['account-provider'],
+                               'readOnly': sourceMetaData['read-only'],
+                               'isPrimary': sourceMetaData['is-primary']
+                                })
+                }
+            }
+
+            data.sort(function(a, b) {
+                var valA = a.accountId
+                var valB = b.accountId
+                if (a.accountId == b.accountId) {
+                    valA = a.sourceName
+                    valB = b.sourceName
+                }
+
+                if (valA == valB) {
+                    return 0
+                } else if (valA < valB) {
+                    return -1
+                } else {
+                    return 1
+                }
+            })
+
+            var primaryIndex = 0
+            for (var i in data) {
+                if (data[i].isPrimary) {
+                    primaryIndex = i
+                }
+                append(data[i])
+            }
+
+            // select primary account
+            sources.selectedIndex = primaryIndex
         }
     }
 
@@ -164,27 +208,18 @@
 
         delegate: OptionSelectorDelegate {
             text: {
-                if ((contact.guid.guid != "system-address-book") &&
+                if ((sourceId != "system-address-book") &&
                     (iconSource == "image://theme/address-book-app-symbolic")) {
-                    return i18n.dtr("address-book-app", "Personal - %1").arg(contact.displayLabel.label)
+                    //TRANSLATORS: %1 is the display name of the source (address-book)
+                    return i18n.dtr("address-book-app", "Personal - %1").arg(sourceName)
                 } else {
-                    return contact.displayLabel.label
+                    return sourceName
                 }
             }
             constrainImage: true
-            iconSource: {
-                var details = contact.details(ContactDetail.ExtendedDetail)
-                for(var i in details) {
-                    if (details[i].name === "PROVIDER") {
-                        if (details[i].data === "") {
-                            return "image://theme/address-book-app-symbolic"
-                        } else {
-                            return "image://theme/online-accounts-%1".arg(details[i].data)
-                        }
-                    }
-                }
-                return "image://theme/address-book-app-symbolic"
-            }
+            iconSource: accountProvider == "" ?
+                            "image://theme/address-book-app-symbolic" :
+                            "image://theme/online-accounts-%1".arg(accountProvider)
             height: units.gu(4)
         }
 
@@ -196,5 +231,11 @@
             sourceModel.update()
         }
     }
+
+    // In case of sources changed we need to update the model
+    Connections {
+        target: application
+        onSourcesChanged: sourceModel.update()
+    }
 }
 
 
=== modified file 'tests/qml/tst_ContactEditor.qml'
--- tests/qml/tst_ContactEditor.qml	2015-12-08 07:47:18 +0000
+++ tests/qml/tst_ContactEditor.qml	2015-12-11 16:43:55 +0000
@@ -69,8 +69,7 @@
 
         function init() {
             waitForRendering(contactEditor);
-            var saveButton = findChild(root, 'save_button');
-            compare(saveButton.enabled, false);
+            tryCompare(contactEditor, 'saveActionEnabled', false);
         }
 
         function cleanup() {
@@ -113,8 +112,7 @@
         function test_fillRequiredFieldsMustEnableSaveButton(data) {
             var textField = findChild(root, data.objectName);
             textField.text = 'test'
-            var saveButton = findChild(root, 'save_button');
-            tryCompare(saveButton, 'enabled', true);
+            tryCompare(contactEditor, 'saveActionEnabled', true);
         }
 
         function test_fillOptionalFieldsMustNotEnableSaveButton_data() {
@@ -125,8 +123,7 @@
         function test_fillOptionalFieldsMustNotEnableSaveButton(data) {
             var textField = findChild(root, data.objectName);
             textField.text = 'test'
-            var saveButton = findChild(root, 'save_button');
-            tryCompare(saveButton, 'enabled', false);
+            tryCompare(contactEditor, 'saveActionEnabled', false);
         }
 
         function test_enterKeyMoveFocusedItem() {