1
=== modified file 'accounts/CMakeLists.txt'
2
--- accounts/CMakeLists.txt	2015-07-09 15:57:07 +0000
3
+++ accounts/CMakeLists.txt	2015-10-15 19:20:43 +0000
4
@@ -1,5 +1,5 @@
5
1
set(SERVICE_FILES
1
set(SERVICE_FILES
7
2
     google-contacts.service
2
    google-buteo-contacts.service
8
3
)
3
)
9
4
set(APPLICATION_FILES
4
set(APPLICATION_FILES
10
5
    address-book-app.application
5
    address-book-app.application
11
6
6
12
=== modified file 'accounts/address-book-app.application'
13
--- accounts/address-book-app.application	2015-07-09 15:57:07 +0000
14
+++ accounts/address-book-app.application	2015-10-15 19:20:43 +0000
15
@@ -4,7 +4,7 @@
16
4
  <desktop-entry>address-book-app.desktop</desktop-entry>
4
  <desktop-entry>address-book-app.desktop</desktop-entry>
17
5
5
18
6
  <service-types>
6
  <service-types>
20
7
    <service-type id="contacts">
7
    <service-type id="buteo-contacts">
21
8
      <description>Synchronize your contacts</description>
8
      <description>Synchronize your contacts</description>
22
9
    </service-type>
9
    </service-type>
23
10
  </service-types>
10
  </service-types>
24
11
11
25
=== renamed file 'accounts/google-contacts.service' => 'accounts/google-buteo-contacts.service'
26
--- accounts/google-contacts.service	2015-07-09 15:57:07 +0000
27
+++ accounts/google-buteo-contacts.service	2015-10-15 19:20:43 +0000
28
@@ -1,6 +1,6 @@
29
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
32
2
<service id="google-contacts">
2
<service id="google-buteo-contacts">
33
3
  <type>contacts</type>
3
  <type>buteo-contacts</type>
34
4
  <name>Google Contacts</name>
4
  <name>Google Contacts</name>
35
5
  <provider>google</provider>
5
  <provider>google</provider>
36
6
</service>
6
</service>
37
7
7
38
=== modified file 'buteo-contact-client/UAuth.cpp'
39
--- buteo-contact-client/UAuth.cpp	2015-07-21 19:15:51 +0000
40
+++ buteo-contact-client/UAuth.cpp	2015-10-15 19:20:43 +0000
41
@@ -69,6 +69,11 @@
42
69
{
69
{
43
70
    Q_D(UAuth);
70
    Q_D(UAuth);
44
71
71
45
72
    if ((accountId == 0) || serviceName.isEmpty()) {
46
73
        LOG_DEBUG("Invalid account id or service name:" << accountId << serviceName);
47
74
        return false;
48
75
    }
49
76
50
72
    d->mServiceName = serviceName;
77
    d->mServiceName = serviceName;
51
73
    if (d->mAccountManager && d_ptr->mAccount) {
78
    if (d->mAccountManager && d_ptr->mAccount) {
52
74
        LOG_DEBUG("GAuth already initialized");
79
        LOG_DEBUG("GAuth already initialized");
53
75
80
54
=== modified file 'buteo-contact-client/UContactsBackend.cpp'
55
--- buteo-contact-client/UContactsBackend.cpp	2015-09-16 13:32:10 +0000
56
+++ buteo-contact-client/UContactsBackend.cpp	2015-10-15 19:20:43 +0000
57
@@ -97,7 +97,13 @@
58
97
        contact.setType(QContactType::TypeGroup);
97
        contact.setType(QContactType::TypeGroup);
59
98
98
60
99
        QContactDisplayLabel label;
99
        QContactDisplayLabel label;
62
100
        label.setLabel(syncTarget);
100
        //WORKAROUND: append a extra space in the end of the source name
63
101
        //this is necessary to avoid conflict with old sources used by syncevolution
64
102
        //SyncEvolution sync profile sync contacts from gooble based on the source name
65
103
        //creating a new source with the same name could cause the sync to happen in the
66
104
        //wrong source
67
105
        //FIXME: remove this when syncevolution get removed from image
68
106
        label.setLabel(syncTarget + " ");
69
101
        contact.saveDetail(&label);
107
        contact.saveDetail(&label);
70
102
108
71
103
        // set the new source as default
109
        // set the new source as default
72
@@ -333,11 +339,11 @@
73
333
    QMap<int, QContactManager::Error> errors;
339
    QMap<int, QContactManager::Error> errors;
74
334
    QMap<int, UContactsStatus> statusMap;
340
    QMap<int, UContactsStatus> statusMap;
75
335
341
77
336
    if(iMgr->removeContacts(aContactIDList , &errors)) {
342
    if(aContactIDList.isEmpty() || iMgr->removeContacts(aContactIDList , &errors)) {
78
337
        LOG_DEBUG("Successfully Removed all contacts ");
343
        LOG_DEBUG("Successfully Removed all contacts ");
79
338
    }
344
    }
80
339
    else {
345
    else {
82
340
        LOG_WARNING("Failed Removing Contacts");
346
        LOG_WARNING("Failed Removing Contacts" << errors);
83
341
    }
347
    }
84
342
348
85
343
    // QContactManager will populate errorMap only for errors, but we use this as a status map,
349
    // QContactManager will populate errorMap only for errors, but we use this as a status map,
86
@@ -356,8 +362,8 @@
87
356
        }
362
        }
88
357
        else
363
        else
89
358
        {
364
        {
90
359
            LOG_DEBUG("contact with id " << contactId << " and index " << i <<" is in error");
91
360
            QContactManager::Error errorCode = errors.value(i);
365
            QContactManager::Error errorCode = errors.value(i);
92
366
            LOG_WARNING("Removing contact with id " << contactId << " and index " << i <<" is an error" << errorCode);
93
361
            status.errorCode = errorCode;
367
            status.errorCode = errorCode;
94
362
            statusMap.insert(i, status);
368
            statusMap.insert(i, status);
95
363
        }
369
        }
96
364
370
97
=== modified file 'buteo-contact-client/UContactsClient.cpp'
98
--- buteo-contact-client/UContactsClient.cpp	2015-09-24 17:49:06 +0000
99
+++ buteo-contact-client/UContactsClient.cpp	2015-10-15 19:20:43 +0000
100
@@ -49,8 +49,13 @@
101
49
        : mAuth(0),
49
        : mAuth(0),
102
50
          mContactBackend(0),
50
          mContactBackend(0),
103
51
          mRemoteSource(0),
51
          mRemoteSource(0),
104
52
          mSlowSync(false),
105
53
          mAborted(false),
106
52
          mServiceName(serviceName),
54
          mServiceName(serviceName),
108
53
          mAborted(false)
55
          mProgress(0),
109
56
          mAccountId(0),
110
57
          mSyncDirection(Buteo::SyncProfile::SYNC_DIRECTION_TWO_WAY),
111
58
          mConflictResPolicy(Buteo::SyncProfile::CR_POLICY_PREFER_REMOTE_CHANGES)
112
54
    {
59
    {
113
55
    }
60
    }
114
56
61
115
@@ -115,6 +120,7 @@
116
115
        return false;
120
        return false;
117
116
    }
121
    }
118
117
122
119
123
    LOG_INFO ("Init sync for account:" << d->mAccountId << d->mServiceName);
120
118
    d->mAuth = crateAuthenticator(this);
124
    d->mAuth = crateAuthenticator(this);
121
119
    if (!d->mAuth || !d->mAuth->init(d->mAccountId, d->mServiceName)) {
125
    if (!d->mAuth || !d->mAuth->init(d->mAccountId, d->mServiceName)) {
122
120
        LOG_CRITICAL("Fail to create auth object");
126
        LOG_CRITICAL("Fail to create auth object");
123
@@ -135,8 +141,6 @@
124
135
        goto init_fail;
141
        goto init_fail;
125
136
    }
142
    }
126
137
143
127
138
    d->mItemResults.insert(syncTargetId(), Buteo::DatabaseResults());
128
139
129
140
    // sign in.
144
    // sign in.
130
141
    connect(d->mAuth, SIGNAL(success()), SLOT(start()));
145
    connect(d->mAuth, SIGNAL(success()), SLOT(start()));
131
142
    connect(d->mAuth, SIGNAL(failed()), SLOT(onAuthenticationError()));
146
    connect(d->mAuth, SIGNAL(failed()), SLOT(onAuthenticationError()));
132
@@ -150,7 +154,8 @@
133
150
    // Take necessary action when sync is finished
154
    // Take necessary action when sync is finished
134
151
    connect(this,
155
    connect(this,
135
152
            SIGNAL(syncFinished(Sync::SyncStatus)),
156
            SIGNAL(syncFinished(Sync::SyncStatus)),
137
153
            SLOT(onSyncFinished(Sync::SyncStatus)));
157
            SLOT(onSyncFinished(Sync::SyncStatus)),
138
158
            Qt::QueuedConnection);
139
154
159
140
155
    return true;
160
    return true;
141
156
161
142
@@ -300,11 +305,13 @@
143
300
        return false;
305
        return false;
144
301
    }
306
    }
145
302
307
147
303
    if (!d->mContactBackend->init(d->mAccountId, d->mAuth->accountDisplayName())) {
308
    if (!d->mContactBackend->init(d->mAccountId,
148
309
                                  d->mAuth->accountDisplayName())) {
149
304
        LOG_WARNING("Fail to init contact backend");
310
        LOG_WARNING("Fail to init contact backend");
150
305
        return false;
311
        return false;
151
306
    }
312
    }
152
307
313
153
314
    d->mItemResults.insert(syncTargetId(), Buteo::DatabaseResults());
154
308
    switch (d->mSyncDirection)
315
    switch (d->mSyncDirection)
155
309
    {
316
    {
156
310
    case Buteo::SyncProfile::SYNC_DIRECTION_TWO_WAY:
317
    case Buteo::SyncProfile::SYNC_DIRECTION_TWO_WAY:
157
@@ -788,6 +795,8 @@
158
788
    FUNCTION_CALL_TRACE;
795
    FUNCTION_CALL_TRACE;
159
789
    Q_D(UContactsClient);
796
    Q_D(UContactsClient);
160
790
797
161
798
    LOG_INFO("Sync finished with state:" << aState);
162
799
163
791
    switch(aState)
800
    switch(aState)
164
792
    {
801
    {
165
793
        case Sync::SYNC_ERROR:
802
        case Sync::SYNC_ERROR:
166
794
803
167
=== modified file 'google/GContactsClient.cpp'
168
--- google/GContactsClient.cpp	2015-07-21 19:15:51 +0000
169
+++ google/GContactsClient.cpp	2015-10-15 19:20:43 +0000
170
@@ -38,7 +38,7 @@
171
38
38
172
39
#include "buteosyncfw_p.h"
39
#include "buteosyncfw_p.h"
173
40
40
175
41
static const QString GOOGLE_CONTACTS_SERVICE          ("google-contacts");
41
static const QString GOOGLE_CONTACTS_SERVICE          ("google-buteo-contacts");
176
42
42
177
43
extern "C" GContactsClient* createPlugin(const QString& aPluginName,
43
extern "C" GContactsClient* createPlugin(const QString& aPluginName,
178
44
                                         const Buteo::SyncProfile& aProfile,
44
                                         const Buteo::SyncProfile& aProfile,
179
45
45
180
=== modified file 'google/xmls/sync/CMakeLists.txt'
181
--- google/xmls/sync/CMakeLists.txt	2015-07-09 15:57:07 +0000
182
+++ google/xmls/sync/CMakeLists.txt	2015-10-15 19:20:43 +0000
183
@@ -1,3 +1,3 @@
185
1
install(FILES google-contacts.xml
1
install(FILES google-buteo-contacts.xml
186
2
    DESTINATION "/etc/buteo/profiles/sync"
2
    DESTINATION "/etc/buteo/profiles/sync"
187
3
)
3
)
188
4
4
189
=== renamed file 'google/xmls/sync/google-contacts.xml' => 'google/xmls/sync/google-buteo-contacts.xml'
190
--- google/xmls/sync/google-contacts.xml	2015-07-17 13:52:41 +0000
191
+++ google/xmls/sync/google-buteo-contacts.xml	2015-10-15 19:20:43 +0000
192
@@ -1,7 +1,7 @@
193
1
<?xml version="1.0" encoding="UTF-8"?>
1
<?xml version="1.0" encoding="UTF-8"?>
194
2
<profile type="sync" name="google-contacts">
2
<profile type="sync" name="google-contacts">
195
3
    <key value="contacts" name="category"/>
3
    <key value="contacts" name="category"/>
197
4
    <key value="google-contacts" name="remote_service_name"/>
4
    <key value="google-buteo-contacts" name="remote_service_name"/>
198
5
    <key value="online" name="destinationtype"/>
5
    <key value="online" name="destinationtype"/>
199
6
    <key value="false" name="enabled"/>
6
    <key value="false" name="enabled"/>
200
7
    <key value="true" name="hidden"/>
7
    <key value="true" name="hidden"/>
Status:	Merged
Approved by:	Michael Sheldon on 2015-10-15
Approved revision:	17
Merged at revision:	7
Proposed branch:	lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service
Merge into:	lp:buteo-sync-plugins-contacts
Diff against target:	200 lines (+36/-16) 9 files modified accounts/CMakeLists.txt (+1/-1) accounts/address-book-app.application (+1/-1) accounts/google-buteo-contacts.service (+2/-2) buteo-contact-client/UAuth.cpp (+5/-0) buteo-contact-client/UContactsBackend.cpp (+10/-4) buteo-contact-client/UContactsClient.cpp (+14/-5) google/GContactsClient.cpp (+1/-1) google/xmls/sync/CMakeLists.txt (+1/-1) google/xmls/sync/google-buteo-contacts.xml (+1/-1)
To merge this branch:	bzr merge lp:~renatofilho/buteo-sync-plugins-contacts/rename-account-service
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-10-15
Michael Sheldon (community)		2015-10-06	Approve on 2015-10-15
Review via email: mp+273532@code.launchpad.net