1
=== modified file 'contacts/contacts-service.cpp'
2
--- contacts/contacts-service.cpp	2014-06-26 22:10:02 +0000
3
+++ contacts/contacts-service.cpp	2014-09-11 18:57:11 +0000
4
@@ -185,6 +185,7 @@
5
185
        if (!m_iface->lastError().isValid()) {
185
        if (!m_iface->lastError().isValid()) {
6
186
            m_serviceIsReady = m_iface.data()->property("isReady").toBool();
186
            m_serviceIsReady = m_iface.data()->property("isReady").toBool();
7
187
            connect(m_iface.data(), SIGNAL(ready()), this, SLOT(onServiceReady()));
187
            connect(m_iface.data(), SIGNAL(ready()), this, SLOT(onServiceReady()));
8
188
            connect(m_iface.data(), SIGNAL(reloaded()), this, SIGNAL(serviceChanged()));
9
188
            connect(m_iface.data(), SIGNAL(contactsAdded(QStringList)), this, SLOT(onContactsAdded(QStringList)));
189
            connect(m_iface.data(), SIGNAL(contactsAdded(QStringList)), this, SLOT(onContactsAdded(QStringList)));
10
189
            connect(m_iface.data(), SIGNAL(contactsRemoved(QStringList)), this, SLOT(onContactsRemoved(QStringList)));
190
            connect(m_iface.data(), SIGNAL(contactsRemoved(QStringList)), this, SLOT(onContactsRemoved(QStringList)));
11
190
            connect(m_iface.data(), SIGNAL(contactsUpdated(QStringList)), this, SLOT(onContactsUpdated(QStringList)));
191
            connect(m_iface.data(), SIGNAL(contactsUpdated(QStringList)), this, SLOT(onContactsUpdated(QStringList)));
12
191
192
13
=== modified file 'lib/addressbook-adaptor.h'
14
--- lib/addressbook-adaptor.h	2014-04-09 19:45:40 +0000
15
+++ lib/addressbook-adaptor.h	2014-09-11 18:57:11 +0000
16
@@ -51,6 +51,7 @@
17
51
"      <arg direction=\"out\" type=\"a(ss)\" name=\"errorMap\"/>\n"
51
"      <arg direction=\"out\" type=\"a(ss)\" name=\"errorMap\"/>\n"
18
52
"    </signal>\n"
52
"    </signal>\n"
19
53
"    <signal name=\"ready\"/>\n"
53
"    <signal name=\"ready\"/>\n"
20
54
"    <signal name=\"reloaded\"/>\n"
21
54
"    <method name=\"ping\">\n"
55
"    <method name=\"ping\">\n"
22
55
"      <arg direction=\"out\" type=\"b\"/>\n"
56
"      <arg direction=\"out\" type=\"b\"/>\n"
23
56
"    </method>\n"
57
"    </method>\n"
24
@@ -131,6 +132,7 @@
25
131
    void contactsUpdated(const QStringList &ids);
132
    void contactsUpdated(const QStringList &ids);
26
132
    void asyncOperationResult(QMap<QString, QString> errors);
133
    void asyncOperationResult(QMap<QString, QString> errors);
27
133
    void ready();
134
    void ready();
28
135
    void reloaded();
29
134
136
30
135
private:
137
private:
31
136
    AddressBook *m_addressBook;
138
    AddressBook *m_addressBook;
32
137
139
33
=== modified file 'lib/addressbook.cpp'
34
--- lib/addressbook.cpp	2014-08-11 21:20:38 +0000
35
+++ lib/addressbook.cpp	2014-09-11 18:57:11 +0000
36
@@ -91,9 +91,10 @@
37
91
AddressBook::AddressBook(QObject *parent)
91
AddressBook::AddressBook(QObject *parent)
38
92
    : QObject(parent),
92
    : QObject(parent),
39
93
      m_individualAggregator(0),
93
      m_individualAggregator(0),
41
94
      m_contacts(new ContactsMap),
94
      m_contacts(0),
42
95
      m_adaptor(0),
95
      m_adaptor(0),
43
96
      m_notifyContactUpdate(0),
96
      m_notifyContactUpdate(0),
44
97
      m_edsIsLive(false),
45
97
      m_ready(false),
98
      m_ready(false),
46
98
      m_individualsChangedDetailedId(0),
99
      m_individualsChangedDetailedId(0),
47
99
      m_notifyIsQuiescentHandlerId(0),
100
      m_notifyIsQuiescentHandlerId(0),
48
@@ -106,6 +107,7 @@
49
106
        m_serviceName = CPIM_SERVICE_NAME;
107
        m_serviceName = CPIM_SERVICE_NAME;
50
107
    }
108
    }
51
108
    prepareUnixSignals();
109
    prepareUnixSignals();
52
110
    connectWithEDS();
53
109
}
111
}
54
110
112
55
111
AddressBook::~AddressBook()
113
AddressBook::~AddressBook()
56
@@ -159,6 +161,7 @@
57
159
        prepareFolks();
161
        prepareFolks();
58
160
        return true;
162
        return true;
59
161
    }
163
    }
60
164
61
162
    return false;
165
    return false;
62
163
}
166
}
63
164
167
64
@@ -167,8 +170,18 @@
65
167
    return start(QDBusConnection::sessionBus());
170
    return start(QDBusConnection::sessionBus());
66
168
}
171
}
67
169
172
69
170
void AddressBook::shutdown()
173
void AddressBook::unprepareFolks()
70
171
{
174
{
71
175
    // remove all contacts
72
176
    // flusing any pending notification
73
177
    m_notifyContactUpdate->flush();
74
178
75
179
    // notify about contacts removal
76
180
    if (m_contacts) {
77
181
        m_notifyContactUpdate->insertRemovedContacts(m_contacts->keys().toSet());
78
182
        m_notifyContactUpdate->flush();
79
183
    }
80
184
81
172
    m_ready = false;
185
    m_ready = false;
82
173
186
83
174
    Q_FOREACH(View* view, m_views) {
187
    Q_FOREACH(View* view, m_views) {
84
@@ -189,6 +202,11 @@
85
189
        m_individualsChangedDetailedId = m_notifyIsQuiescentHandlerId = 0;
202
        m_individualsChangedDetailedId = m_notifyIsQuiescentHandlerId = 0;
86
190
        g_clear_object(&m_individualAggregator);
203
        g_clear_object(&m_individualAggregator);
87
191
    }
204
    }
88
205
}
89
206
90
207
void AddressBook::shutdown()
91
208
{
92
209
    unprepareFolks();
93
192
210
94
193
    if (m_adaptor) {
211
    if (m_adaptor) {
95
194
        if (m_connection.interface() &&
212
        if (m_connection.interface() &&
96
@@ -208,6 +226,7 @@
97
208
226
98
209
void AddressBook::prepareFolks()
227
void AddressBook::prepareFolks()
99
210
{
228
{
100
229
    m_contacts = new ContactsMap;
101
211
    m_individualAggregator = folks_individual_aggregator_dup();
230
    m_individualAggregator = folks_individual_aggregator_dup();
102
212
    g_object_get(G_OBJECT(m_individualAggregator), "is-quiescent", &m_ready, NULL);
231
    g_object_get(G_OBJECT(m_individualAggregator), "is-quiescent", &m_ready, NULL);
103
213
    if (m_ready) {
232
    if (m_ready) {
104
@@ -215,7 +234,7 @@
105
215
    }
234
    }
106
216
    m_notifyIsQuiescentHandlerId = g_signal_connect(m_individualAggregator,
235
    m_notifyIsQuiescentHandlerId = g_signal_connect(m_individualAggregator,
107
217
                                          "notify::is-quiescent",
236
                                          "notify::is-quiescent",
109
218
                                          (GCallback)AddressBook::isQuiescentChanged,
237
                                          (GCallback) AddressBook::isQuiescentChanged,
110
219
                                          this);
238
                                          this);
111
220
239
112
221
    m_individualsChangedDetailedId = g_signal_connect(m_individualAggregator,
240
    m_individualsChangedDetailedId = g_signal_connect(m_individualAggregator,
113
@@ -223,12 +242,45 @@
114
223
                                          (GCallback) AddressBook::individualsChangedCb,
242
                                          (GCallback) AddressBook::individualsChangedCb,
115
224
                                          this);
243
                                          this);
116
225
244
117
226
118
227
    folks_individual_aggregator_prepare(m_individualAggregator,
245
    folks_individual_aggregator_prepare(m_individualAggregator,
119
228
                                        (GAsyncReadyCallback) AddressBook::prepareFolksDone,
246
                                        (GAsyncReadyCallback) AddressBook::prepareFolksDone,
120
229
                                        this);
247
                                        this);
121
230
}
248
}
122
231
249
123
250
void AddressBook::connectWithEDS()
124
251
{
125
252
    // we need to keep it update with the EDS dbus service name
126
253
    static const QString evolutionServiceName("org.gnome.evolution.dataserver.AddressBook6");
127
254
128
255
    // Check if eds was disabled manually
129
256
    // If eds was disabled we should skip the check
130
257
    if (qEnvironmentVariableIsSet("FOLKS_BACKENDS_ALLOWED")) {
131
258
        QString allowedBackends = qgetenv("FOLKS_BACKENDS_ALLOWED");
132
259
        if (!allowedBackends.contains("eds")) {
133
260
            return;
134
261
        }
135
262
    }
136
263
137
264
    // check if service is already registered
138
265
    // We will try register a EDS service if its fails this mean that the service is already registered
139
266
    m_edsIsLive = !QDBusConnection::sessionBus().registerService(evolutionServiceName);
140
267
    if (!m_edsIsLive) {
141
268
        // if we succeed we need to unregister it
142
269
        QDBusConnection::sessionBus().unregisterService(evolutionServiceName);
143
270
    }
144
271
145
272
    m_edsWatcher = new QDBusServiceWatcher(evolutionServiceName,
146
273
                                           QDBusConnection::sessionBus(),
147
274
                                           QDBusServiceWatcher::WatchForOwnerChange,
148
275
                                           this);
149
276
    connect(m_edsWatcher, SIGNAL(serviceOwnerChanged(QString,QString,QString)),
150
277
            this, SLOT(onEdsServiceOwnerChanged(QString,QString,QString)));
151
278
152
279
153
280
    // WORKAROUND: Will ceck for EDS after the service get ready
154
281
    connect(this, SIGNAL(ready()), SLOT(checkForEds()));
155
282
}
156
283
157
232
SourceList AddressBook::availableSources(const QDBusMessage &message)
284
SourceList AddressBook::availableSources(const QDBusMessage &message)
158
233
{
285
{
159
234
    getSource(message, false);
286
    getSource(message, false);
160
@@ -606,6 +658,22 @@
161
606
    m_notifyContactUpdate->insertChangedContacts(QSet<QString>() << individual->id());
658
    m_notifyContactUpdate->insertChangedContacts(QSet<QString>() << individual->id());
162
607
}
659
}
163
608
660
164
661
void AddressBook::onEdsServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner)
165
662
{
166
663
    qDebug() << name << oldOwner << newOwner;
167
664
    if (newOwner.isEmpty()) {
168
665
        m_edsIsLive = false;
169
666
        qWarning() << "EDS died: restarting service" << m_individualsChangedDetailedId;
170
667
        // reset folks objects
171
668
        unprepareFolks();
172
669
        prepareFolks();
173
670
174
671
        Q_EMIT m_adaptor->reloaded();
175
672
    } else {
176
673
        m_edsIsLive = true;
177
674
    }
178
675
}
179
676
180
609
int AddressBook::removeContacts(const QStringList &contactIds, const QDBusMessage &message)
677
int AddressBook::removeContacts(const QStringList &contactIds, const QDBusMessage &message)
181
610
{
678
{
182
611
    RemoveContactsData *data = new RemoveContactsData;
679
    RemoveContactsData *data = new RemoveContactsData;
183
@@ -920,4 +988,31 @@
184
920
    m_snQuit->setEnabled(true);
988
    m_snQuit->setEnabled(true);
185
921
}
989
}
186
922
990
187
991
// WORKAROUND: For some strange reason sometimes EDS does not start with the service request
188
992
// we will try to reload folks if this happen
189
993
void AddressBook::checkForEds()
190
994
{
191
995
    // Use maxRetry value to avoid infinite loop
192
996
    static const int maxRerty = 10;
193
997
    static int retryCount = 0;
194
998
    if (retryCount >= maxRerty) {
195
999
        return;
196
1000
    }
197
1001
    retryCount++;
198
1002
199
1003
    if (!m_edsIsLive) {
200
1004
        // wait some ms to restart folks, this ms increase 500ms for each retryCount
201
1005
        QTimer::singleShot(500 * retryCount, this, SLOT(reloadFolks()));
202
1006
        qWarning() << "EDS did not start, trying to reload folks;";
203
1007
    } else {
204
1008
        retryCount = 0;
205
1009
    }
206
1010
}
207
1011
208
1012
void AddressBook::reloadFolks()
209
1013
{
210
1014
    unprepareFolks();
211
1015
    prepareFolks();
212
1016
}
213
1017
214
923
} //namespace
1018
} //namespace
215
924
1019
216
=== modified file 'lib/addressbook.h'
217
--- lib/addressbook.h	2014-04-09 19:45:40 +0000
218
+++ lib/addressbook.h	2014-09-11 18:57:11 +0000
219
@@ -80,10 +80,15 @@
220
80
private Q_SLOTS:
80
private Q_SLOTS:
221
81
    void viewClosed();
81
    void viewClosed();
222
82
    void individualChanged(QIndividual *individual);
82
    void individualChanged(QIndividual *individual);
223
83
    void onEdsServiceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
224
83
84
225
84
    // Unix signal handlers.
85
    // Unix signal handlers.
226
85
    void handleSigQuit();
86
    void handleSigQuit();
227
86
87
228
88
    // WORKAROUND: Check if EDS was running when the service started
229
89
    void checkForEds();
230
90
    void reloadFolks();
231
91
232
87
private:
92
private:
233
88
    FolksIndividualAggregator *m_individualAggregator;
93
    FolksIndividualAggregator *m_individualAggregator;
234
89
    ContactsMap *m_contacts;
94
    ContactsMap *m_contacts;
235
@@ -91,10 +96,12 @@
236
91
    AddressBookAdaptor *m_adaptor;
96
    AddressBookAdaptor *m_adaptor;
237
92
    // timer to avoid send several updates at the same time
97
    // timer to avoid send several updates at the same time
238
93
    DirtyContactsNotify *m_notifyContactUpdate;
98
    DirtyContactsNotify *m_notifyContactUpdate;
239
99
    QDBusServiceWatcher *m_edsWatcher;
240
94
100
241
101
    bool m_edsIsLive;
242
95
    bool m_ready;
102
    bool m_ready;
245
96
    int m_individualsChangedDetailedId;
103
    gulong m_individualsChangedDetailedId;
246
97
    int m_notifyIsQuiescentHandlerId;
104
    gulong m_notifyIsQuiescentHandlerId;
247
98
    QDBusConnection m_connection;
105
    QDBusConnection m_connection;
248
99
106
249
100
    // Update command
107
    // Update command
250
@@ -123,6 +130,8 @@
251
123
    static void quitSignalHandler(int unused);
130
    static void quitSignalHandler(int unused);
252
124
131
253
125
    void prepareFolks();
132
    void prepareFolks();
254
133
    void unprepareFolks();
255
134
    void connectWithEDS();
256
126
    bool registerObject(QDBusConnection &connection);
135
    bool registerObject(QDBusConnection &connection);
257
127
    QString removeContact(FolksIndividual *individual);
136
    QString removeContact(FolksIndividual *individual);
258
128
    QString addContact(FolksIndividual *individual);
137
    QString addContact(FolksIndividual *individual);
259
129
138
260
=== modified file 'lib/contacts-map.cpp'
261
--- lib/contacts-map.cpp	2014-08-11 21:20:38 +0000
262
+++ lib/contacts-map.cpp	2014-09-11 18:57:11 +0000
263
@@ -158,6 +158,11 @@
264
158
    return m_contacts;
158
    return m_contacts;
265
159
}
159
}
266
160
160
267
161
QStringList ContactsMap::keys() const
268
162
{
269
163
    return m_idToEntry.keys();
270
164
}
271
165
272
161
void ContactsMap::sertSort(const SortClause &clause)
166
void ContactsMap::sertSort(const SortClause &clause)
273
162
{
167
{
274
163
    if (clause.toContactSortOrder() != m_sortClause.toContactSortOrder()) {
168
    if (clause.toContactSortOrder() != m_sortClause.toContactSortOrder()) {
275
164
169
276
=== modified file 'lib/contacts-map.h'
277
--- lib/contacts-map.h	2014-08-11 21:20:38 +0000
278
+++ lib/contacts-map.h	2014-09-11 18:57:11 +0000
279
@@ -75,6 +75,8 @@
280
75
    void lock();
75
    void lock();
281
76
    void unlock();
76
    void unlock();
282
77
    QList<ContactEntry*> values() const;
77
    QList<ContactEntry*> values() const;
283
78
    QStringList keys() const;
284
79
285
78
    void sertSort(const SortClause &clause);
80
    void sertSort(const SortClause &clause);
286
79
    SortClause sort() const;
81
    SortClause sort() const;
287
80
82
288
81
83
289
=== modified file 'lib/dirtycontact-notify.cpp'
290
--- lib/dirtycontact-notify.cpp	2014-06-30 23:30:11 +0000
291
+++ lib/dirtycontact-notify.cpp	2014-09-11 18:57:11 +0000
292
@@ -54,6 +54,12 @@
293
54
    m_timer.start();
54
    m_timer.start();
294
55
}
55
}
295
56
56
296
57
void DirtyContactsNotify::flush()
297
58
{
298
59
    m_timer.stop();
299
60
    emitSignals();
300
61
}
301
62
302
57
void DirtyContactsNotify::insertRemovedContacts(QSet<QString> ids)
63
void DirtyContactsNotify::insertRemovedContacts(QSet<QString> ids)
303
58
{
64
{
304
59
    if (!m_adaptor->isReady()) {
65
    if (!m_adaptor->isReady()) {
305
60
66
306
=== modified file 'lib/dirtycontact-notify.h'
307
--- lib/dirtycontact-notify.h	2014-03-27 16:47:09 +0000
308
+++ lib/dirtycontact-notify.h	2014-09-11 18:57:11 +0000
309
@@ -41,6 +41,7 @@
310
41
    void insertChangedContacts(QSet<QString> ids);
41
    void insertChangedContacts(QSet<QString> ids);
311
42
    void insertRemovedContacts(QSet<QString> ids);
42
    void insertRemovedContacts(QSet<QString> ids);
312
43
    void insertAddedContacts(QSet<QString> ids);
43
    void insertAddedContacts(QSet<QString> ids);
313
44
    void flush();
314
44
45
315
45
private Q_SLOTS:
46
private Q_SLOTS:
316
46
    void emitSignals();
47
    void emitSignals();
317
47
48
318
=== modified file 'upstart/address-book-service.conf'
319
--- upstart/address-book-service.conf	2014-08-19 13:03:47 +0000
320
+++ upstart/address-book-service.conf	2014-09-11 18:57:11 +0000
321
@@ -1,11 +1,19 @@
322
1
description "address-book-service"
1
description "address-book-service"
323
2
author "Bill Filler <bill.filler@canonical.com>"
2
author "Bill Filler <bill.filler@canonical.com>"
324
3
3
327
4
start on started unity8
4
start on started dbus and xsession SESSION=ubuntu-touch
328
5
stop on desktop-end
5
stop on runlevel [06]
329
6
6
330
7
respawn
7
respawn
331
8
respawn limit unlimited
332
9
333
10
pre-start script
334
11
    echo "START `date`"
335
12
    initctl set-env ADDRESS_BOOK_SERVICE_DEBUG="On"
336
13
end script
337
14
338
15
post-stop script
339
16
    echo "STOP `date`"
340
17
end script
341
8
18
342
9
exec /usr/lib/arm-linux-gnueabihf/address-book-service/address-book-service
19
exec /usr/lib/arm-linux-gnueabihf/address-book-service/address-book-service
343
10
344
11
pre-start exec /usr/lib/evolution/evolution-addressbook-factory
Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-09-02	Approve on 2014-09-12
PS Jenkins bot	continuous-integration		Approve on 2014-09-11
Review via email: mp+233084@code.launchpad.net