From 6d7221ade756682bd48b5334fbaef84cefed948a Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Fri, 30 Mar 2018 18:25:00 +0200 Subject: The resource has been renamed --- docker/setupkolabnowtest.sh | 2 +- framework/src/domain/settings/accountsettings.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/setupkolabnowtest.sh b/docker/setupkolabnowtest.sh index 0438ced2..b0d53281 100755 --- a/docker/setupkolabnowtest.sh +++ b/docker/setupkolabnowtest.sh @@ -1,5 +1,5 @@ sinksh create account type kolabnow identifier kolabnowAccount name KolabnowAccount sinksh create resource type sink.imap identifier kolabnowImap account kolabnowAccount server imaps://imap.kolabnow.com:993 username test1@kolab.org password Welcome2KolabSystems sinksh create resource type sink.mailtransport identifier kolabnowSmtp account kolabnowAccount server smtps://smtp.kolabnow.com:587 username test1@kolab.org password Welcome2KolabSystems -sinksh create resource type sink.dav identifier kolabnowDav account kolabnowAccount server https://apps.kolabnow.com/addressbooks/test1%40kolab.org username test1@kolab.org password Welcome2KolabSystems +sinksh create resource type sink.carddav identifier kolabnowDav account kolabnowAccount server https://apps.kolabnow.com/addressbooks/test1%40kolab.org username test1@kolab.org password Welcome2KolabSystems sinksh create identity name "John Doe" address test1@kolab.org account kolabnowAccount diff --git a/framework/src/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp index a75d5e07..9cd41518 100644 --- a/framework/src/domain/settings/accountsettings.cpp +++ b/framework/src/domain/settings/accountsettings.cpp @@ -242,7 +242,7 @@ void AccountSettings::loadIdentity() void AccountSettings::loadCardDavResource() { - Store::fetchOne(Query().filter(mAccountIdentifier).filter("sink.dav")) + Store::fetchOne(Query().filter(mAccountIdentifier).filter("sink.carddav")) .then([this](const SinkResource &resource) { mCardDavIdentifier = resource.identifier(); mCardDavServer = resource.getProperty("server").toString(); -- cgit v1.2.3