summaryrefslogtreecommitdiffstats
path: root/framework/src/domain/settings/accountsettings.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'framework/src/domain/settings/accountsettings.cpp')
-rw-r--r--framework/src/domain/settings/accountsettings.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/framework/src/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp
index 793b05fa..594c3391 100644
--- a/framework/src/domain/settings/accountsettings.cpp
+++ b/framework/src/domain/settings/accountsettings.cpp
@@ -156,7 +156,7 @@ void AccountSettings::saveAccount()
156 .onError([](const KAsync::Error &error) { 156 .onError([](const KAsync::Error &error) {
157 qWarning() << "Error while creating account: " << error.errorMessage;; 157 qWarning() << "Error while creating account: " << error.errorMessage;;
158 }) 158 })
159 .exec(); 159 .exec().waitForFinished();
160 } else { 160 } else {
161 qDebug() << "Saving account " << mAccountIdentifier << mMailtransportIdentifier; 161 qDebug() << "Saving account " << mAccountIdentifier << mMailtransportIdentifier;
162 Q_ASSERT(!mAccountIdentifier.isEmpty()); 162 Q_ASSERT(!mAccountIdentifier.isEmpty());
@@ -169,7 +169,7 @@ void AccountSettings::saveAccount()
169 .onError([](const KAsync::Error &error) { 169 .onError([](const KAsync::Error &error) {
170 qWarning() << "Error while creating account: " << error.errorMessage;; 170 qWarning() << "Error while creating account: " << error.errorMessage;;
171 }) 171 })
172 .exec(); 172 .exec().waitForFinished();
173 } 173 }
174} 174}
175 175
@@ -182,7 +182,7 @@ void AccountSettings::loadAccount()
182 mIcon = account.getIcon(); 182 mIcon = account.getIcon();
183 mName = account.getName(); 183 mName = account.getName();
184 emit changed(); 184 emit changed();
185 }).exec(); 185 }).exec().waitForFinished();
186} 186}
187 187
188void AccountSettings::loadImapResource() 188void AccountSettings::loadImapResource()
@@ -196,7 +196,7 @@ void AccountSettings::loadImapResource()
196 emit imapResourceChanged(); 196 emit imapResourceChanged();
197 }).onError([](const KAsync::Error &error) { 197 }).onError([](const KAsync::Error &error) {
198 qWarning() << "Failed to find the imap resource: " << error.errorMessage; 198 qWarning() << "Failed to find the imap resource: " << error.errorMessage;
199 }).exec(); 199 }).exec().waitForFinished();
200} 200}
201 201
202void AccountSettings::loadMaildirResource() 202void AccountSettings::loadMaildirResource()
@@ -211,7 +211,7 @@ void AccountSettings::loadMaildirResource()
211 } 211 }
212 }).onError([](const KAsync::Error &error) { 212 }).onError([](const KAsync::Error &error) {
213 SinkWarning() << "Failed to find the maildir resource: " << error.errorMessage; 213 SinkWarning() << "Failed to find the maildir resource: " << error.errorMessage;
214 }).exec(); 214 }).exec().waitForFinished();
215} 215}
216 216
217void AccountSettings::loadMailtransportResource() 217void AccountSettings::loadMailtransportResource()
@@ -225,7 +225,7 @@ void AccountSettings::loadMailtransportResource()
225 emit smtpResourceChanged(); 225 emit smtpResourceChanged();
226 }).onError([](const KAsync::Error &error) { 226 }).onError([](const KAsync::Error &error) {
227 SinkWarning() << "Failed to find the smtp resource: " << error.errorMessage; 227 SinkWarning() << "Failed to find the smtp resource: " << error.errorMessage;
228 }).exec(); 228 }).exec().waitForFinished();
229} 229}
230 230
231void AccountSettings::loadIdentity() 231void AccountSettings::loadIdentity()
@@ -239,7 +239,7 @@ void AccountSettings::loadIdentity()
239 emit identityChanged(); 239 emit identityChanged();
240 }).onError([](const KAsync::Error &error) { 240 }).onError([](const KAsync::Error &error) {
241 SinkWarning() << "Failed to find the identity resource: " << error.errorMessage; 241 SinkWarning() << "Failed to find the identity resource: " << error.errorMessage;
242 }).exec(); 242 }).exec().waitForFinished();
243} 243}
244 244
245void AccountSettings::loadCardDavResource() 245void AccountSettings::loadCardDavResource()
@@ -253,7 +253,7 @@ void AccountSettings::loadCardDavResource()
253 emit cardDavResourceChanged(); 253 emit cardDavResourceChanged();
254 }).onError([](const KAsync::Error &error) { 254 }).onError([](const KAsync::Error &error) {
255 qWarning() << "Failed to find the CardDAV resource: " << error.errorMessage; 255 qWarning() << "Failed to find the CardDAV resource: " << error.errorMessage;
256 }).exec(); 256 }).exec().waitForFinished();
257} 257}
258 258
259 259
@@ -269,7 +269,7 @@ static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteA
269 .onError([](const KAsync::Error &error) { 269 .onError([](const KAsync::Error &error) {
270 SinkWarning() << "Error while modifying resource: " << error.errorMessage; 270 SinkWarning() << "Error while modifying resource: " << error.errorMessage;
271 }) 271 })
272 .exec(); 272 .exec().waitForFinished();
273 } else { 273 } else {
274 auto resource = ResourceType::create(accountIdentifier); 274 auto resource = ResourceType::create(accountIdentifier);
275 auto newIdentifier = resource.identifier(); 275 auto newIdentifier = resource.identifier();
@@ -280,7 +280,7 @@ static QByteArray saveResource(const QByteArray &accountIdentifier, const QByteA
280 .onError([](const KAsync::Error &error) { 280 .onError([](const KAsync::Error &error) {
281 SinkWarning() << "Error while creating resource: " << error.errorMessage; 281 SinkWarning() << "Error while creating resource: " << error.errorMessage;
282 }) 282 })
283 .exec(); 283 .exec().waitForFinished();
284 return newIdentifier; 284 return newIdentifier;
285 } 285 }
286 return identifier; 286 return identifier;
@@ -330,7 +330,7 @@ void AccountSettings::saveIdentity()
330 .onError([](const KAsync::Error &error) { 330 .onError([](const KAsync::Error &error) {
331 SinkWarning() << "Error while modifying identity: " << error.errorMessage; 331 SinkWarning() << "Error while modifying identity: " << error.errorMessage;
332 }) 332 })
333 .exec(); 333 .exec().waitForFinished();
334 } else { 334 } else {
335 auto identity = ApplicationDomainType::createEntity<Identity>(); 335 auto identity = ApplicationDomainType::createEntity<Identity>();
336 mIdentityIdentifier = identity.identifier(); 336 mIdentityIdentifier = identity.identifier();
@@ -341,7 +341,7 @@ void AccountSettings::saveIdentity()
341 .onError([](const KAsync::Error &error) { 341 .onError([](const KAsync::Error &error) {
342 SinkWarning() << "Error while creating identity: " << error.errorMessage; 342 SinkWarning() << "Error while creating identity: " << error.errorMessage;
343 }) 343 })
344 .exec(); 344 .exec().waitForFinished();
345 } 345 }
346} 346}
347 347
@@ -355,7 +355,7 @@ void AccountSettings::removeResource(const QByteArray &identifier)
355 .onError([](const KAsync::Error &error) { 355 .onError([](const KAsync::Error &error) {
356 SinkWarning() << "Error while removing resource: " << error.errorMessage; 356 SinkWarning() << "Error while removing resource: " << error.errorMessage;
357 }) 357 })
358 .exec(); 358 .exec().waitForFinished();
359 } 359 }
360} 360}
361 361
@@ -369,7 +369,7 @@ void AccountSettings::removeAccount()
369 .onError([](const KAsync::Error &error) { 369 .onError([](const KAsync::Error &error) {
370 SinkWarning() << "Error while removing account: " << error.errorMessage; 370 SinkWarning() << "Error while removing account: " << error.errorMessage;
371 }) 371 })
372 .exec(); 372 .exec().waitForFinished();
373 } 373 }
374} 374}
375 375
@@ -383,7 +383,7 @@ void AccountSettings::removeIdentity()
383 .onError([](const KAsync::Error &error) { 383 .onError([](const KAsync::Error &error) {
384 SinkWarning() << "Error while removing identity: " << error.errorMessage; 384 SinkWarning() << "Error while removing identity: " << error.errorMessage;
385 }) 385 })
386 .exec(); 386 .exec().waitForFinished();
387 } 387 }
388} 388}
389 389