Merge lp:~renatofilho/qtorganizer5-eds/use-qsettings into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Store default collection information on QSettings.

Confined applications does not have access to dconf.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/251/rebuild

review: Approve (continuous-integration)

=== modified file 'organizer/qorganizer-eds-source-registry.cpp'
--- organizer/qorganizer-eds-source-registry.cpp	2016-03-14 20:19:46 +0000
+++ organizer/qorganizer-eds-source-registry.cpp	2016-03-17 17:03:37 +0000
@@ -5,6 +5,8 @@
 
 using namespace QtOrganizer;
 
+static const QString DEFAULT_COLLECTION_SETTINGS("qtpim/default-colection");
+
 SourceRegistry::SourceRegistry(QObject *parent)
     : QObject(parent),
       m_sourceRegistry(0),
@@ -80,29 +82,28 @@
                       G_CALLBACK(SourceRegistry::onDefaultCalendarChanged),
                       this);
 
-    // We use calendar as default source, if you are trying to use other source type
-    // you need to set the item source id manually
-    ESource *defaultCalendarSource = e_source_registry_ref_default_calendar(m_sourceRegistry);
-
+    QByteArray defaultId = defaultCollectionId();
     GList *sources = e_source_registry_list_sources(m_sourceRegistry, 0);
+    bool foundDefault = false;
     for(int i = 0, iMax = g_list_length(sources); i < iMax; i++) {
         ESource *source = E_SOURCE(g_list_nth_data(sources, i));
-        bool isDefault = e_source_equal(defaultCalendarSource, source);
-
+        bool isDefault = (g_strcmp0(defaultId.constData(), e_source_get_uid(source)) == 0);
         QOrganizerCollection collection = registerSource(source, isDefault);
+
         if (isDefault) {
+            foundDefault = true;
             m_defaultCollection = collection;
         }
     }
 
+    if (!foundDefault) {
+        //fallback to first collection
+        m_defaultCollection = m_collections.first();
+    }
+
     g_list_free_full(sources, g_object_unref);
-
-    if (defaultCalendarSource) {
-        g_object_unref(defaultCalendarSource);
-    }
 }
 
-
 QtOrganizer::QOrganizerCollection SourceRegistry::defaultCollection() const
 {
     return m_defaultCollection;
@@ -113,12 +114,9 @@
     if (m_defaultCollection.id() == collection.id())
         return;
 
-    QOrganizerEDSCollectionEngineId *eid = m_collectionsMap.value(collection.id().toString(), 0);
-    if (eid && eid->m_esource) {
-        e_source_registry_set_default_calendar(m_sourceRegistry, eid->m_esource);
-    } else {
-        qWarning() << "Fail to set default collection" << collection.id();
-    }
+    updateDefaultCollection(&collection);
+    QString edsId = m_defaultCollection.id().toString().split(":").last();
+    m_settings.setValue(DEFAULT_COLLECTION_SETTINGS, edsId);
 }
 
 QOrganizerCollection SourceRegistry::collection(const QString &collectionId) const
@@ -184,6 +182,12 @@
             g_object_unref(client);
         }
     }
+
+    // update default collection if necessary
+    if (m_defaultCollection.id().toString() == collectionId) {
+        m_defaultCollection = QOrganizerCollection();
+        setDefaultCollection(m_collections.first());
+    }
 }
 
 EClient* SourceRegistry::client(const QString &collectionId)
@@ -290,9 +294,11 @@
         m_defaultCollection = *collection;
         Q_EMIT sourceUpdated(m_defaultCollection.id().toString());
 
-        QOrganizerCollection &old = m_collections[oldDefaultCollectionId];
-        old.setExtendedMetaData(COLLECTION_DEFAULT_METADATA, false);
-        Q_EMIT sourceUpdated(oldDefaultCollectionId);
+        if (m_collections.contains(oldDefaultCollectionId)) {
+            QOrganizerCollection &old = m_collections[oldDefaultCollectionId];
+            old.setExtendedMetaData(COLLECTION_DEFAULT_METADATA, false);
+            Q_EMIT sourceUpdated(oldDefaultCollectionId);
+        }
     }
 }
 
@@ -309,6 +315,20 @@
     return collection;
 }
 
+QByteArray SourceRegistry::defaultCollectionId() const
+{
+    QVariant id = m_settings.value(DEFAULT_COLLECTION_SETTINGS);
+    if (id.isValid()) {
+        return id.toString().toUtf8();
+    }
+
+    // fallback to eds default collection
+    ESource *defaultCalendarSource = e_source_registry_ref_default_calendar(m_sourceRegistry);
+    QString eId = QString::fromUtf8(e_source_get_uid(defaultCalendarSource));
+    g_object_unref(defaultCalendarSource);
+    return eId.toUtf8();
+}
+
 void SourceRegistry::onSourceAdded(ESourceRegistry *registry,
                                    ESource *source,
                                    SourceRegistry *self)
@@ -349,6 +369,11 @@
     Q_UNUSED(registry);
     Q_UNUSED(pspec);
 
+    if (self->m_settings.value(DEFAULT_COLLECTION_SETTINGS).isValid()) {
+        // we are using client confinguration
+        return;
+    }
+
     ESource *defaultCalendar = e_source_registry_ref_default_calendar(self->m_sourceRegistry);
     if (!defaultCalendar)
         return;

=== modified file 'organizer/qorganizer-eds-source-registry.h'
--- organizer/qorganizer-eds-source-registry.h	2016-03-14 20:19:46 +0000
+++ organizer/qorganizer-eds-source-registry.h	2016-03-17 17:03:37 +0000
@@ -20,6 +20,7 @@
 #define __QORGANIZER_EDS_SOURCEREGISTRY_H__
 
 #include <QtCore/QObject>
+#include <QtCore/QSettings>
 
 #include <QtOrganizer/QOrganizerCollectionId>
 #include <QtOrganizer/QOrganizerCollection>
@@ -67,6 +68,7 @@
     void sourceUpdated(const QString &collectionId);
 
 private:
+    QSettings m_settings;
     ESourceRegistry *m_sourceRegistry;
     QtOrganizer::QOrganizerCollection m_defaultCollection;
     QMap<QString, EClient*> m_clients;
@@ -82,6 +84,7 @@
     int m_sourceDisabledId;
     int m_defaultSourceChangedId;
 
+    QByteArray defaultCollectionId() const;
     QString findCollection(ESource *source) const;
     QtOrganizer::QOrganizerCollection registerSource(ESource *source, bool isDefault = false);
     void updateDefaultCollection(QtOrganizer::QOrganizerCollection *collection);