Merge lp:~renatofilho/address-book-app/sort-sources into lp:address-book-app

[Renato Araujo Oliveira Filho]

Sort source list for Contact editor page.
Select default source on page creation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:495
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/995/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/298
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5016
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/4027
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5013
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5013/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24907

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

review: Needs Fixing (continuous-integration)

=== 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-11-04 15:41:52 +0000
@@ -27,6 +27,9 @@
     id: root
 
     property alias active: sourceModel.autoUpdate
+    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
+
     signal changed()
 
     function save() {
@@ -49,9 +52,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 +72,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 +97,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 +127,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 +207,17 @@
 
         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)
+                    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)
         }