MailJDTourDownloadDocsQualityTestsCoverage

Which source lines and branches the tests execute. Lines 91.5 %, branches 75.0 % (minimum 85 % and 72 %). main @ 399ffe3d · 21 October 2026 · pipeline 7238.

GCC Code Coverage Report

Directory: src/
Coverage: low: ≥ 0% medium: ≥ 75.0% high: ≥ 90.0%
Coverage Exec / Excl / Total
Lines: 96.6% 225 / 0 / 233
Functions: 100.0% 12 / 0 / 12
Branches: 75.7% 283 / 0 / 374
app/core/ContactOutboxResolve.cpp
Line Branch Exec Source
1 // The conflict resolver's write paths of the contact outbox (Sprint 107
2 // S107.3.3, S107.3.6, S107.3.7; decisions D-9, D-21, D-22). The
3 // ContactOutbox class is split over ContactOutbox.cpp and this file.
4 #include "ContactOutbox.h"
5
6 #include "data/ContactQueries.h"
7 #include "data/ContactStore.h"
8 #include "data/VCardCodec.h"
9 #include "data/VCardMerge.h"
10 #include "service/CardDavClient.h"
11 #include "util/SecureUtil.h"
12
13 #include <QCryptographicHash>
14 #include <QLoggingCategory>
15 #include <QPointer>
16 #include <QTimer>
17
18 Q_DECLARE_LOGGING_CATEGORY(lcConflict)
19
20 namespace {
21
22 const QString kMoved = QStringLiteral("moved");
23
24 5 QString hashOf(const QString &text) {
25
5/5
✓ Branch 2 → 3 taken 5 times.
✓ Branch 4 → 5 taken 5 times.
✓ Branch 5 → 6 taken 5 times.
✓ Branch 6 → 7 taken 5 times.
✓ Branch 7 → 8 taken 5 times.
 5 return QString::fromLatin1(QCryptographicHash::hash(text.toUtf8(), QCryptographicHash::Sha256).toHex().left(8));
26 }
27
28 // A card MailJD can write back without losing a line (S106-152).
29 8 bool readable(const QString &raw) {
30 8 ICal::Component card;
31 8 QString error;
32 8 int skipped = 0;
33
4/5
✓ Branch 2 → 3 taken 8 times.
✓ Branch 3 → 4 taken 7 times.
✓ Branch 3 → 6 taken 1 time.
✓ Branch 4 → 5 taken 7 times.
✗ Branch 4 → 6 not taken.
 16 return VCardCodec::parseTree(raw, &card, &error, &skipped) && skipped == 0;
34 8 }
35
36 } // namespace
37
38 3 std::optional<ContactOutboxEntry> ContactOutbox::moveSourceOf(const ContactOutboxEntry &target) const {
39
4/5
✓ Branch 2 → 3 taken 3 times.
✓ Branch 3 → 4 taken 3 times.
✓ Branch 4 → 5 taken 3 times.
✓ Branch 21 → 6 taken 3 times.
✗ Branch 21 → 22 not taken.
 3 for (const ContactOutboxEntry &entry : m_deps.store->outboxEntries())
40
4/8
✓ Branch 8 → 9 taken 3 times.
✗ Branch 8 → 15 not taken.
✓ Branch 9 → 10 taken 3 times.
✗ Branch 9 → 15 not taken.
✓ Branch 12 → 13 taken 3 times.
✗ Branch 12 → 15 not taken.
✓ Branch 16 → 17 taken 3 times.
✗ Branch 16 → 19 not taken.
 6 if (entry.uid == target.uid && entry.bookId != target.bookId && entry.operation == QLatin1String("delete") &&
41
1/2
✓ Branch 13 → 14 taken 3 times.
✗ Branch 13 → 15 not taken.
 3 entry.dependsOn == target.id)
42
1/2
✗ Branch 24 → 25 not taken.
✓ Branch 24 → 27 taken 3 times.
 3 return entry;
43 ✗ return std::nullopt;
44 }
45
46 22 ContactOutbox::ConflictInputs ContactOutbox::conflictInputs(qint64 bookId, const QString &uid) const {
47 22 ConflictInputs inputs;
48
1/1
✓ Branch 2 → 3 taken 22 times.
 22 const auto entry = m_deps.store->outboxEntry(bookId, uid);
49
6/6
✓ Branch 4 → 5 taken 21 times.
✓ Branch 4 → 9 taken 1 time.
✓ Branch 8 → 9 taken 3 times.
✓ Branch 8 → 10 taken 18 times.
✓ Branch 11 → 12 taken 4 times.
✓ Branch 11 → 13 taken 18 times.
 22 if (!entry || entry->state != QLatin1String("conflict"))
50 4 return inputs;
51
1/1
✓ Branch 13 → 14 taken 18 times.
 18 const auto card = m_deps.store->card(bookId, uid);
52 18 inputs.valid = true;
53 18 inputs.server = entry->serverRaw;
54 18 inputs.serverEtag = entry->serverEtag;
55 18 inputs.operation = entry->operation;
56 18 inputs.fields = entry->conflictFields;
57
2/2
✓ Branch 23 → 24 taken 16 times.
✓ Branch 23 → 26 taken 2 times.
 18 inputs.local = card ? card->raw : QString();
58
2/2
✓ Branch 30 → 31 taken 16 times.
✓ Branch 30 → 33 taken 2 times.
 18 inputs.base = card ? card->baseRaw : entry->baseRaw;
59
2/2
✓ Branch 38 → 39 taken 2 times.
✓ Branch 38 → 48 taken 16 times.
 18 if (entry->conflictFields.contains(kMoved))
60
2/3
✓ Branch 40 → 41 taken 2 times.
✓ Branch 42 → 43 taken 2 times.
✗ Branch 42 → 46 not taken.
 2 if (const auto source = moveSourceOf(*entry)) {
61 2 inputs.movedFrom = source->bookId;
62 2 inputs.base = source->baseRaw;
63 2 }
64 18 return inputs;
65 22 }
66
67 18 void ContactOutbox::recordHistory(qint64 bookId, const QString &uid, const QString &keptSide,
68 const QString &losingText) {
69
2/2
✓ Branch 3 → 4 taken 3 times.
✓ Branch 3 → 5 taken 15 times.
 18 if (losingText.isEmpty())
70 3 return;
71 15 ConflictHistory::Entry history;
72
1/1
✓ Branch 5 → 6 taken 15 times.
 15 history.collection = QString::number(bookId);
73 15 history.uid = uid;
74 15 history.component = QStringLiteral("VCARD");
75
1/1
✓ Branch 15 → 16 taken 15 times.
 15 ContactCard parsed;
76
5/8
✓ Branch 16 → 17 taken 15 times.
✓ Branch 18 → 19 taken 15 times.
✗ Branch 18 → 23 not taken.
✓ Branch 20 → 21 taken 15 times.
✓ Branch 21 → 22 taken 15 times.
✗ Branch 21 → 23 not taken.
✓ Branch 24 → 25 taken 15 times.
✗ Branch 24 → 26 not taken.
 15 if (const auto card = m_deps.store->card(bookId, uid); card && VCardCodec::parse(card->raw, &parsed))
77 15 history.title = parsed.formattedName;
78 15 history.keptSide = keptSide;
79 15 history.losingText = losingText;
80
2/2
✓ Branch 29 → 30 taken 15 times.
✓ Branch 30 → 31 taken 15 times.
 15 m_deps.store->addConflictHistory(history, m_deps.now());
81 15 }
82
83 8 bool ContactOutbox::resolveWith(qint64 bookId, const QString &uid, const QString &resolved,
84 const QString &serverEtag, const QString &keptSide) {
85 8 ContactStore *store = m_deps.store;
86
1/1
✓ Branch 2 → 3 taken 8 times.
 8 auto entry = store->outboxEntry(bookId, uid);
87
5/6
✓ Branch 4 → 5 taken 7 times.
✓ Branch 4 → 9 taken 1 time.
✗ Branch 8 → 9 not taken.
✓ Branch 8 → 10 taken 7 times.
✓ Branch 11 → 12 taken 1 time.
✓ Branch 11 → 13 taken 7 times.
 8 if (!entry || entry->state != QLatin1String("conflict"))
88 1 return false;
89
2/2
✓ Branch 15 → 16 taken 1 time.
✓ Branch 15 → 27 taken 6 times.
 7 if (entry->serverEtag != serverEtag) {
90
5/5
✓ Branch 16 → 17 taken 1 time.
✓ Branch 20 → 21 taken 1 time.
✓ Branch 21 → 22 taken 1 time.
✓ Branch 25 → 18 taken 1 time.
✓ Branch 25 → 26 taken 1 time.
 2 qCInfo(lcConflict) << "contact resolution refused: the server version changed meanwhile";
91 1 return false;
92 }
93
3/3
✓ Branch 27 → 28 taken 6 times.
✓ Branch 28 → 29 taken 1 time.
✓ Branch 28 → 40 taken 5 times.
 6 if (!readable(resolved)) {
94
5/5
✓ Branch 29 → 30 taken 1 time.
✓ Branch 33 → 34 taken 1 time.
✓ Branch 34 → 35 taken 1 time.
✓ Branch 38 → 31 taken 1 time.
✓ Branch 38 → 39 taken 1 time.
 2 qCWarning(lcConflict) << "contact resolution refused: the result cannot be read";
95 1 return false;
96 }
97 5 const bool moved = entry->conflictFields.contains(kMoved);
98
1/1
✓ Branch 42 → 43 taken 5 times.
 5 auto card = store->card(bookId, uid);
99
2/2
✓ Branch 44 → 45 taken 4 times.
✓ Branch 44 → 47 taken 1 time.
 5 const QString before = card ? card->raw : QString();
100 5 StoredCard stored = card.value_or(StoredCard{});
101
2/2
✓ Branch 51 → 52 taken 1 time.
✓ Branch 51 → 55 taken 4 times.
 5 if (!card) {
102 // Deleted here, changed on the server: the resolution restores it.
103 1 stored.bookId = bookId;
104 1 stored.uid = uid;
105 1 stored.href = entry->href;
106 }
107 5 stored.raw = resolved;
108
5/6
✓ Branch 56 → 57 taken 4 times.
✓ Branch 56 → 61 taken 1 time.
✓ Branch 59 → 60 taken 4 times.
✗ Branch 59 → 61 not taken.
✓ Branch 62 → 63 taken 4 times.
✓ Branch 62 → 66 taken 1 time.
 5 if (!moved && !entry->serverRaw.isEmpty()) {
109 // The server version the user resolved against is the new merge base.
110 4 stored.baseRaw = entry->serverRaw;
111 4 stored.etag = serverEtag;
112 }
113 5 stored.syncState = QStringLiteral("pending");
114
2/3
✓ Branch 72 → 73 taken 5 times.
✗ Branch 73 → 74 not taken.
✓ Branch 73 → 75 taken 5 times.
 5 if (!store->putCard(stored))
115 ✗ return false;
116 5 entry->operation = QStringLiteral("put");
117 5 entry->state = QStringLiteral("pending");
118
3/4
✓ Branch 89 → 90 taken 1 time.
✓ Branch 89 → 92 taken 4 times.
✗ Branch 94 → 95 not taken.
✓ Branch 94 → 96 taken 4 times.
 5 entry->baseEtag = moved ? entry->baseEtag : (entry->serverRaw.isEmpty() ? QString() : serverEtag);
119 5 entry->revision += 1;
120 5 entry->attempts = 0;
121 5 entry->nextAttempt = 0;
122
1/1
✓ Branch 104 → 105 taken 5 times.
 5 entry->conflictFields.clear();
123 5 entry->serverRaw.clear();
124 5 entry->serverEtag.clear();
125
1/1
✓ Branch 110 → 111 taken 5 times.
 5 store->updateOutbox(*entry);
126
1/1
✓ Branch 111 → 112 taken 5 times.
 5 recordHistory(bookId, uid, keptSide, before);
127
9/9
✓ Branch 112 → 113 taken 5 times.
✓ Branch 116 → 117 taken 5 times.
✓ Branch 117 → 118 taken 5 times.
✓ Branch 118 → 119 taken 5 times.
✓ Branch 119 → 120 taken 5 times.
✓ Branch 120 → 121 taken 5 times.
✓ Branch 121 → 122 taken 5 times.
✓ Branch 130 → 114 taken 5 times.
✓ Branch 130 → 131 taken 5 times.
 10 qCInfo(lcConflict) << "contact conflict resolved, kept" << keptSide << "result" << hashOf(resolved)
128
3/3
✓ Branch 122 → 123 taken 1 time.
✓ Branch 122 → 124 taken 4 times.
✓ Branch 125 → 126 taken 5 times.
 5 << (moved ? "(move)" : "");
129
3/5
✓ Branch 133 → 134 taken 5 times.
✓ Branch 136 → 137 taken 5 times.
✓ Branch 136 → 138 taken 5 times.
✗ Branch 170 → 171 not taken.
✗ Branch 170 → 172 not taken.
 10 changed({key(bookId, uid)});
130
2/2
✓ Branch 138 → 139 taken 5 times.
✓ Branch 139 → 140 taken 5 times.
 5 emit statusMessage(tr("Your choices will be saved on the server."));
131
1/1
✓ Branch 141 → 142 taken 5 times.
 5 flush(true);
132 5 return true;
133 13 }
134
135 4 void ContactOutbox::mergeMovedCard(const ContactOutboxEntry &entry, const QString &theirs, const QString &etag) {
136 4 ContactStore *store = m_deps.store;
137
1/1
✓ Branch 2 → 3 taken 4 times.
 4 finishInFlight(entry);
138 4 std::optional<StoredCard> target;
139
5/5
✓ Branch 3 → 4 taken 4 times.
✓ Branch 4 → 5 taken 4 times.
✓ Branch 5 → 6 taken 4 times.
✓ Branch 21 → 7 taken 3 times.
✓ Branch 21 → 22 taken 1 time.
 4 for (const qint64 bookId : store->booksWithCard(entry.uid))
140
5/11
✓ Branch 8 → 9 taken 3 times.
✗ Branch 8 → 14 not taken.
✓ Branch 9 → 10 taken 3 times.
✓ Branch 12 → 13 taken 3 times.
✗ Branch 12 → 14 not taken.
✓ Branch 15 → 16 taken 3 times.
✗ Branch 15 → 17 not taken.
✓ Branch 17 → 18 taken 3 times.
✗ Branch 17 → 19 not taken.
✗ Branch 206 → 207 not taken.
✗ Branch 206 → 208 not taken.
 3 if (bookId != entry.bookId && (target = store->card(bookId, entry.uid)))
141 4 break;
142
5/6
✓ Branch 24 → 25 taken 3 times.
✓ Branch 24 → 27 taken 1 time.
✗ Branch 26 → 27 not taken.
✓ Branch 26 → 28 taken 3 times.
✓ Branch 29 → 30 taken 1 time.
✓ Branch 29 → 41 taken 3 times.
 4 if (!target || entry.baseRaw.isEmpty()) {
143
3/5
✓ Branch 34 → 35 taken 1 time.
✓ Branch 37 → 38 taken 1 time.
✓ Branch 37 → 39 taken 1 time.
✗ Branch 216 → 217 not taken.
✗ Branch 216 → 218 not taken.
 2 markConflict(entry, theirs, etag, {QStringLiteral("changed")});
144 1 return;
145 }
146
1/1
✓ Branch 42 → 43 taken 3 times.
 3 const VCardMerge::Result merged = VCardMerge::merge(entry.baseRaw, target->raw, theirs);
147 // The source delete goes out with the version the merge saw.
148 3 ContactOutboxEntry source = entry;
149
2/3
✓ Branch 44 → 45 taken 3 times.
✓ Branch 46 → 47 taken 3 times.
✗ Branch 46 → 49 not taken.
 3 if (auto current = store->outboxEntry(entry.bookId, entry.uid))
150 3 source = *current;
151 3 source.baseEtag = etag;
152 3 source.attempts = 0;
153 3 source.nextAttempt = 0;
154
2/2
✓ Branch 51 → 52 taken 1 time.
✓ Branch 51 → 112 taken 2 times.
 3 if (merged.ok) {
155 1 source.baseRaw = theirs; // the base of a later change of the source
156
1/2
✓ Branch 55 → 56 taken 1 time.
✗ Branch 55 → 78 not taken.
 1 if (merged.merged != target->raw) {
157 1 StoredCard updated = *target;
158 1 updated.raw = merged.merged;
159 1 updated.syncState = QStringLiteral("pending");
160
1/1
✓ Branch 65 → 66 taken 1 time.
 1 store->putCard(updated);
161 // The old copy goes once the moved card holds the change (CB-11).
162 1 source.dependsOn =
163
1/1
✓ Branch 73 → 74 taken 1 time.
 2 store->enqueueOutbox(target->bookId, target->uid, QStringLiteral("put"), target->href, target->etag);
164 1 }
165
1/1
✓ Branch 78 → 79 taken 1 time.
 1 store->updateOutbox(source);
166
1/1
✓ Branch 85 → 86 taken 1 time.
 2 recordHistory(target->bookId, target->uid, QStringLiteral("combined"), target->raw);
167
5/5
✓ Branch 88 → 89 taken 1 time.
✓ Branch 92 → 93 taken 1 time.
✓ Branch 93 → 94 taken 1 time.
✓ Branch 97 → 90 taken 1 time.
✓ Branch 97 → 98 taken 1 time.
 2 qCInfo(lcConflict) << "moved card: the source's server change was combined into the moved card";
168
3/5
✓ Branch 102 → 103 taken 1 time.
✓ Branch 105 → 106 taken 1 time.
✓ Branch 105 → 107 taken 1 time.
✗ Branch 253 → 254 not taken.
✗ Branch 253 → 255 not taken.
 3 changed({key(target->bookId, target->uid)});
169
2/2
✓ Branch 107 → 108 taken 1 time.
✓ Branch 108 → 109 taken 1 time.
 1 emit statusMessage(tr("The contact was moved; a change made in its old address book was combined into it."));
170
1/1
✓ Branch 110 → 111 taken 1 time.
 1 flush(true);
171 1 return;
172 }
173 // Overlap: the question is asked on the moved card (D-22); the source
174 // delete waits for it.
175 const qint64 targetEntry =
176
1/1
✓ Branch 119 → 120 taken 2 times.
 4 store->enqueueOutbox(target->bookId, target->uid, QStringLiteral("put"), target->href, target->etag);
177
2/3
✓ Branch 124 → 125 taken 2 times.
✓ Branch 126 → 127 taken 2 times.
✗ Branch 126 → 167 not taken.
 2 if (auto current = store->outboxEntry(target->bookId, target->uid)) {
178 2 current->state = QStringLiteral("conflict");
179 2 current->serverRaw = theirs;
180 2 current->serverEtag = etag;
181
3/14
✗ Branch 139 → 140 not taken.
✓ Branch 139 → 144 taken 2 times.
✗ Branch 148 → 149 not taken.
✓ Branch 148 → 152 taken 2 times.
✗ Branch 150 → 151 not taken.
✗ Branch 150 → 152 not taken.
✗ Branch 152 → 153 not taken.
✓ Branch 152 → 154 taken 2 times.
✗ Branch 272 → 273 not taken.
✗ Branch 272 → 276 not taken.
✗ Branch 274 → 275 not taken.
✗ Branch 274 → 276 not taken.
✗ Branch 278 → 279 not taken.
✗ Branch 278 → 280 not taken.
 2 current->conflictFields = merged.conflicts.isEmpty() ? QStringList{QStringLiteral("unreadable")} : merged.conflicts;
182
1/1
✓ Branch 155 → 156 taken 2 times.
 2 current->conflictFields.append(kMoved);
183
1/1
✓ Branch 157 → 158 taken 2 times.
 2 store->updateOutbox(*current);
184
1/1
✓ Branch 163 → 164 taken 2 times.
 4 store->setSyncState(target->bookId, target->uid, QStringLiteral("conflict"));
185 2 }
186 2 source.dependsOn = targetEntry; // the conflict's base stays the old version
187
1/1
✓ Branch 168 → 169 taken 2 times.
 2 store->updateOutbox(source);
188
5/5
✓ Branch 169 → 170 taken 2 times.
✓ Branch 173 → 174 taken 2 times.
✓ Branch 174 → 175 taken 2 times.
✓ Branch 178 → 171 taken 2 times.
✓ Branch 178 → 179 taken 2 times.
 4 qCWarning(lcConflict) << "moved card: overlapping changes in the old book; asking on the moved card";
189
3/5
✓ Branch 183 → 184 taken 2 times.
✓ Branch 186 → 187 taken 2 times.
✓ Branch 186 → 188 taken 2 times.
✗ Branch 306 → 307 not taken.
✗ Branch 306 → 308 not taken.
 6 changed({key(target->bookId, target->uid)});
190
2/2
✓ Branch 188 → 189 taken 2 times.
✓ Branch 189 → 190 taken 2 times.
 2 emit statusMessage(tr("The contact was moved, and the same details were changed in its old address book. Open it to choose."));
191 14 }
192
193 24 void ContactOutbox::refreshConflict(qint64 bookId, const QString &uid) {
194
1/1
✓ Branch 2 → 3 taken 24 times.
 24 const auto entry = m_deps.store->outboxEntry(bookId, uid);
195
5/6
✓ Branch 4 → 5 taken 24 times.
✗ Branch 4 → 9 not taken.
✓ Branch 8 → 9 taken 1 time.
✓ Branch 8 → 10 taken 23 times.
✓ Branch 11 → 12 taken 1 time.
✓ Branch 11 → 13 taken 23 times.
 24 if (!entry || entry->state != QLatin1String("conflict"))
196 1 return;
197
3/3
✓ Branch 13 → 14 taken 23 times.
✓ Branch 16 → 17 taken 2 times.
✓ Branch 16 → 21 taken 21 times.
 23 if (m_inFlight.contains(key(bookId, uid))) {
198
2/2
✓ Branch 17 → 18 taken 2 times.
✓ Branch 18 → 19 taken 2 times.
 2 m_refreshAgain.insert(key(bookId, uid)); // checked again when this one answers
199 2 return;
200 }
201
6/7
✓ Branch 22 → 23 taken 21 times.
✗ Branch 22 → 26 not taken.
✓ Branch 23 → 24 taken 21 times.
✓ Branch 24 → 25 taken 3 times.
✓ Branch 24 → 26 taken 18 times.
✓ Branch 27 → 28 taken 3 times.
✓ Branch 27 → 29 taken 18 times.
 21 if (m_deps.networkAllowed && !m_deps.networkAllowed())
202 3 return;
203 18 ContactOutboxEntry shown = *entry;
204
2/2
✓ Branch 33 → 34 taken 1 time.
✓ Branch 33 → 42 taken 17 times.
 18 if (entry->conflictFields.contains(kMoved))
205
2/3
✓ Branch 35 → 36 taken 1 time.
✓ Branch 37 → 38 taken 1 time.
✗ Branch 37 → 40 not taken.
 1 if (const auto source = moveSourceOf(*entry))
206 1 shown = *source;
207
1/1
✓ Branch 42 → 43 taken 18 times.
 18 const auto book = m_deps.store->book(shown.bookId);
208
4/8
✓ Branch 44 → 45 taken 18 times.
✗ Branch 44 → 50 not taken.
✓ Branch 47 → 48 taken 18 times.
✗ Branch 47 → 50 not taken.
✗ Branch 49 → 50 not taken.
✓ Branch 49 → 51 taken 18 times.
✗ Branch 52 → 53 not taken.
✓ Branch 52 → 54 taken 18 times.
 18 if (!book || book->isLocal() || shown.href.isEmpty())
209 ✗ return;
210
1/1
✓ Branch 54 → 55 taken 18 times.
 18 QPointer<ContactOutbox> guard(this);
211
2/2
✓ Branch 55 → 56 taken 18 times.
✓ Branch 56 → 57 taken 18 times.
 18 m_inFlight.insert(key(bookId, uid));
212 18 const ContactOutboxEntry current = *entry;
213
2/6
✓ Branch 63 → 64 taken 18 times.
✓ Branch 65 → 66 taken 18 times.
✗ Branch 99 → 100 not taken.
✗ Branch 99 → 101 not taken.
✗ Branch 102 → 103 not taken.
✗ Branch 102 → 104 not taken.
 18 m_deps.endpoint(this, book->accountId, [guard, shown, current](std::optional<Endpoint> endpoint) {
214
1/2
✗ Branch 3 → 4 not taken.
✓ Branch 3 → 5 taken 18 times.
 18 if (!guard)
215 4 return;
216
2/2
✓ Branch 6 → 7 taken 2 times.
✓ Branch 6 → 10 taken 16 times.
 18 if (!endpoint) {
217
1/1
✓ Branch 8 → 9 taken 2 times.
 2 guard->finishInFlight(current);
218 2 return;
219 }
220
1/1
✓ Branch 15 → 16 taken 16 times.
 32 CardDavClient *client = guard->m_deps.makeClient(endpoint->serverUrl, endpoint->username,
221
1/1
✓ Branch 12 → 13 taken 16 times.
 32 QString::fromUtf8(endpoint->password));
222
1/1
✓ Branch 18 → 19 taken 16 times.
 16 SecureUtil::zeroMemory(endpoint->password);
223
2/2
✓ Branch 19 → 20 taken 2 times.
✓ Branch 19 → 23 taken 14 times.
 16 if (!client) {
224
1/1
✓ Branch 21 → 22 taken 2 times.
 2 guard->finishInFlight(current);
225 2 return;
226 }
227
1/1
✓ Branch 24 → 25 taken 14 times.
 14 client->setParent(guard);
228
1/1
✓ Branch 25 → 26 taken 14 times.
 14 const quint64 request = client->getResource(shown.href);
229
5/5
✓ Branch 26 → 27 taken 14 times.
✓ Branch 30 → 31 taken 14 times.
✓ Branch 31 → 32 taken 14 times.
✓ Branch 35 → 28 taken 14 times.
✓ Branch 35 → 36 taken 14 times.
 28 qCInfo(lcConflict) << "checking the server version of a contact conflict again";
230
1/1
✓ Branch 36 → 37 taken 14 times.
 14 auto connection = std::make_shared<QMetaObject::Connection>();
231
1/1
✓ Branch 42 → 43 taken 14 times.
 28 *connection = QObject::connect(client, &CardDavClient::resourceResponse, guard,
232
0/8
✗ Branch 61 → 62 not taken.
✗ Branch 61 → 63 not taken.
✗ Branch 64 → 65 not taken.
✗ Branch 64 → 66 not taken.
✗ Branch 67 → 68 not taken.
✗ Branch 67 → 69 not taken.
✗ Branch 70 → 71 not taken.
✗ Branch 70 → 72 not taken.
 28 [guard, connection, request, shown, current, client](const DavResponse &response) {
233
3/6
✓ Branch 2 → 3 taken 9 times.
✗ Branch 2 → 5 not taken.
✗ Branch 4 → 5 not taken.
✓ Branch 4 → 6 taken 9 times.
✗ Branch 7 → 8 not taken.
✓ Branch 7 → 9 taken 9 times.
 9 if (response.request != request || !guard)
234 8 return;
235
1/1
✓ Branch 10 → 11 taken 9 times.
 9 QObject::disconnect(*connection);
236
1/1
✓ Branch 11 → 12 taken 9 times.
 9 client->deleteLater();
237
1/1
✓ Branch 13 → 14 taken 9 times.
 9 guard->finishInFlight(current);
238
4/4
✓ Branch 15 → 16 taken 9 times.
✓ Branch 16 → 17 taken 9 times.
✓ Branch 18 → 19 taken 2 times.
✓ Branch 18 → 25 taken 7 times.
 9 if (guard->m_refreshAgain.remove(key(current.bookId, current.uid)))
239
1/3
✓ Branch 22 → 23 taken 2 times.
✗ Branch 103 → 104 not taken.
✗ Branch 103 → 105 not taken.
 2 QTimer::singleShot(0, guard, [guard, current] {
240
1/2
✓ Branch 3 → 4 taken 2 times.
✗ Branch 3 → 6 not taken.
 2 if (guard)
241 2 guard->refreshConflict(current.bookId, current.uid);
242 2 });
243 // Resolved (or edited) while the check ran: the answer belongs to
244 // a conflict that no longer exists, and the push the resolution
245 // queued was held back by this check — send it now.
246
1/1
✓ Branch 26 → 27 taken 9 times.
 9 const auto now = guard->m_deps.store->outboxEntry(current.bookId, current.uid);
247
7/8
✓ Branch 28 → 29 taken 8 times.
✓ Branch 28 → 35 taken 1 time.
✓ Branch 32 → 33 taken 5 times.
✓ Branch 32 → 35 taken 3 times.
✗ Branch 34 → 35 not taken.
✓ Branch 34 → 36 taken 5 times.
✓ Branch 37 → 38 taken 4 times.
✓ Branch 37 → 41 taken 5 times.
 9 if (!now || now->state != QLatin1String("conflict") || now->revision != current.revision) {
248
1/1
✓ Branch 39 → 40 taken 4 times.
 4 guard->flush(true);
249 4 return;
250 }
251
6/6
✓ Branch 41 → 42 taken 4 times.
✓ Branch 41 → 45 taken 1 time.
✓ Branch 43 → 44 taken 2 times.
✓ Branch 43 → 45 taken 2 times.
✓ Branch 46 → 47 taken 2 times.
✓ Branch 46 → 48 taken 3 times.
 5 if (response.status == 200 && response.etag == current.serverEtag)
252 2 return; // unchanged
253
4/6
✓ Branch 50 → 51 taken 1 time.
✓ Branch 50 → 54 taken 2 times.
✗ Branch 51 → 52 not taken.
✓ Branch 51 → 54 taken 1 time.
✗ Branch 55 → 56 not taken.
✓ Branch 55 → 63 taken 3 times.
 3 if (shown.operation == QLatin1String("delete") && shown.dependsOn != 0 &&
254 ✗ shown.bookId != current.bookId) {
255 ✗ if (response.status == 200)
256 ✗ guard->mergeMovedCard(shown, QString::fromUtf8(response.body), response.etag);
257 ✗ return;
258 }
259
5/6
✓ Branch 63 → 64 taken 1 time.
✓ Branch 63 → 67 taken 2 times.
✓ Branch 65 → 66 taken 1 time.
✗ Branch 65 → 67 not taken.
✓ Branch 68 → 69 taken 1 time.
✓ Branch 68 → 70 taken 2 times.
 3 if (response.status == 404 && current.serverRaw.isEmpty())
260 1 return; // still deleted
261
2/2
✓ Branch 72 → 73 taken 1 time.
✓ Branch 72 → 89 taken 1 time.
 2 if (current.operation == QLatin1String("delete")) {
262
1/2
✓ Branch 73 → 74 taken 1 time.
✗ Branch 73 → 88 not taken.
 1 if (response.status == 200)
263
4/6
✓ Branch 79 → 80 taken 1 time.
✓ Branch 80 → 81 taken 1 time.
✓ Branch 84 → 85 taken 1 time.
✓ Branch 84 → 86 taken 1 time.
✗ Branch 116 → 117 not taken.
✗ Branch 116 → 118 not taken.
 3 guard->markConflict(current, QString::fromUtf8(response.body), response.etag,
264 1 {QStringLiteral("changed")});
265 1 return;
266 }
267
1/1
✓ Branch 90 → 91 taken 1 time.
 1 guard->onServerVersion(current, response);
268
3/7
✓ Branch 78 → 79 taken 1 time.
✓ Branch 93 → 94 taken 1 time.
✓ Branch 93 → 96 taken 8 times.
✗ Branch 122 → 123 not taken.
✗ Branch 122 → 126 not taken.
✗ Branch 124 → 125 not taken.
✗ Branch 124 → 126 not taken.
 25 });
269 14 });
270 24 }
271
272 3 bool ContactOutbox::restoreFromHistory(qint64 historyId) {
273 3 ContactStore *store = m_deps.store;
274
1/1
✓ Branch 2 → 3 taken 3 times.
 3 const auto history = store->conflictHistoryEntry(historyId);
275
7/9
✓ Branch 4 → 5 taken 2 times.
✓ Branch 4 → 12 taken 1 time.
✓ Branch 8 → 9 taken 2 times.
✗ Branch 8 → 12 not taken.
✓ Branch 10 → 11 taken 2 times.
✗ Branch 11 → 12 not taken.
✓ Branch 11 → 13 taken 2 times.
✓ Branch 14 → 15 taken 1 time.
✓ Branch 14 → 16 taken 2 times.
 3 if (!history || history->component != QLatin1String("VCARD") || !readable(history->losingText))
276 1 return false;
277
1/1
✓ Branch 17 → 18 taken 2 times.
 2 const qint64 bookId = history->collection.toLongLong();
278 2 bool ok = false;
279
3/3
✓ Branch 19 → 20 taken 2 times.
✓ Branch 22 → 23 taken 1 time.
✓ Branch 22 → 27 taken 1 time.
 2 if (store->card(bookId, history->uid)) {
280
1/1
✓ Branch 25 → 26 taken 1 time.
 1 ok = replaceRaw(bookId, history->uid, history->losingText);
281 } else {
282 1 StoredCard card;
283 1 card.bookId = bookId;
284 1 card.uid = history->uid;
285 1 card.raw = history->losingText;
286
1/1
✓ Branch 31 → 32 taken 1 time.
 1 ok = restoreCard(card);
287 1 }
288
1/2
✗ Branch 34 → 35 not taken.
✓ Branch 34 → 36 taken 2 times.
 2 if (!ok)
289 ✗ return false;
290
1/1
✓ Branch 36 → 37 taken 2 times.
 2 store->removeConflictHistory(historyId);
291
5/5
✓ Branch 37 → 38 taken 2 times.
✓ Branch 41 → 42 taken 2 times.
✓ Branch 42 → 43 taken 2 times.
✓ Branch 46 → 39 taken 2 times.
✓ Branch 46 → 47 taken 2 times.
 4 qCInfo(lcConflict) << "restored the contact version a resolution replaced";
292
2/2
✓ Branch 47 → 48 taken 2 times.
✓ Branch 48 → 49 taken 2 times.
 2 emit statusMessage(tr("The earlier version was restored."));
293 2 return true;
294 3 }
295