From 393b6d51280b687a5283112b7a3305d8afa87265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20S=C3=A1ez?= Date: Tue, 14 Jul 2015 17:19:55 +0200 Subject: [PATCH] oc-folder: simplify lookupFolder method use activate and no need to set wocontext, it's already set properly --- OpenChange/MAPIStoreFolder.m | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/OpenChange/MAPIStoreFolder.m b/OpenChange/MAPIStoreFolder.m index 240652e5c..0e2652ff8 100644 --- a/OpenChange/MAPIStoreFolder.m +++ b/OpenChange/MAPIStoreFolder.m @@ -231,30 +231,19 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe - (id) lookupFolder: (NSString *) folderKey { - MAPIStoreFolder *childFolder; + MAPIStoreFolder *childFolder = nil; SOGoFolder *sogoFolder; - WOContext *woContext; - childFolder = nil; if ([[self folderKeys] containsObject: folderKey]) { - woContext = [[self userContext] woContext]; - /* We activate the user for the context using the root folder - context as there are times where the active user is not - matching with the one stored in the application context - and SOGo object is storing cached data with the wrong user */ - [[self userContext] activateWithUser: [woContext activeUser]]; - sogoFolder = [sogoObject lookupName: folderKey inContext: woContext + [[self userContext] activate]; + sogoFolder = [sogoObject lookupName: folderKey + inContext: nil acquire: NO]; if (sogoFolder && ![sogoFolder isKindOfClass: NSExceptionK]) - { - [sogoFolder setContext: woContext]; - childFolder = [isa mapiStoreObjectWithSOGoObject: sogoFolder - inContainer: self]; - } + childFolder = [isa mapiStoreObjectWithSOGoObject: sogoFolder + inContainer: self]; } - else - childFolder = nil; return childFolder; }