Merge lp:~renatofilho/address-book-app/buteo-qml into lp:address-book-app

[Renato Araujo Oliveira Filho]

Replace sync-monitor with buteo qml component.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:455
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/842/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/145/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3402/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3399/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/buteo-qml]

457. By Renato Araujo Oliveira Filho on 2015-07-13

Show Address book icon if available.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:457
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/843/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/146/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3415/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/buteo-qml]

458. By Renato Araujo Oliveira Filho on 2015-07-14

Use iconSource property on OptionSelectorDelegate instead of icon.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:458
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/844/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/147/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3423/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3420/console

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

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/address-book-app/buteo-qml]

459. By Renato Araujo Oliveira Filho on 2015-07-21

Hide sync button if the device goes offline.

460. By Renato Araujo Oliveira Filho on 2015-07-21

Removed ununsed include.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:459
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/845/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/148/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3459/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3456/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:460
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/846/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/149/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3461/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3458/console

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
 - https://code.launchpad.net/~renatofilho/address-book-app/buteo-qml/+merge/264294

Is your branch in sync with latest trunk?
YES

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
YES

Did you successfully run all tests found in your component's Test Plan on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGED

If you changed UI labels, did you update the pot file?
NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
YES

[Michael Sheldon (michael-sheldon)]

Code looks good to me

review: Approve

[Ken VanDine (ken-vandine)]

Packaging changes look fine

review: Approve (packaging)

=== modified file 'debian/control'
--- debian/control	2015-05-14 21:23:43 +0000
+++ debian/control	2015-07-21 18:04:28 +0000
@@ -18,7 +18,7 @@
                qtdeclarative5-ubuntu-content1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-history0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-keyboard-extensions0.1 [i386 amd64 armhf],
-               qtdeclarative5-ubuntu-syncmonitor0.1 [i386 amd64 armhf],
+               qtdeclarative5-buteo-syncfw0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-telephony-phonenumber0.1 [i386 amd64 armhf],
                qtdeclarative5-ubuntu-ui-toolkit-plugin [i386 amd64 armhf],
                qt5-default,
@@ -62,7 +62,7 @@
 Depends: qtdeclarative5-accounts-plugin,
          qtdeclarative5-online-accounts-client0.1,
          qtdeclarative5-qtquick2-plugin,
-         qtdeclarative5-ubuntu-syncmonitor0.1,
+         qtdeclarative5-buteo-syncfw0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          qtdeclarative5-qtcontacts-plugin,
          suru-icon-theme,
 
=== modified file 'src/app/addressbookapp.cpp'
--- src/app/addressbookapp.cpp	2015-06-08 15:59:22 +0000
+++ src/app/addressbookapp.cpp	2015-07-21 18:04:28 +0000
@@ -100,6 +100,7 @@
 AddressBookApp::AddressBookApp(int &argc, char **argv)
     : QGuiApplication(argc, argv),
       m_view(0),
+      m_netManager(new QNetworkConfigurationManager),
       m_pickingMode(false),
       m_testMode(false),
       m_withArgs(false)
@@ -107,6 +108,10 @@
     s_elapsed.start();
     setOrganizationName("com.ubuntu.address-book");
     setApplicationName("AddressBookApp");
+    connect(m_netManager.data(),
+            SIGNAL(onlineStateChanged(bool)),
+            SIGNAL(isOnlineChanged()),
+            Qt::QueuedConnection);
 }
 
 bool AddressBookApp::setup()
@@ -414,3 +419,8 @@
         Q_EMIT callbackApplicationChanged();
     }
 }
+
+bool AddressBookApp::isOnline() const
+{
+    return m_netManager->isOnline();
+}
 
=== modified file 'src/app/addressbookapp.h'
--- src/app/addressbookapp.h	2015-06-08 15:59:22 +0000
+++ src/app/addressbookapp.h	2015-07-21 18:04:28 +0000
@@ -21,12 +21,14 @@
 #include <QtDBus/QDBusInterface>
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickView>
+#include <QtNetwork/QNetworkConfigurationManager>
 
 class AddressBookApp : public QGuiApplication
 {
     Q_OBJECT
     Q_PROPERTY(bool firstRun READ isFirstRun CONSTANT)
     Q_PROPERTY(QString callbackApplication READ callbackApplication WRITE setCallbackApplication NOTIFY callbackApplicationChanged)
+    Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
 
 public:
     AddressBookApp(int &argc, char **argv);
@@ -37,10 +39,11 @@
     QString callbackApplication() const;
     void setCallbackApplication(const QString &application);
 
+    bool isOnline() const;
+
 Q_SIGNALS:
-    void syncingChanged();
-    void syncEnabledChanged();
     void callbackApplicationChanged();
+    void isOnlineChanged();
 
 public Q_SLOTS:
     void activateWindow();
@@ -59,6 +62,7 @@
 
 private:
     QQuickView *m_view;
+    QScopedPointer<QNetworkConfigurationManager> m_netManager;
     QString m_initialArg;
     QString m_callbackApplication;
     bool m_viewReady;
 
=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-06-10 17:24:55 +0000
+++ src/imports/ABContactListPage.qml	2015-07-21 18:04:28 +0000
@@ -226,7 +226,7 @@
                     }
                 },
                 Action {
-                    visible: contactList.syncEnabled
+                    visible: (application.isOnline && contactList.syncEnabled)
                     text: contactList.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
                     iconName: "reload"
                     enabled: !contactList.syncing
 
=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-05-07 17:27:16 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-07-21 18:04:28 +0000
@@ -108,6 +108,20 @@
 
         delegate: OptionSelectorDelegate {
             text: contact.displayLabel.label
+            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"
+            }
             height: units.gu(4)
         }
 
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-06-01 22:13:47 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2015-07-21 18:04:28 +0000
@@ -19,7 +19,7 @@
 
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
-import Ubuntu.SyncMonitor 0.1
+import Buteo 0.1
 
 /*!
     \qmltype ContactListView
@@ -204,13 +204,18 @@
 
       This property holds if the list is running a sync with online accounts or not
     */
-    readonly property bool syncing: (syncMonitor.state === "syncing")
+    readonly property alias syncing: buteoSync.syncing
     /*!
       \qmlproperty bool syncEnabled
 
       This property holds if there is online account to sync or not
     */
-    readonly property bool syncEnabled: syncMonitor.enabledServices ? syncMonitor.serviceIsEnabled("contacts") : false
+    // we are using 'buteoSync.visibleSyncProfiles because' it is a property
+    // and will re-check if the property changes.
+    // Using only '(buteoSync.syncProfilesByCategory("contacts").length > 0)'
+    // the value will be checked only on app startup
+    readonly property bool syncEnabled: buteoSync.visibleSyncProfiles &&
+                                        (buteoSync.syncProfilesByCategory("contacts").length > 0)
     /*!
       \qmlproperty bool busy
 
@@ -340,7 +345,7 @@
     */
     function sync()
     {
-       syncMonitor.sync(["contacts"])
+       buteoSync.startSyncByCategory("contacts")
     }
 
     ContactSimpleListView {
@@ -538,8 +543,8 @@
         }
     }
 
-    SyncMonitor {
-        id: syncMonitor
+    ButeoSync {
+        id: buteoSync
     }
 
     SIMList {
 
=== modified file 'src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml'
--- src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml	2015-02-09 13:25:01 +0000
+++ src/imports/Ubuntu/Contacts/OnlineAccountsHelper.qml	2015-07-21 18:04:28 +0000
@@ -33,7 +33,7 @@
     }
     Setup {
         id: setup
-        applicationId: "contacts-sync"
+        applicationId: "address-book-app"
         providerId: "google"
         onFinished: {
             root.running = false
 
=== modified file 'src/imports/Ubuntu/Contacts/simcardcontacts.cpp'
--- src/imports/Ubuntu/Contacts/simcardcontacts.cpp	2015-05-27 22:49:00 +0000
+++ src/imports/Ubuntu/Contacts/simcardcontacts.cpp	2015-07-21 18:04:28 +0000
@@ -19,7 +19,6 @@
 #include <QDebug>
 #include <QDBusConnection>
 #include <qofonophonebook.h>
-#include <qofono-qt5/dbus/ofonophonebook.h>
 
 SimCardContacts::SimCardContacts(QObject *parent)
     : QObject(parent),