1
=== modified file 'src/sync-account.cpp'
2
--- src/sync-account.cpp	2016-08-18 22:59:09 +0000
3
+++ src/sync-account.cpp	2016-08-31 17:59:26 +0000
4
@@ -269,10 +269,16 @@
5
269
    case 204:
269
    case 204:
6
270
    case 207:
270
    case 207:
7
271
        // status ok
271
        // status ok
8
272
    case 500:
9
273
        // server side generic error (just retry the sync)
10
274
    case 1500:
11
275
        // server side generic error (just retry the sync)
12
276
    case 403:
13
277
        // "Forbidden / access denied";
14
278
    case 10403:
15
279
        // "Forbidden / access denied";
16
272
        return "two-way";
280
        return "two-way";
17
273
    case 401:
281
    case 401:
18
274
    case 403:
19
275
        // "Forbidden / access denied";
20
276
    case 404:
282
    case 404:
21
277
        // "Object not found / unassigned field";
283
        // "Object not found / unassigned field";
22
278
    case 405:
284
    case 405:
23
279
285
24
=== modified file 'src/sync-daemon.cpp'
25
--- src/sync-daemon.cpp	2016-07-07 19:56:56 +0000
26
+++ src/sync-daemon.cpp	2016-08-31 17:59:26 +0000
27
@@ -710,6 +710,7 @@
28
710
        // this is a bug on SyncEvolution sometimes it fail to read the correct address book
710
        // this is a bug on SyncEvolution sometimes it fail to read the correct address book
29
711
        // FIXME: we should fix that on SyncEvolution
711
        // FIXME: we should fix that on SyncEvolution
30
712
        whiteListStatus << QStringLiteral("10500");
712
        whiteListStatus << QStringLiteral("10500");
31
713
        whiteListStatus << QStringLiteral("500");
32
713
    }
714
    }
33
714
715
34
715
    // check if we are going re-sync due a know problem
716
    // check if we are going re-sync due a know problem
35
@@ -731,13 +732,16 @@
36
731
        } else if (!errorMessage.isEmpty()) {
732
        } else if (!errorMessage.isEmpty()) {
37
732
            fail = true;
733
            fail = true;
38
733
            errorCode = 0;
734
            errorCode = 0;
46
734
            NotifyMessage *notify = new NotifyMessage(true, this);
735
            // only show error message if is the first sync or if error is not on whitelist
47
735
            notify->show(_("Synchronization"),
736
            if (firstSync || !whiteListStatus.contains(status)) {
48
736
                         QString(_("Fail to sync calendar %1 from account %2.\n%3"))
737
                NotifyMessage *notify = new NotifyMessage(true, this);
49
737
                             .arg(source)
738
                notify->show(_("Synchronization"),
50
738
                             .arg(acc->displayName())
739
                             QString(_("Fail to sync calendar %1 from account %2.\n%3"))
51
739
                             .arg(errorMessage),
740
                                 .arg(source)
52
740
                         acc->iconName(CALENDAR_SERVICE_TYPE));
741
                                 .arg(acc->displayName())
53
742
                                 .arg(errorMessage),
54
743
                             acc->iconName(CALENDAR_SERVICE_TYPE));
55
744
            }
56
741
        }
745
        }
57
742
746
58
743
        if (saveLog && !source.isEmpty()) {
747
        if (saveLog && !source.isEmpty()) {
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration	2016-08-31	Approve on 2016-08-31
Ubuntu Phablet Team		2016-08-31	Pending
Review via email: mp+304546@code.launchpad.net