[feature/localsearch] Local account-wide search using custom queries

ownCloud File Provider/FileProviderExtension.m

@@ -175,25 +175,44 @@ - (NSFileProviderItem)itemForIdentifier:(NSFileProviderItemIdentifier)identifier
 
 	OCSyncExec(itemRetrieval, {
 		// Resolve the given identifier to a record in the model
-		if ([identifier isEqual:NSFileProviderRootContainerItemIdentifier])
+		NSError *coreError = nil;
+		OCCore *core = [self coreWithError:&coreError];
+
+		if (core != nil)
 		{
-			// Root item
-			[self.core.vault.database retrieveCacheItemsAtPath:@"/" itemOnly:YES completionHandler:^(OCDatabase *db, NSError *error, OCSyncAnchor syncAnchor, NSArray<OCItem *> *items) {
-				item = items.firstObject;
-				returnError = error;
+			if (coreError != nil)
+			{
+				returnError = coreError;
+			}
+			else
+			{
+				if ([identifier isEqual:NSFileProviderRootContainerItemIdentifier])
+				{
+					// Root item
+					[self.core.vault.database retrieveCacheItemsAtPath:@"/" itemOnly:YES completionHandler:^(OCDatabase *db, NSError *error, OCSyncAnchor syncAnchor, NSArray<OCItem *> *items) {
+						item = items.firstObject;
+						returnError = error;
 
-				OCSyncExecDone(itemRetrieval);
-			}];
+						OCSyncExecDone(itemRetrieval);
+					}];
+				}
+				else
+				{
+					// Other item
+					[self.core retrieveItemFromDatabaseForLocalID:(OCLocalID)identifier completionHandler:^(NSError *error, OCSyncAnchor syncAnchor, OCItem *itemFromDatabase) {
+						item = itemFromDatabase;
+						returnError = error;
+
+						OCSyncExecDone(itemRetrieval);
+					}];
+				}
+			}
 		}
 		else
 		{
-			// Other item
-			[self.core retrieveItemFromDatabaseForLocalID:(OCLocalID)identifier completionHandler:^(NSError *error, OCSyncAnchor syncAnchor, OCItem *itemFromDatabase) {
-				item = itemFromDatabase;
-				returnError = error;
+			returnError = coreError;
 
-				OCSyncExecDone(itemRetrieval);
-			}];
+			OCSyncExecDone(itemRetrieval);
 		}
 	});
 
@@ -1001,11 +1020,17 @@ - (OCBookmark *)bookmark
 }
 
 - (OCCore *)core
+{
+	return ([self coreWithError:nil]);
+}
+
+- (OCCore *)coreWithError:(NSError **)outError
 {
 	OCLogDebug(@"FileProviderExtension[%p].core[enter]: _core=%p, bookmark=%@", self, _core, self.bookmark);
 
 	OCBookmark *bookmark = self.bookmark;
 	__block OCCore *retCore = nil;
+	__block NSError *retError = nil;
 
 	@synchronized(self)
 	{
@@ -1037,6 +1062,11 @@ - (OCCore *)core
 							retCore = self->_core;
 						}
 					}
+
+					if (error != nil)
+					{
+						retError = error;
+					}
 				} completionHandler:^(OCCore *core, NSError *error) {
 					if (!hasCore)
 					{
@@ -1052,6 +1082,12 @@ - (OCCore *)core
 						retCore = self->_core;
 					}
 
+					if (error != nil)
+					{
+						retError = error;
+						retCore = nil;
+					}
+
 					OCSyncExecDone(waitForCore);
 
 					if (hasCore)
@@ -1066,7 +1102,12 @@ - (OCCore *)core
 
 	if (retCore == nil)
 	{
-		OCLogError(@"Error getting core for domain %@ (UUID %@)", OCLogPrivate(self.domain.displayName), OCLogPrivate(self.domain.identifier));
+		OCLogError(@"Error getting core for domain %@ (UUID %@): %@", OCLogPrivate(self.domain.displayName), OCLogPrivate(self.domain.identifier), OCLogPrivate(retError));
+	}
+
+	if (outError != NULL)
+	{
+		*outError = retError;
 	}
 
 	OCLogDebug(@"FileProviderExtension[%p].core[leave]: _core=%p, bookmark=%@", self, retCore, bookmark);

ownCloud.xcodeproj/project.pbxproj

@@ -340,6 +340,8 @@
 		DC68057A212EAB5E006C3B1F /* ThemeCertificateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC680579212EAB5E006C3B1F /* ThemeCertificateViewController.swift */; };
 		DC6C68362574FD0400E46BD4 /* PLCrashReporter.LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = DC6C68352574FD0400E46BD4 /* PLCrashReporter.LICENSE */; };
 		DC6CF7FB219446050013B9F9 /* LogSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC6CF7FA219446050013B9F9 /* LogSettingsViewController.swift */; };
+		DC70398526128B89009F2DC1 /* NSString+ByteCountParser.h in Headers */ = {isa = PBXBuildFile; fileRef = DC70398326128B89009F2DC1 /* NSString+ByteCountParser.h */; };
+		DC70398626128B89009F2DC1 /* NSString+ByteCountParser.m in Sources */ = {isa = PBXBuildFile; fileRef = DC70398426128B89009F2DC1 /* NSString+ByteCountParser.m */; };
 		DC774E5F22F44E57000B11A1 /* ZIPArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = DC774E5D22F44E4A000B11A1 /* ZIPArchive.m */; };
 		DC774E6022F44E57000B11A1 /* ZIPArchive.h in Headers */ = {isa = PBXBuildFile; fileRef = DC774E5C22F44E4A000B11A1 /* ZIPArchive.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DC774E6322F44E6D000B11A1 /* OCCore+BundleImport.h in Headers */ = {isa = PBXBuildFile; fileRef = DC774E6122F44E6D000B11A1 /* OCCore+BundleImport.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -368,6 +370,9 @@
 		DCAEB06121F9FC510067E147 /* EarlGrey+Tools.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCAEB06021F9FC510067E147 /* EarlGrey+Tools.swift */; };
 		DCB2C05F250C1F9E001083CA /* BrandingClassSettingsSource.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB2C05D250C1F9E001083CA /* BrandingClassSettingsSource.h */; };
 		DCB2C061250C253C001083CA /* BrandingClassSettingsSource.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB2C05E250C1F9E001083CA /* BrandingClassSettingsSource.m */; };
+		DCB458ED2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.h in Headers */ = {isa = PBXBuildFile; fileRef = DCB458EB2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DCB458EE2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB458EC2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.m */; };
+		DCB459052604AD2A006A02AB /* SearchSegmentationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DCB459042604AD2A006A02AB /* SearchSegmentationTests.m */; };
 		DCB5D60B25FC14B6004C52D9 /* OCIssue+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB5D60A25FC14B6004C52D9 /* OCIssue+Extension.swift */; };
 		DCB6C4D72453A6CA00C1EAE1 /* ClientAuthenticationUpdater.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB6C4D62453A6CA00C1EAE1 /* ClientAuthenticationUpdater.swift */; };
 		DCB6C4DE24559B1600C1EAE1 /* ClientAuthenticationUpdaterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCB6C4DD24559B1600C1EAE1 /* ClientAuthenticationUpdaterViewController.swift */; };
@@ -399,6 +404,8 @@
 		DCC83304242CF3AD00153F8C /* AlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC83303242CF3AC00153F8C /* AlertViewController.swift */; };
 		DCC8535823CE1236007BA3EB /* LicenseInAppProductListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC8535723CE1236007BA3EB /* LicenseInAppProductListViewController.swift */; };
 		DCC8536023CE1AF8007BA3EB /* PurchasesSettingsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC8535F23CE1AF8007BA3EB /* PurchasesSettingsSection.swift */; };
+		DCCD77792604C91600098573 /* NSDate+ComputedTimes.h in Headers */ = {isa = PBXBuildFile; fileRef = DCCD776A2604C81B00098573 /* NSDate+ComputedTimes.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DCCD778C2604C91B00098573 /* NSDate+ComputedTimes.m in Sources */ = {isa = PBXBuildFile; fileRef = DCCD776B2604C81B00098573 /* NSDate+ComputedTimes.m */; };
 		DCD1300A23A191C000255779 /* LicenseOfferButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD1300923A191C000255779 /* LicenseOfferButton.swift */; };
 		DCD1301123A23F4E00255779 /* OCLicenseManager+AppStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD1301023A23F4E00255779 /* OCLicenseManager+AppStore.swift */; };
 		DCD2D40622F06ECA0071FB8F /* DataSettingsSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCD2D40522F06ECA0071FB8F /* DataSettingsSection.swift */; };
@@ -1287,6 +1294,8 @@
 		DC680579212EAB5E006C3B1F /* ThemeCertificateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeCertificateViewController.swift; sourceTree = "<group>"; };
 		DC6C68352574FD0400E46BD4 /* PLCrashReporter.LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = PLCrashReporter.LICENSE; sourceTree = "<group>"; };
 		DC6CF7FA219446050013B9F9 /* LogSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogSettingsViewController.swift; sourceTree = "<group>"; };
+		DC70398326128B89009F2DC1 /* NSString+ByteCountParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+ByteCountParser.h"; sourceTree = "<group>"; };
+		DC70398426128B89009F2DC1 /* NSString+ByteCountParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+ByteCountParser.m"; sourceTree = "<group>"; };
 		DC774E5C22F44E4A000B11A1 /* ZIPArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZIPArchive.h; sourceTree = "<group>"; };
 		DC774E5D22F44E4A000B11A1 /* ZIPArchive.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZIPArchive.m; sourceTree = "<group>"; };
 		DC774E6122F44E6D000B11A1 /* OCCore+BundleImport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "OCCore+BundleImport.h"; sourceTree = "<group>"; };
@@ -1331,6 +1340,9 @@
 		DCB44D7C2186F0F600DAA4CC /* ThemeStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThemeStyle.swift; sourceTree = "<group>"; };
 		DCB44D842186FEF700DAA4CC /* ThemeStyle+DefaultStyles.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ThemeStyle+DefaultStyles.swift"; sourceTree = "<group>"; };
 		DCB44D86218718BA00DAA4CC /* VendorServices.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VendorServices.swift; sourceTree = "<group>"; };
+		DCB458EB2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "OCQueryCondition+SearchSegmenter.h"; sourceTree = "<group>"; };
+		DCB458EC2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "OCQueryCondition+SearchSegmenter.m"; sourceTree = "<group>"; };
+		DCB459042604AD2A006A02AB /* SearchSegmentationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SearchSegmentationTests.m; sourceTree = "<group>"; };
 		DCB504D7221EF07E007638BE /* status-flash.tvg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "status-flash.tvg"; path = "img/filetypes-tvg/status-flash.tvg"; sourceTree = SOURCE_ROOT; };
 		DCB5D60A25FC14B6004C52D9 /* OCIssue+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OCIssue+Extension.swift"; sourceTree = "<group>"; };
 		DCB6C4D62453A6CA00C1EAE1 /* ClientAuthenticationUpdater.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientAuthenticationUpdater.swift; sourceTree = "<group>"; };
@@ -1367,6 +1379,8 @@
 		DCC83303242CF3AC00153F8C /* AlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertViewController.swift; sourceTree = "<group>"; };
 		DCC8535723CE1236007BA3EB /* LicenseInAppProductListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LicenseInAppProductListViewController.swift; sourceTree = "<group>"; };
 		DCC8535F23CE1AF8007BA3EB /* PurchasesSettingsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PurchasesSettingsSection.swift; sourceTree = "<group>"; };
+		DCCD776A2604C81B00098573 /* NSDate+ComputedTimes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSDate+ComputedTimes.h"; sourceTree = "<group>"; };
+		DCCD776B2604C81B00098573 /* NSDate+ComputedTimes.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+ComputedTimes.m"; sourceTree = "<group>"; };
 		DCD1300923A191C000255779 /* LicenseOfferButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LicenseOfferButton.swift; sourceTree = "<group>"; };
 		DCD1301023A23F4E00255779 /* OCLicenseManager+AppStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OCLicenseManager+AppStore.swift"; sourceTree = "<group>"; };
 		DCD2D40522F06ECA0071FB8F /* DataSettingsSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataSettingsSection.swift; sourceTree = "<group>"; };
@@ -2399,6 +2413,8 @@
 				DC774E6122F44E6D000B11A1 /* OCCore+BundleImport.h */,
 				DC7C100F24B5F81E00227085 /* OCBookmark+AppExtensions.m */,
 				DC7C100E24B5F81E00227085 /* OCBookmark+AppExtensions.h */,
+				DCB458EC2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.m */,
+				DCB458EB2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.h */,
 			);
 			path = "SDK Extensions";
 			sourceTree = "<group>";
@@ -2650,6 +2666,7 @@
 			isa = PBXGroup;
 			children = (
 				DCC0856B2293F1FD008CC05C /* LicensingTests.m */,
+				DCB459042604AD2A006A02AB /* SearchSegmentationTests.m */,
 				DCC0856D2293F1FD008CC05C /* Info.plist */,
 			);
 			path = ownCloudAppFrameworkTests;
@@ -2660,6 +2677,10 @@
 			children = (
 				DCC5E445232654DE002E5B84 /* NSObject+AnnotatedProperties.m */,
 				DCC5E444232654DE002E5B84 /* NSObject+AnnotatedProperties.h */,
+				DCCD776B2604C81B00098573 /* NSDate+ComputedTimes.m */,
+				DCCD776A2604C81B00098573 /* NSDate+ComputedTimes.h */,
+				DC70398426128B89009F2DC1 /* NSString+ByteCountParser.m */,
+				DC70398326128B89009F2DC1 /* NSString+ByteCountParser.h */,
 			);
 			path = "Foundation Extensions";
 			sourceTree = "<group>";
@@ -3132,6 +3153,7 @@
 				DC4332002472E1B4002DC0E5 /* OCLicenseEMMProvider.h in Headers */,
 				DCFEFE39236877A7009A142F /* OCLicenseFeature.h in Headers */,
 				DC23D1DA238F391200423F62 /* OCLicenseAppStoreReceipt.h in Headers */,
+				DC70398526128B89009F2DC1 /* NSString+ByteCountParser.h in Headers */,
 				DCF2DA8324C83BFB0026D790 /* OCFileProviderService.h in Headers */,
 				DCF2DA8624C87A330026D790 /* OCCore+FPServices.h in Headers */,
 				DC774E6022F44E57000B11A1 /* ZIPArchive.h in Headers */,
@@ -3157,6 +3179,8 @@
 				DCF2DA8124C836240026D790 /* OCBookmark+FPServices.h in Headers */,
 				DC66F3A523965A1400CF4812 /* NSDate+RFC3339.h in Headers */,
 				DC0030C22350B1CE00BB8570 /* NSData+Encoding.h in Headers */,
+				DCCD77792604C91600098573 /* NSDate+ComputedTimes.h in Headers */,
+				DCB458ED2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.h in Headers */,
 				DCC5E4472326564F002E5B84 /* NSObject+AnnotatedProperties.h in Headers */,
 				DC66F3AB23965C9C00CF4812 /* OCLicenseAppStoreReceiptInAppPurchase.h in Headers */,
 				DC049156258C00C400DEDC27 /* OCFileProviderServiceStandby.h in Headers */,
@@ -4245,6 +4269,7 @@
 			files = (
 				DCFEFE9D2368D7FA009A142F /* OCLicenseObserver.m in Sources */,
 				DC66F39D239659C000CF4812 /* OCASN1.m in Sources */,
+				DCCD778C2604C91B00098573 /* NSDate+ComputedTimes.m in Sources */,
 				DC66F3A623965A1400CF4812 /* NSDate+RFC3339.m in Sources */,
 				DCF2DA8724C87A330026D790 /* OCCore+FPServices.m in Sources */,
 				DC7C101224B5FD6500227085 /* OCBookmark+AppExtensions.m in Sources */,
@@ -4260,6 +4285,7 @@
 				DCFEFE2B236876BD009A142F /* OCLicenseManager.m in Sources */,
 				DCDC20A22399A715003CFF5B /* OCCore+LicenseEnvironment.m in Sources */,
 				DCDC20AC2399A8CF003CFF5B /* OCLicenseEnterpriseProvider.m in Sources */,
+				DC70398626128B89009F2DC1 /* NSString+ByteCountParser.m in Sources */,
 				DCFEFE3A236877A7009A142F /* OCLicenseFeature.m in Sources */,
 				DCFEFE50236880B5009A142F /* OCLicenseOffer.m in Sources */,
 				DC0030C12350B1CE00BB8570 /* NSData+Encoding.m in Sources */,
@@ -4273,6 +4299,7 @@
 				DCFEFE4A23687C83009A142F /* OCLicenseEntitlement.m in Sources */,
 				DC66F3AC23965C9C00CF4812 /* OCLicenseAppStoreReceiptInAppPurchase.m in Sources */,
 				DCD8109B23984AF6003B0053 /* OCLicenseDuration.m in Sources */,
+				DCB458EE2604A7D4006A02AB /* OCQueryCondition+SearchSegmenter.m in Sources */,
 				DC080CF3238C92480044C5D2 /* OCLicenseAppStoreItem.m in Sources */,
 				DCFEFE982368D099009A142F /* OCLicenseEnvironment.m in Sources */,
 				DC049157258C00C400DEDC27 /* OCFileProviderServiceStandby.m in Sources */,
@@ -4284,6 +4311,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DCB459052604AD2A006A02AB /* SearchSegmentationTests.m in Sources */,
 				DCE442CE2387452000940A6D /* LicensingTests.m in Sources */,
 				39057AA7233BA7A60008E6C0 /* Intents.intentdefinition in Sources */,
 			);

ownCloud.xcodeproj/xcshareddata/xcschemes/ownCloud File Provider.xcscheme

@@ -147,6 +147,18 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
+      <AdditionalOptions>
+         <AdditionalOption
+            key = "MallocStackLogging"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+         <AdditionalOption
+            key = "PrefersMallocStackLoggingLite"
+            value = ""
+            isEnabled = "YES">
+         </AdditionalOption>
+      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

ownCloud/Client/Actions/Actions+Extensions/OpenInAction.swift

@@ -109,7 +109,7 @@ class OpenInAction: Action {
 						self.interactionController = UIDocumentInteractionController(url: fileURL)
 						self.interactionController?.delegate = self
 
-						if let _ = self.context.sender as? UIKeyCommand, let hostViewController = hostViewController {
+						if self.context.sender as? UIKeyCommand != nil, let hostViewController = hostViewController {
 							var sourceRect = hostViewController.view.frame
 							sourceRect.origin.x = viewController.view.center.x
 							sourceRect.origin.y = viewController.navigationController?.navigationBar.frame.size.height ?? 0.0

ownCloud/Client/ClientRootViewController.swift

@@ -172,12 +172,19 @@ class ClientRootViewController: UITabBarController, BookmarkContainer, ToolAndTa
 	}
 
 	// MARK: - Startup
-	func afterCoreStart(_ lastVisibleItemId: String?, completionHandler: @escaping ((_ error: Error?) -> Void)) {
+	func afterCoreStart(_ lastVisibleItemId: String?, busyHandler: OCCoreBusyStatusHandler? = nil, completionHandler: @escaping ((_ error: Error?) -> Void)) {
 		OCCoreManager.shared.requestCore(for: bookmark, setup: { (core, _) in
 			self.coreRequested = true
 			self.core = core
 			core?.delegate = self
 
+			if let busyHandler = busyHandler {
+				// Wrap busyHandler to ensure that a ObjC block is generated and not a Swift block is passed
+				core?.busyStatusHandler = { (progress) in
+					busyHandler(progress)
+				}
+			}
+
 			// Add message presenters
 			if let notificationPresenter = self.notificationPresenter {
 				core?.messageQueue.add(presenter: notificationPresenter)
@@ -189,14 +196,14 @@ class ClientRootViewController: UITabBarController, BookmarkContainer, ToolAndTa
 
 			// Remove skip available offline when user opens the bookmark
 			core?.vault.keyValueStore?.storeObject(nil, forKey: .coreSkipAvailableOfflineKey)
-
-			// Set up FP standby
-			if let core = core {
-				self.fpServiceStandby = OCFileProviderServiceStandby(core: core)
-				self.fpServiceStandby?.start()
-			}
 		}, completionHandler: { (core, error) in
 			if error == nil {
+				// Set up FP standby
+				if let core = core {
+					self.fpServiceStandby = OCFileProviderServiceStandby(core: core)
+					self.fpServiceStandby?.start()
+				}
+
 				// Core is ready
 				self.coreReady(lastVisibleItemId)
 
@@ -207,6 +214,9 @@ class ClientRootViewController: UITabBarController, BookmarkContainer, ToolAndTa
 					})
 				}
 			} else {
+				self.core = nil
+				self.coreRequested = false
+
 				Log.error("Error requesting/starting core: \(String(describing: error))")
 			}