Merge lp:~renatofilho/address-book-app/bug-fixes into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Used empty context for cell phones. To avoid problems with google sync.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2536
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/253
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/253/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/253
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3779
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3779/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2297
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2297/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/bug-fixes]

231. By Renato Araujo Oliveira Filho on 2014-07-27

Fixed avatar icon image update on contact view page after edit it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2045
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/254
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/254/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2684
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10480
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1713
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2298
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2298/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/bug-fixes]

232. By Renato Araujo Oliveira Filho on 2014-07-27

Load content hub async.
Fixed content hub import mode.

233. By Renato Araujo Oliveira Filho on 2014-07-27

Fixed content hub export. (pick mode)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:233
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/255/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2048
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/255
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/255/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2687
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3783
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3783/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2301
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2301/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2014-07-02 17:42:04 +0000
+++ src/imports/CMakeLists.txt	2014-07-27 20:37:31 +0000
@@ -1,6 +1,7 @@
 project(imports)
 
 set(ADDRESS_BOOK_APP_QMLS
+    ContentHubProxy.qml
     MainWindow.qml
 )
 

=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-07-08 23:19:01 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-07-27 20:37:31 +0000
@@ -30,8 +30,9 @@
     }
 
     function save() {
+        // create the avatar detail
         if (avatarImage.source != root.defaultAvatar) {
-            if (root.detail && (root.detail === avatarImage.source)) {
+            if (root.detail && (root.detail.imageUrl === avatarImage.source)) {
                 return false
             } else {
                 // create the avatar detail

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-07-22 08:12:11 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-07-27 20:37:31 +0000
@@ -118,8 +118,9 @@
         }
     }
 
-    function startPickMode(isSingleSelection)
+    function startPickMode(isSingleSelection, activeTransfer)
     {
+        contentHubTransfer = activeTransfer
         pickMode = true
         pickMultipleContacts = !isSingleSelection
         contactList.startSelection()
@@ -304,9 +305,11 @@
         onSelectionCanceled: {
             if (pickMode) {
                 if (contentHubTransfer) {
-                    contentHubTransfer.state = ContentTransfer.Aborted
+                    contentHubTransfer.state = ContentHub.ContentTransfer.Aborted
                 }
-                pageStack.pop()
+                pickMode = false
+                contentHubTransfer = null
+                state = ""
                 application.returnVcard("")
             }
         }
@@ -609,7 +612,9 @@
             } else {
                 console.error("Fail to export contacts:" + error)
             }
-            pageStack.pop()
+            activeTransfer = null
+            pickMode = false
+            state = ""
             application.returnVcard(url)
         }
     }

=== modified file 'src/imports/ContactView/ContactDetailAvatarView.qml'
--- src/imports/ContactView/ContactDetailAvatarView.qml	2014-07-10 22:48:31 +0000
+++ src/imports/ContactView/ContactDetailAvatarView.qml	2014-07-27 20:37:31 +0000
@@ -28,9 +28,37 @@
     implicitWidth: units.gu(10)
 
     Connections {
-        target: root.contact ? root.contact.detail(ContactDetail.Avatar) : null
+        id: connections
+
+        function updateTarget()
+        {
+            if (root.contact) {
+                var avatarDetail = root.contact.detail(ContactDetail.Avatar)
+                if (avatarDetail) {
+                    return avatarDetail
+                } else  {
+                    return root.contact
+                }
+            }
+            return null
+        }
+
+        target: updateTarget()
         ignoreUnknownSignals: true
-        onDetailChanged: avatar.reload()
+        onContactChanged: {
+            var avatarDetail = root.contact.detail(ContactDetail.Avatar)
+            if (avatarDetail) {
+                avatar.reload()
+                connections.target = avatarDetail
+            }
+        }
+        onDetailChanged: {
+            var avatarDetail = root.contact.detail(ContactDetail.Avatar)
+            if (avatarDetail === null) {
+                connections.target = root.contact
+            }
+            avatar.reload()
+        }
     }
 
     ContactsUI.ContactAvatar {

=== added file 'src/imports/ContentHubProxy.qml'
--- src/imports/ContentHubProxy.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContentHubProxy.qml	2014-07-27 20:37:31 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012-2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Content 0.1 as ContentHub
+
+QtObject {
+    property QtObject pageStack: null
+    property list<QtObject> objects: [
+        Connections {
+            target: ContentHub.ContentHub
+            onExportRequested: {
+                // enter in pick mode
+                console.debug("Transferrrrrrr>" + transfer)
+                pageStack.contactListPage.startPickMode(false, transfer)
+            }
+            onImportRequested: {
+                if (transfer.state === ContentHub.ContentTransfer.Charged) {
+                    var urls = []
+                    for(var i=0; i < transfer.items.length; i++) {
+                        urls.push(transfer.items[i].url)
+                    }
+                    pageStack.contactListPage.importContact(urls)
+                }
+            }
+        }
+    ]
+}

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-07-16 23:14:44 +0000
+++ src/imports/MainWindow.qml	2014-07-27 20:37:31 +0000
@@ -15,10 +15,9 @@
  */
 
 import QtQuick 2.2
-import QtContacts 5.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1 as Popups
-import Ubuntu.Content 0.1 as ContentHub
+import Ubuntu.Components 1.0
+import Ubuntu.Components.Popups 1.0 as Popups
+
 
 MainView {
     id: mainWindow
@@ -62,7 +61,7 @@
     {
         mainStack.resetStack()
         if (mainStack.contactListPage) {
-            mainStack.contactListPage.startPickMode(single == "true")
+            mainStack.contactListPage.startPickMode(single == "true", null)
         }
     }
 
@@ -102,6 +101,14 @@
             }
         }
 
+        onContactListPageChanged: {
+            if (contentHubLoader.status === Loader.Ready) {
+                contentHubLoader.item.pageStack = mainStack
+            } else {
+                contentHubLoader.setSource(Qt.resolvedUrl("ContentHubProxy.qml"), {"pageStack": mainStack})
+            }
+        }
+
         anchors.fill: parent
     }
 
@@ -138,26 +145,12 @@
         }
     }
 
-    Connections {
-        target: ContentHub.ContentHub
-        onExportRequested: {
-            // enter in pick mode
-            mainStack.push(Qt.createComponent("ContactList/ContactListPage.qml"),
-                           {pickMode: true,
-                            contentHubTransfer: transfer})
-        }
-        onImportRequested: {
-            if (transfer.state === ContentHub.ContentTransfer.Charged) {
-                var urls = []
-                for(var i=0; i < transfer.items.length; i++) {
-                    urls.push(transfer.items[i].url)
-                }
-                mainStack.importContactRequested(urls)
-            }
-        }
+    Loader {
+        id: contentHubLoader
+
+        asynchronous: true
     }
 
-
     // If application was called from uri handler and lost the focus reset the app to normal state
     onAppActiveChanged: {
         if (!appActive && mainStack.contactListPage) {

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml	2014-07-08 19:23:05 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml	2014-07-27 20:37:31 +0000
@@ -41,9 +41,11 @@
         } else if (contexts.indexOf(QtContacts.ContactDetail.ContextOther) > -1) {
             return 4
         } else {
-            // phone without context is and voice type is other
+            // phone without context and voice type is other
             if (subTypes && subTypes.indexOf(QtContacts.PhoneNumber.Voice) > -1) {
                 return 4
+            } else if (subTypes && subTypes.indexOf(QtContacts.PhoneNumber.Mobile) > -1) {
+                return 2
             } else {
                 return 2 // Default value is "Mobile"
             }
@@ -59,11 +61,11 @@
             return false
         }
 
-        if (listA.length != listB.length) {
+        if (listA.length !== listB.length) {
             return false
         }
         for(var i=0; i < listA.length; i++) {
-            if (listA[i] != listB[i]) {
+            if (listA[i] !== listB[i]) {
                 return false
             }
         }
@@ -79,7 +81,9 @@
         var newSubTypes = []
         var newContext = []
 
-        newContext.push(modelData.context)
+        if (modelData.context !== -1) {
+            newContext.push(modelData.context)
+        }
         newSubTypes.push(modelData.subType)
 
         var changed  = false
@@ -101,7 +105,7 @@
         append({"value": "Work", "label": i18n.dtr("address-book-app", "Work"), "icon": null,
                "context": QtContacts.ContactDetail.ContextWork, "subType": QtContacts.PhoneNumber.Voice })
         append({"value": "Mobile", "label": i18n.dtr("address-book-app", "Mobile"), "icon": null,
-                "context": QtContacts.ContactDetail.ContextHome, "subType": QtContacts.PhoneNumber.Mobile })
+                "context": -1, "subType": QtContacts.PhoneNumber.Mobile })
         append({"value": "Mobile-Work", "label": i18n.dtr("address-book-app", "Work Mobile"), "icon": null,
                 "context": QtContacts.ContactDetail.ContextWork, "subType": QtContacts.PhoneNumber.Mobile })
         append({"value": "Other", "label": i18n.dtr("address-book-app", "Other"), "icon": null,