Merge lp:~renatofilho/address-book-app/disable-sync-on-update into lp:address-book-app

[Renato Araujo Oliveira Filho]

Disable sync button while the update is running.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/disable-sync-on-update]

485. By Renato Araujo Oliveira Filho on 2015-10-13

Implemented Contacts.updateIsRunning as property.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/954/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4611
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3731
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4608
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4608/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24156

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/disable-sync-on-update]

486. By Renato Araujo Oliveira Filho on 2015-10-14

Show "Personal " prefix for local sources.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:486
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/955/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4631
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4628
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4628/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24175

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/disable-sync-on-update]

487. By Renato Araujo Oliveira Filho on 2015-10-14

Fix updateIsRunning property.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:487
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/956/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/259
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24212

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

review: Approve (continuous-integration)

[lp:~renatofilho/address-book-app/disable-sync-on-update]

488. By Renato Araujo Oliveira Filho on 2015-10-15

Show "Personal" prefix for local accounts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:488
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/957/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3752
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4648
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4648/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24215

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Looks good

review: Approve

[lp:~renatofilho/address-book-app/disable-sync-on-update]

489. By Renato Araujo Oliveira Filho on 2015-10-15

Added a extra "-" in the account name.

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-09-30 04:57:26 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-10-15 16:00:42 +0000
@@ -163,7 +163,14 @@
         }
 
         delegate: OptionSelectorDelegate {
-            text: contact.displayLabel.label
+            text: {
+                if ((contact.guid.guid != "system-address-book") &&
+                    (iconSource == "image://theme/address-book-app-symbolic")) {
+                    return i18n.dtr("address-book-app", "Personal - %1").arg(contact.displayLabel.label)
+                } else {
+                    return contact.displayLabel.label
+                }
+            }
             constrainImage: true
             iconSource: {
                 var details = contact.details(ContactDetail.ExtendedDetail)

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-09-29 19:03:44 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-10-15 16:00:42 +0000
@@ -423,7 +423,7 @@
 
             title: i18n.dtr("address-book-app", "Contact Editor")
             text: {
-                if (ContactsUI.Contacts.updateIsRunning()) {
+                if (ContactsUI.Contacts.updateIsRunning) {
                     return i18n.dtr("address-book-app",
                                     "Your <b>%1</b> contact sync account needs to be upgraded.\nWait until the upgrade is complete to edit contacts.")
                                     .arg(contactEditor.contact.syncTarget.syncTarget)

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml	2015-10-15 16:00:42 +0000
@@ -66,5 +66,30 @@
         autoUpdate: false
     }
 
+    detailDelegate: ContactDetailWithTypeView {
+        property variant detailType: detail && root.contact && root.typeModelReady ? root.getType(detail) : ""
+
+        action: root.defaultAction
+        contact: root.contact
+        fields: root.fields
+        typeLabel: detailType ? detailType.label : ""
+
+        height: implicitHeight
+        width: root.width
+
+        onClicked: root.actionTrigerred(root.defaultAction.name, detail)
+
+        function overrideValue(detail, field)
+        {
+            if (detail.value(field + 1) == "system-address-book") {
+                return detail.value(field)
+            } else if (detail.value(field + 2) == "0") {
+                return i18n.dtr("address-book-app", "Personal - %1").arg(detail.value(field))
+            } else {
+                return detail.value(field)
+            }
+        }
+    }
+
     Component.onCompleted: sourceModel.update()
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-08-17 18:47:15 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-10-15 16:00:42 +0000
@@ -32,12 +32,17 @@
         if (isReady) {
             var values = []
             for(var i=0; i < fields.length; i++) {
-                values.push(detail.value(fields[i]))
+                values.push(overrideValue(detail, fields[i]))
             }
             view.values = values
         }
     }
 
+    function overrideValue(detail, field)
+    {
+        return detail.value(field)
+    }
+
     implicitHeight: view.implicitHeight
     onIsReadyChanged: populateValues()
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-09-18 13:18:40 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2015-10-15 16:00:42 +0000
@@ -206,7 +206,7 @@
 
       This property holds if the list is running a sync with online accounts or not
     */
-    readonly property alias syncing: buteoSync.syncing
+    readonly property bool syncing: buteoSync.syncing || Contacts.Contacts.updateIsRunning
     /*!
       \qmlproperty bool syncEnabled
 

=== modified file 'src/imports/Ubuntu/Contacts/contacts.cpp'
--- src/imports/Ubuntu/Contacts/contacts.cpp	2015-09-18 13:18:40 +0000
+++ src/imports/Ubuntu/Contacts/contacts.cpp	2015-10-15 16:00:42 +0000
@@ -27,8 +27,17 @@
 #include "config.h"
 
 UbuntuContacts::UbuntuContacts(QObject *parent)
-    : QObject(parent)
+    : QObject(parent),
+      m_fileWatcher(new QFileSystemWatcher)
 {
+    // We need to monitor the tmp dir since the file could not exists at this point
+    m_fileWatcher->addPath(QDir::tempPath());
+    connect(m_fileWatcher.data(),
+            SIGNAL(directoryChanged(QString)),
+            SIGNAL(updateIsRunningChanged()));
+    connect(m_fileWatcher.data(),
+            SIGNAL(fileChanged(QString)),
+            SIGNAL(updateIsRunningChanged()));
 }
 
 QString UbuntuContacts::tempPath() const
@@ -108,5 +117,10 @@
 
 bool UbuntuContacts::updateIsRunning() const
 {
-    return QFile::exists(QDir::tempPath() + "/address-book-updater.lock");
+    return QFile::exists(updaterLockFile());
+}
+
+QString UbuntuContacts::updaterLockFile()
+{
+    return QString("%1/%2").arg(QDir::tempPath()).arg("/address-book-updater.lock");
 }

=== modified file 'src/imports/Ubuntu/Contacts/contacts.h'
--- src/imports/Ubuntu/Contacts/contacts.h	2015-09-18 13:18:40 +0000
+++ src/imports/Ubuntu/Contacts/contacts.h	2015-10-15 16:00:42 +0000
@@ -20,11 +20,14 @@
 #include <QtCore/QObject>
 #include <QtCore/QString>
 #include <QtCore/QUrl>
+#include <QtCore/QScopedPointer>
+#include <QtCore/QFileSystemWatcher>
 
 class UbuntuContacts : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString tempPath READ tempPath)
+    Q_PROPERTY(bool updateIsRunning READ updateIsRunning NOTIFY updateIsRunningChanged)
 
 public:
     UbuntuContacts(QObject *parent = 0);
@@ -37,6 +40,15 @@
     Q_INVOKABLE bool containsLetters(const QString &value);
     Q_INVOKABLE bool removeFile(const QUrl &file);
     Q_INVOKABLE bool updateIsRunning() const;
+
+Q_SIGNALS:
+    void updateIsRunningChanged();
+
+private:
+    QScopedPointer<QFileSystemWatcher> m_fileWatcher;
+
+    static QString updaterLockFile();
+
 };
 
 #endif //_UBUNTU_CONTACTS_H_