[feature/mem-optimizations] Optimize memory usage

ownCloudSDK/Bookmark/OCBookmark+DataItem.m

@@ -20,7 +20,7 @@
 #import "OCDataTypes.h"
 #import "OCResource.h"
 #import "OCMacros.h"
-#import "OCCoreManager.h"
+#import "OCPlatform.h"
 
 @implementation OCBookmark (DataItem)
 
@@ -36,7 +36,7 @@ - (OCDataItemReference)dataItemReference
 
 - (OCDataItemVersion)dataItemVersion
 {
-	if (OCCoreManager.sharedCoreManager.memoryConfiguration != OCCoreMemoryConfigurationMinimum)
+	if (OCPlatform.current.memoryConfiguration != OCPlatformMemoryConfigurationMinimum)
 	{
 		OCResource *avatarResource = OCTypedCast(self.avatar, OCResource);
 		NSString *avatarVersion = ((avatarResource != nil) ? avatarResource.version : @"");

ownCloudSDK/Bookmark/OCBookmark.h

@@ -86,6 +86,11 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)removeCapability:(OCBookmarkCapability)capability;
 - (BOOL)hasCapability:(OCBookmarkCapability)capability;
 
+#pragma mark - Metadata storage
+@property(strong,nullable) NSURL *metaDataStorageURL; //!< URL to store bookmark data in (f.ex. certificates, avatar images, ..)
+
+- (nullable NSError *)storeMetadata;
+
 #pragma mark - Certificate approval
 - (NSNotificationName)certificateUserApprovalUpdateNotificationName; //!< Notification that gets sent if the bookmark's certificate user-approved status changed
 - (void)postCertificateUserApprovalUpdateNotification; //!< Posts a .certificateUserApprovalUpdateNotificationName notification

ownCloudSDK/Bookmark/OCBookmark.m

@@ -34,6 +34,7 @@ @interface OCBookmark ()
 	OCIPCNotificationName _bookmarkAuthUpdateNotificationName;
 
 	id<OCViewProvider> _avatar;
+	NSURL *_avatarDataURL;
 	NSData *_avatarData;
 
 	NSString *_lastUsername;
@@ -246,19 +247,64 @@ - (OCCertificate *)primaryCertificate
 	return (primaryCertificate);
 }
 
+#pragma mark - Metadata storage
+- (NSError *)storeMetadata
+{
+	NSError *error = nil;
+
+	@synchronized(self)
+	{
+		if (_metaDataStorageURL != nil)
+		{
+			if ([NSFileManager.defaultManager createDirectoryAtURL:_metaDataStorageURL withIntermediateDirectories:YES attributes:nil error:&error])
+			{
+				if ((_avatarDataURL != nil) && (_avatarData != nil))
+				{
+					[_avatarData writeToURL:_avatarDataURL options:NSDataWritingAtomic error:&error];
+				}
+			}
+		}
+	}
+
+	return (error);
+}
+
 #pragma mark - Avatar
+- (NSData *)avatarData
+{
+	@synchronized(self)
+	{
+		if ((_avatarData == nil) && (_avatarDataURL != nil))
+		{
+			_avatarData = [[NSData alloc] initWithContentsOfURL:_avatarDataURL];
+		}
+	}
+
+	return (_avatarData);
+}
+
 - (id<OCViewProvider>)avatar
 {
 	@synchronized(self)
 	{
-		if ((_avatar == nil) && (_avatarData != nil))
+		if (_avatar == nil)
 		{
-			@try
+			NSData *avatarData = _avatarData;
+
+			if ((avatarData == nil) && (_avatarDataURL != nil))
 			{
-				_avatar = [NSKeyedUnarchiver unarchiveObjectWithData:_avatarData];
+				avatarData = [[NSData alloc] initWithContentsOfURL:_avatarDataURL];
 			}
-			@catch (NSException *exception)
+
+			if (avatarData != nil)
 			{
+				@try
+				{
+					_avatar = [NSKeyedUnarchiver unarchiveObjectWithData:avatarData];
+				}
+				@catch (NSException *exception)
+				{
+				}
 			}
 		}
 
@@ -304,6 +350,15 @@ - (void)setAvatar:(id<OCViewProvider>)avatar
 
 		_avatar = (avatarData != nil) ? avatar : nil;
 		_avatarData = avatarData;
+
+		if ((avatarData != nil) && (_metaDataStorageURL != nil))
+		{
+			_avatarDataURL = [_metaDataStorageURL URLByAppendingPathComponent:@"avatarData"];
+		}
+		else
+		{
+			_avatarDataURL = nil;
+		}
 	}
 }
 
@@ -415,6 +470,8 @@ - (instancetype)initWithCoder:(NSCoder *)decoder
 
 		_originURL = [decoder decodeObjectOfClass:NSURL.class forKey:@"originURL"];
 
+		_metaDataStorageURL = [decoder decodeObjectOfClass:NSURL.class forKey:@"metaDataStorageURL"];
+
 		_capabilities = [decoder decodeObjectOfClasses:[NSSet setWithObjects:NSSet.class, NSString.class, nil] forKey:@"capabilities"];
 
 		_certificateStore = [decoder decodeObjectOfClass:OCCertificateStore.class forKey:@"certificateStore"];
@@ -435,6 +492,7 @@ - (instancetype)initWithCoder:(NSCoder *)decoder
 		_authenticationValidationDate = [decoder decodeObjectOfClass:NSDate.class forKey:@"authenticationValidationDate"];
 
 		_avatarData = [decoder decodeObjectOfClass:NSData.class forKey:@"avatarData"];
+		_avatarDataURL = [decoder decodeObjectOfClass:NSURL.class forKey:@"avatarDataURL"];
 
 		_databaseVersion = [decoder decodeIntegerForKey:@"databaseVersion"];
 
@@ -462,14 +520,20 @@ - (void)encodeWithCoder:(NSCoder *)coder
 
 	[coder encodeObject:_originURL forKey:@"originURL"];
 
+	[coder encodeObject:_metaDataStorageURL forKey:@"metaDataStorageURL"];
+
 	[coder encodeObject:_capabilities forKey:@"capabilities"];
 
 	[coder encodeObject:_certificateStore forKey:@"certificateStore"];
 
 	[coder encodeObject:_authenticationMethodIdentifier forKey:@"authenticationMethodIdentifier"];
 	[coder encodeObject:_authenticationValidationDate forKey:@"authenticationValidationDate"];
 
-	[coder encodeObject:_avatarData forKey:@"avatarData"];
+	if (_avatarDataURL == nil)
+	{
+		[coder encodeObject:_avatarData forKey:@"avatarData"];
+	}
+	[coder encodeObject:_avatarDataURL forKey:@"avatarDataURL"];
 
 	[coder encodeInteger:_databaseVersion forKey:@"databaseVersion"];
 

ownCloudSDK/Connection/OCConnection+Upload.m

@@ -27,7 +27,7 @@
 #import "OCHTTPResponse+DAVError.h"
 #import "NSProgress+OCExtensions.h"
 #import "OCCore+SyncEngine.h"
-#import "OCCoreManager.h"
+#import "OCPlatform.h"
 
 typedef NSString* OCUploadInfoKey;
 typedef NSString* OCUploadInfoTask;
@@ -241,7 +241,7 @@ - (OCProgress *)_tusUploadFileFromURL:(NSURL *)sourceURL withName:(NSString *)fi
 			{
 				NSNumber *capabilitiesTusMaxChunkSize;
 
-				if (OCCoreManager.sharedCoreManager.memoryConfiguration != OCCoreMemoryConfigurationMinimum)
+				if (OCPlatform.current.memoryConfiguration != OCPlatformMemoryConfigurationMinimum)
 				{
 					// Memory configuration is NOT minimum, so avoid splitting up files into chunks if
 					// possible, which requires additional memory and could mean going over a tight memory
@@ -296,7 +296,7 @@ - (OCProgress *)_continueTusJob:(OCTUSJob *)tusJob lastTask:(NSString *)lastTask
 		return (nil);
 	}
 
-	if (OCCoreManager.sharedCoreManager.memoryConfiguration == OCCoreMemoryConfigurationMinimum)
+	if (OCPlatform.current.memoryConfiguration == OCPlatformMemoryConfigurationMinimum)
 	{
 		// Memory configuration is minimum, so use just Creation instead of Creation-With-Upload
 		// to avoid splitting up files into chunks if possible, which requires additional memory

ownCloudSDK/Core/ItemList/OCCore+ItemList.m

@@ -51,11 +51,11 @@ - (NSUInteger)parallelItemListTaskCount
 {
 	switch (self.memoryConfiguration)
 	{
-		case OCCoreMemoryConfigurationMinimum:
+		case OCPlatformMemoryConfigurationMinimum:
 			return (1);
 		break;
 
-		case OCCoreMemoryConfigurationDefault:
+		case OCPlatformMemoryConfigurationDefault:
 		default:
 			return (2);
 		break;

ownCloudSDK/Core/OCCore+ItemUpdates.m

@@ -124,21 +124,6 @@ - (void)performUpdatesForAddedItems:(nullable NSArray<OCItem *> *)addedItems
 			}];
 		}
 
-		// In parallel: remove thumbnails from in-memory cache for removed items
-		OCWaitWillStartTask(cacheUpdatesGroup);
-
-		dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
-			for (OCItem *removeItem in removedItems)
-			{
-				if (removeItem.fileID != nil)
-				{
-					[self->_thumbnailCache removeObjectForKey:removeItem.fileID];
-				}
-			}
-
-			OCWaitDidFinishTask(cacheUpdatesGroup);
-		});
-
 		// Wait for updates to complete
 		OCWaitForCompletion(cacheUpdatesGroup);
 	}

ownCloudSDK/Core/OCCore.h

@@ -43,6 +43,7 @@
 #import "OCDataSourceComposition.h"
 #import "OCDataItemPresentable.h"
 #import "OCShareRole.h"
+#import "OCPlatform.h"
 
 @class OCCore;
 @class OCItem;
@@ -95,12 +96,6 @@ typedef NS_ENUM(NSUInteger, OCCoreConnectionStatusSignalState)
 	OCCoreConnectionStatusSignalStateForceTrue   	//!< Signal state is force true (overriding any false states)
 } __attribute__((enum_extensibility(closed)));
 
-typedef NS_ENUM(NSUInteger, OCCoreMemoryConfiguration)
-{
-	OCCoreMemoryConfigurationDefault,	//!< Default memory configuration
-	OCCoreMemoryConfigurationMinimum	//!< Try using only the minimum amount of memory needed
-} __attribute__((enum_extensibility(closed)));
-
 typedef NS_ENUM(NSUInteger,OCCoreAvailableOfflineCoverage)
 {
 	OCCoreAvailableOfflineCoverageNone,	//!< Item is not targeted by available offline item policy
@@ -156,7 +151,7 @@ typedef id<NSObject> OCCoreItemTracking;
 	OCConnection *_connection;
 	BOOL _attemptConnect;
 
-	OCCoreMemoryConfiguration _memoryConfiguration;
+	OCPlatformMemoryConfiguration _memoryConfiguration;
 
 	NSMutableArray <OCQuery *> *_queries;
 
@@ -229,7 +224,6 @@ typedef id<NSObject> OCCoreItemTracking;
 
 	OCSignalManager *_signalManager;
 
-	OCCache<OCFileID,OCItemThumbnail *> *_thumbnailCache;
 	NSMutableDictionary <NSString *, NSMutableArray<OCCoreThumbnailRetrieveHandler> *> *_pendingThumbnailRequests;
 
 	NSMutableDictionary <OCIPCNotificationName, id> *_remoteSyncEngineTriggerAcknowledgements;
@@ -310,7 +304,7 @@ typedef id<NSObject> OCCoreItemTracking;
 @property(readonly) OCVault *vault; //!< Vault managing storage and database access for this core.
 @property(readonly) OCConnection *connection; //!< Connection used by the core to make requests to the server.
 
-@property(assign,nonatomic) OCCoreMemoryConfiguration memoryConfiguration;
+@property(assign,nonatomic) OCPlatformMemoryConfiguration memoryConfiguration;
 
 @property(readonly,nonatomic) OCCoreState state;
 @property(copy) OCCoreStateChangedHandler stateChangedHandler;

ownCloudSDK/Core/OCCore.m

@@ -327,8 +327,6 @@ - (instancetype)initWithBookmark:(OCBookmark *)bookmark
 
 		_claimTokensByClaimIdentifier = [NSMapTable strongToWeakObjectsMapTable];
 
-		_thumbnailCache = [OCCache new];
-
 		_queue = dispatch_queue_create("OCCore work queue", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
 		_connectivityQueue = dispatch_queue_create("OCCore connectivity queue", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL);
 
@@ -410,7 +408,7 @@ - (instancetype)initWithBookmark:(OCBookmark *)bookmark
 		[self addSignalProvider:_connectingStatusSignalProvider];
 		[self addSignalProvider:_connectionStatusSignalProvider];
 
-		self.memoryConfiguration = OCCoreManager.sharedCoreManager.memoryConfiguration;
+		self.memoryConfiguration = OCPlatform.current.memoryConfiguration;
 
 		[self startIPCObservation];
 	}
@@ -755,7 +753,7 @@ - (void)__attemptConnect
 					}
 
 					// If app provider is available and enabled
-					if (OCCoreManager.sharedCoreManager.memoryConfiguration != OCCoreMemoryConfigurationMinimum) // only load app providers in memory configurations other than minimum
+					if (self.memoryConfiguration != OCPlatformMemoryConfigurationMinimum) // only load app providers in memory configurations other than minimum
 					{
 						OCAppProvider *latestSupportedAppProvider = self.connection.capabilities.latestSupportedAppProvider;
 
@@ -1043,22 +1041,11 @@ - (OCMessageQueue *)messageQueue
 }
 
 #pragma mark - Memory configuration
-- (void)setMemoryConfiguration:(OCCoreMemoryConfiguration)memoryConfiguration
+- (void)setMemoryConfiguration:(OCPlatformMemoryConfiguration)memoryConfiguration
 {
 	_memoryConfiguration = memoryConfiguration;
 
 	self.vault.resourceManager.memoryConfiguration = memoryConfiguration;
-
-	switch (_memoryConfiguration)
-	{
-		case OCCoreMemoryConfigurationDefault:
-			_thumbnailCache.countLimit = OCCacheLimitNone;
-		break;
-
-		case OCCoreMemoryConfigurationMinimum:
-			_thumbnailCache.countLimit = 1;
-		break;
-	}
 }
 
 #pragma mark - Inter-Process change notification/handling

ownCloudSDK/Core/Resources/Manager/OCResourceManager.h

@@ -40,7 +40,7 @@ typedef void(^OCResourceRetrieveCompletionHandler)(NSError * _Nullable error, OC
 @property(weak,nullable) id<OCResourceStorage> storage;
 @property(weak,nullable) OCCore *core;
 
-@property(assign,nonatomic) OCCoreMemoryConfiguration memoryConfiguration;
+@property(assign,nonatomic) OCPlatformMemoryConfiguration memoryConfiguration;
 
 // @property(assign) NSUInteger maximumConcurrentJobs; //!< Maximum number of jobs to work on in parallel. A value of 0 indicates no limit.
 

ownCloudSDK/Core/Resources/Manager/OCResourceManager.m

@@ -56,18 +56,21 @@ - (instancetype)initWithStorage:(id<OCResourceStorage>)storage
 	return (self);
 }
 
-- (void)setMemoryConfiguration:(OCCoreMemoryConfiguration)memoryConfiguration
+- (void)setMemoryConfiguration:(OCPlatformMemoryConfiguration)memoryConfiguration
 {
 	_memoryConfiguration = memoryConfiguration;
 
 	switch (_memoryConfiguration)
 	{
-		case OCCoreMemoryConfigurationDefault:
+		case OCPlatformMemoryConfigurationDefault:
+			if (_cache == nil) {
+				_cache = [OCCache new];
+			}
 			_cache.countLimit = OCCacheLimitNone;
 		break;
 
-		case OCCoreMemoryConfigurationMinimum:
-			_cache.countLimit = 1;
+		case OCPlatformMemoryConfigurationMinimum:
+			_cache = nil; // Do not perform any caching
 		break;
 	}
 }

ownCloudSDK/Platforms/OCPlatform.h

@@ -34,10 +34,20 @@
 #define OCView NSView
 #endif /* TARGET_OS_OSX */
 
+typedef NS_ENUM(NSUInteger, OCPlatformMemoryConfiguration)
+{
+	OCPlatformMemoryConfigurationDefault,	//!< Default memory configuration
+	OCPlatformMemoryConfigurationMinimum	//!< Try using only the minimum amount of memory needed
+} __attribute__((enum_extensibility(closed)));
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface OCPlatform : NSObject
 
+@property(readonly,strong,nonatomic,class) OCPlatform *current;
+
+@property(assign) OCPlatformMemoryConfiguration memoryConfiguration;
+
 @end
 
 NS_ASSUME_NONNULL_END