1
=== modified file 'contacts/contacts-service.cpp'
2
--- contacts/contacts-service.cpp	2015-09-18 14:58:37 +0000
3
+++ contacts/contacts-service.cpp	2015-10-05 12:36:29 +0000
4
@@ -183,8 +183,11 @@
5
183
183
6
184
void GaleraContactsService::onServiceReady()
184
void GaleraContactsService::onServiceReady()
7
185
{
185
{
10
186
    m_serviceIsReady = m_iface.data()->property("isReady").toBool();
186
    bool isReady = m_iface.data()->property("isReady").toBool();
11
187
    Q_EMIT serviceChanged();
187
    if (isReady != m_serviceIsReady) {
12
188
        m_serviceIsReady = isReady;
13
189
        Q_EMIT serviceChanged();
14
190
    }
15
188
}
191
}
16
189
192
17
190
void GaleraContactsService::initialize()
193
void GaleraContactsService::initialize()
18
@@ -195,12 +198,14 @@
19
195
                                                                    CPIM_ADDRESSBOOK_IFACE_NAME));
198
                                                                    CPIM_ADDRESSBOOK_IFACE_NAME));
20
196
        if (!m_iface->lastError().isValid()) {
199
        if (!m_iface->lastError().isValid()) {
21
197
            m_serviceIsReady = m_iface.data()->property("isReady").toBool();
200
            m_serviceIsReady = m_iface.data()->property("isReady").toBool();
23
198
            connect(m_iface.data(), SIGNAL(readyChanged()), this, SLOT(onServiceReady()));
201
            connect(m_iface.data(), SIGNAL(readyChanged()), this, SLOT(onServiceReady()), Qt::UniqueConnection);
24
199
            connect(m_iface.data(), SIGNAL(safeModeChanged()), this, SIGNAL(serviceChanged()));
202
            connect(m_iface.data(), SIGNAL(safeModeChanged()), this, SIGNAL(serviceChanged()));
25
200
            connect(m_iface.data(), SIGNAL(contactsAdded(QStringList)), this, SLOT(onContactsAdded(QStringList)));
203
            connect(m_iface.data(), SIGNAL(contactsAdded(QStringList)), this, SLOT(onContactsAdded(QStringList)));
26
201
            connect(m_iface.data(), SIGNAL(contactsRemoved(QStringList)), this, SLOT(onContactsRemoved(QStringList)));
204
            connect(m_iface.data(), SIGNAL(contactsRemoved(QStringList)), this, SLOT(onContactsRemoved(QStringList)));
27
202
            connect(m_iface.data(), SIGNAL(contactsUpdated(QStringList)), this, SLOT(onContactsUpdated(QStringList)));
205
            connect(m_iface.data(), SIGNAL(contactsUpdated(QStringList)), this, SLOT(onContactsUpdated(QStringList)));
29
203
            Q_EMIT serviceChanged();
206
            if (m_serviceIsReady) {
30
207
                Q_EMIT serviceChanged();
31
208
            }
32
204
        } else {
209
        } else {
33
205
            qWarning() << "Fail to connect with service:"  << m_iface->lastError();
210
            qWarning() << "Fail to connect with service:"  << m_iface->lastError();
34
206
            m_iface.clear();
211
            m_iface.clear();
35
@@ -231,7 +236,7 @@
36
231
236
37
232
bool GaleraContactsService::isOnline() const
237
bool GaleraContactsService::isOnline() const
38
233
{
238
{
40
234
    return !m_iface.isNull();
239
    return !m_iface.isNull() && m_serviceIsReady;
41
235
}
240
}
42
236
241
43
237
void GaleraContactsService::fetchContactsById(QtContacts::QContactFetchByIdRequest *request)
242
void GaleraContactsService::fetchContactsById(QtContacts::QContactFetchByIdRequest *request)
44
238
243
45
=== modified file 'contacts/qcontact-backend.cpp'
46
--- contacts/qcontact-backend.cpp	2015-09-16 15:57:58 +0000
47
+++ contacts/qcontact-backend.cpp	2015-10-05 12:36:29 +0000
48
@@ -78,7 +78,7 @@
49
78
    connect(m_service, SIGNAL(contactsAdded(QList<QContactId>)), this, SIGNAL(contactsAdded(QList<QContactId>)));
78
    connect(m_service, SIGNAL(contactsAdded(QList<QContactId>)), this, SIGNAL(contactsAdded(QList<QContactId>)));
50
79
    connect(m_service, SIGNAL(contactsRemoved(QList<QContactId>)), this, SIGNAL(contactsRemoved(QList<QContactId>)));
79
    connect(m_service, SIGNAL(contactsRemoved(QList<QContactId>)), this, SIGNAL(contactsRemoved(QList<QContactId>)));
51
80
    connect(m_service, SIGNAL(contactsUpdated(QList<QContactId>)), this, SIGNAL(contactsChanged(QList<QContactId>)));
80
    connect(m_service, SIGNAL(contactsUpdated(QList<QContactId>)), this, SIGNAL(contactsChanged(QList<QContactId>)));
53
81
    connect(m_service, SIGNAL(serviceChanged()), this, SIGNAL(dataChanged()));
81
    connect(m_service, SIGNAL(serviceChanged()), this, SIGNAL(dataChanged()), Qt::QueuedConnection);
54
82
}
82
}
55
83
83
56
84
/*! Frees any memory used by this engine */
84
/*! Frees any memory used by this engine */
57
@@ -121,14 +121,13 @@
58
121
121
59
122
QList<QtContacts::QContact> GaleraManagerEngine::contacts(const QtContacts::QContactFilter &filter,
122
QList<QtContacts::QContact> GaleraManagerEngine::contacts(const QtContacts::QContactFilter &filter,
60
123
                                                          const QList<QtContacts::QContactSortOrder>& sortOrders,
123
                                                          const QList<QtContacts::QContactSortOrder>& sortOrders,
62
124
                                                          const QContactFetchHint &fetchHint, QtContacts::QContactManager::Error *error) const
124
                                                          const QContactFetchHint &fetchHint,
63
125
                                                          QtContacts::QContactManager::Error *error) const
64
125
{
126
{
65
126
    Q_UNUSED(fetchHint);
66
127
    Q_UNUSED(error);
67
128
68
129
    QContactFetchRequest request;
127
    QContactFetchRequest request;
69
130
    request.setFilter(filter);
128
    request.setFilter(filter);
70
131
    request.setSorting(sortOrders);
129
    request.setSorting(sortOrders);
71
130
    request.setFetchHint(fetchHint);
72
132
131
73
133
    const_cast<GaleraManagerEngine*>(this)->startRequest(&request);
132
    const_cast<GaleraManagerEngine*>(this)->startRequest(&request);
74
134
    const_cast<GaleraManagerEngine*>(this)->waitForRequestFinished(&request, -1);
133
    const_cast<GaleraManagerEngine*>(this)->waitForRequestFinished(&request, -1);
75
@@ -140,7 +139,10 @@
76
140
    return request.contacts();
139
    return request.contacts();
77
141
}
140
}
78
142
141
80
143
QList<QContact> GaleraManagerEngine::contacts(const QList<QContactId> &contactIds, const QContactFetchHint &fetchHint, QMap<int, QContactManager::Error> *errorMap, QContactManager::Error *error) const
142
QList<QContact> GaleraManagerEngine::contacts(const QList<QContactId> &contactIds,
81
143
                                              const QContactFetchHint &fetchHint,
82
144
                                              QMap<int, QContactManager::Error> *errorMap,
83
145
                                              QContactManager::Error *error) const
84
144
{
146
{
85
145
    QContactFetchByIdRequest request;
147
    QContactFetchByIdRequest request;
86
146
    request.setIds(contactIds);
148
    request.setIds(contactIds);
87
147
149
88
=== modified file 'tests/tst_tools/mock/mock-buteo.py'
89
--- tests/tst_tools/mock/mock-buteo.py	2015-09-29 14:19:23 +0000
90
+++ tests/tst_tools/mock/mock-buteo.py	2015-10-05 12:36:29 +0000
91
@@ -60,6 +60,11 @@
92
60
        return profileName
60
        return profileName
93
61
61
94
62
    @dbus.service.method(dbus_interface=MAIN_IFACE,
62
    @dbus.service.method(dbus_interface=MAIN_IFACE,
95
63
                         out_signature='as')
96
64
    def runningSyncs(self):
97
65
        return []
98
66
99
67
    @dbus.service.method(dbus_interface=MAIN_IFACE,
100
63
                         in_signature='ss', out_signature='as')
68
                         in_signature='ss', out_signature='as')
101
64
    def syncProfilesByKey(self, key, value):
69
    def syncProfilesByKey(self, key, value):
102
65
        if key == "accountid" and (value in self._profiles):
70
        if key == "accountid" and (value in self._profiles):
103
@@ -85,10 +90,6 @@
104
85
    def signalProfileChanged(self, profileId, status, changedProfile):
90
    def signalProfileChanged(self, profileId, status, changedProfile):
105
86
        print("profileChanged called")
91
        print("profileChanged called")
106
87
92
107
88
    @dbus.service.signal(dbus_interface=MAIN_IFACE)
108
89
    def safeModeChanged(self):
109
90
        print("safeModeChanged called")
110
91
111
92
    def _run(self):
93
    def _run(self):
112
93
        self._mainloop.run()
94
        self._mainloop.run()
113
94
95
114
95
96
115
=== modified file 'tests/tst_tools/mock/mock-galera.py'
116
--- tests/tst_tools/mock/mock-galera.py	2015-09-29 14:19:23 +0000
117
+++ tests/tst_tools/mock/mock-galera.py	2015-10-05 12:36:29 +0000
118
@@ -52,6 +52,7 @@
119
52
        dbus.service.Object.__init__(self, dbus.SessionBus(), object_path)
52
        dbus.service.Object.__init__(self, dbus.SessionBus(), object_path)
120
53
        self._mainloop = GObject.MainLoop()
53
        self._mainloop = GObject.MainLoop()
121
54
        self._view = AddressBookView(VIEW_OBJ)
54
        self._view = AddressBookView(VIEW_OBJ)
122
55
        self._isReady = True
123
55
        self._sources = {}
56
        self._sources = {}
124
56
57
125
57
    @dbus.service.method(dbus_interface=MAIN_IFACE,
58
    @dbus.service.method(dbus_interface=MAIN_IFACE,
126
@@ -111,6 +112,126 @@
127
111
    def contactsUpdated(self, contacts):
112
    def contactsUpdated(self, contacts):
128
112
        print("contactsUpdated called")
113
        print("contactsUpdated called")
129
113
114
130
115
    @dbus.service.signal(dbus_interface=MAIN_IFACE)
131
116
    def safeModeChanged(self):
132
117
        print("safeModeChanged called")
133
118
134
119
    @dbus.service.signal(dbus_interface=MAIN_IFACE)
135
120
    def readyChanged(self):
136
121
        print("readyChanged called")
137
122
138
123
139
124
    #properties
140
125
    @dbus.service.method(dbus_interface='org.freedesktop.DBus.Introspectable',
141
126
                         out_signature='s')
142
127
    def Introspect(self):
143
128
        return """<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
144
129
    "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
145
130
    <node name="/com/canonical/pim/AddressBook">
146
131
      <interface name="com.canonical.pim.AddressBook">
147
132
        <property name="isReady" type="b" access="read"/>
148
133
        <signal name="readyChanged">
149
134
        </signal>
150
135
        <method name="reset">
151
136
          <arg direction="out" type="b" />
152
137
        </method>
153
138
        <method name="availableSources">
154
139
          <arg direction="out" type="a(ssssubb)" />
155
140
        </method>
156
141
        <signal name="safeModeChanged">
157
142
        </signal>
158
143
        <method name="query">
159
144
          <arg direction="in"  type="s" name="clause" />
160
145
          <arg direction="in"  type="s" name="sort" />
161
146
          <arg direction="in"  type="i" name="max_count" />
162
147
          <arg direction="in"  type="b" name="show_invisible" />
163
148
          <arg direction="in"  type="as" name="sources" />
164
149
          <arg direction="out" type="o" />
165
150
        </method>
166
151
        <method name="createSource">
167
152
          <arg direction="in"  type="s" name="sourceId" />
168
153
          <arg direction="in"  type="s" name="sourceName" />
169
154
          <arg direction="in"  type="s" name="provider" />
170
155
          <arg direction="in"  type="s" name="applicationId" />
171
156
          <arg direction="in"  type="i" name="accountId" />
172
157
          <arg direction="in"  type="b" name="readOnly" />
173
158
          <arg direction="in"  type="b" name="primary" />
174
159
          <arg direction="out" type="b" />
175
160
        </method>
176
161
        <signal name="contactsRemoved">
177
162
          <arg type="as" name="contacts" />
178
163
        </signal>
179
164
        <method name="removeSource">
180
165
          <arg direction="in"  type="s" name="sourceId" />
181
166
          <arg direction="out" type="b" />
182
167
        </method>
183
168
        <signal name="contactsAdded">
184
169
          <arg type="as" name="contacts" />
185
170
        </signal>
186
171
        <method name="removeContacts">
187
172
          <arg direction="in"  type="as" name="contactIds" />
188
173
          <arg direction="out" type="i" />
189
174
        </method>
190
175
        <signal name="contactsUpdated">
191
176
          <arg type="as" name="contacts" />
192
177
        </signal>
193
178
      </interface>
194
179
      <interface name="org.freedesktop.DBus.Introspectable">
195
180
        <method name="Introspect">
196
181
          <arg direction="out" type="s" />
197
182
        </method>
198
183
      </interface>
199
184
      <interface name="org.freedesktop.DBus.Properties">
200
185
        <method name="Set">
201
186
          <arg direction="in"  type="s" name="interface_name" />
202
187
          <arg direction="in"  type="s" name="property_name" />
203
188
          <arg direction="in"  type="v" name="new_value" />
204
189
        </method>
205
190
        <signal name="PropertiesChanged">
206
191
          <arg type="s" name="interface_name" />
207
192
          <arg type="a{sv}" name="changed_properties" />
208
193
          <arg type="as" name="invalidated_properties" />
209
194
        </signal>
210
195
        <method name="Get">
211
196
          <arg direction="in"  type="s" name="interface_name" />
212
197
          <arg direction="in"  type="s" name="property_name" />
213
198
          <arg direction="out" type="v" />
214
199
        </method>
215
200
        <method name="GetAll">
216
201
          <arg direction="in"  type="s" name="interface_name" />
217
202
          <arg direction="out" type="a{sv}" />
218
203
        </method>
219
204
      </interface>
220
205
    </node>
221
206
    """
222
207
223
208
    @dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
224
209
                         in_signature='ss', out_signature='v')
225
210
    def Get(self, interface_name, property_name):
226
211
        return self.GetAll(interface_name)[property_name]
227
212
228
213
    @dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
229
214
                         in_signature='s', out_signature='a{sv}')
230
215
    def GetAll(self, interface_name):
231
216
        print("Get Property")
232
217
        return {'isReady': True}
233
218
234
219
    @dbus.service.method(dbus_interface=dbus.PROPERTIES_IFACE,
235
220
                         in_signature='ssv')
236
221
    def Set(self, interface_name, property_name, new_value):
237
222
        # validate the property name and value, update internal state…
238
223
        if property_name == 'isReady':
239
224
            self._isReady = new_value
240
225
            self.readyChanged()
241
226
242
227
        self.PropertiesChanged(interface_name,
243
228
            { property_name: new_value }, [])
244
229
245
230
    @dbus.service.signal(dbus_interface=dbus.PROPERTIES_IFACE,
246
231
                         signature='sa{sv}as')
247
232
    def PropertiesChanged(self, interface_name, changed_properties,
248
233
                          invalidated_properties):
249
234
        pass
250
114
235
251
115
    #helper functions
236
    #helper functions
252
116
    @dbus.service.method(dbus_interface=MAIN_IFACE,
237
    @dbus.service.method(dbus_interface=MAIN_IFACE,
Reviewer	Review Type	Date Requested	Status
Gustavo Pichorim Boiko (community)		2015-09-09	Approve on 2015-10-13
PS Jenkins bot	continuous-integration		Approve on 2015-10-05
Review via email: mp+270544@code.launchpad.net