- OCResourceRequest: add property .retryIfNotFound to explicitly tell the resource manager not to retry if the resource couldn't be found (#168)

- OCAppProviderApp/OCAppProviderFileType: use OCResourceRequest.retryIfNotFound to prevent infinite retry loops
- OCResourceManager: add support for OCResourceRequest.retryIfNotFound

Author: felix-schwarz

ownCloudSDK/App Providers/OCAppProviderApp.m

@@ -76,6 +76,7 @@ - (OCResourceRequest *)iconResourceRequest
 	if ((_iconResourceRequest == nil) && (_iconURL != nil))
 	{
 		_iconResourceRequest = [OCResourceRequestURLItem requestURLItem:_iconURL identifier:nil version:OCResourceRequestURLItem.daySpecificVersion structureDescription:@"icon" waitForConnectivity:YES changeHandler:nil];
+		_iconResourceRequest.retryIfNotFound = NO;
 	}
 
 	return (_iconResourceRequest);

ownCloudSDK/App Providers/OCAppProviderFileType.m

@@ -33,6 +33,7 @@ - (OCResourceRequest *)iconResourceRequest
 	if ((_iconResourceRequest == nil) && (_iconURL != nil))
 	{
 		_iconResourceRequest = [OCResourceRequestURLItem requestURLItem:_iconURL identifier:nil version:OCResourceRequestURLItem.weekSpecificVersion structureDescription:@"icon" waitForConnectivity:YES changeHandler:nil];
+		_iconResourceRequest.retryIfNotFound = NO;
 	}
 
 	return (_iconResourceRequest);

ownCloudSDK/Core/Resources/Manager/OCResourceManager.m

@@ -457,15 +457,15 @@ - (void)_handleError:(nullable NSError *)error resource:(nullable OCResource *)r
 	{
 		// Resource is not available yet (f.ex. still processed by the server):
 		// - log, but don't try again because resource could remain in processing for a loooong time
-		// - handle as if resoruce does not exist
+		// - handle as if resource does not exist
 		OCTLogDebug(@[@"ResMan"], @"Handling source %@ returned resource=%@ error=%@ (!! remote resource processing - will not retry !!) as OCErrorResourceDoesNotExist", source.identifier, resource, error);
 
 		error = OCErrorFromError(OCErrorResourceDoesNotExist, error);
 	}
 
 	if ([error isOCErrorWithCode:OCErrorResourceDoesNotExist])
 	{
-		// Resource does not exist anymore: delete from cache + restart job
+		// Resource does not exist anymore: delete from cache + restart job (if .retryOnNotFound is enabled)
 		__weak OCResourceManager *weakSelf = self;
 		[self removeResourceOfType:job.primaryRequest.type identifier:job.primaryRequest.identifier completionHandler:^(NSError * _Nullable error) {
 			OCResourceManager *strongSelf = weakSelf;
@@ -484,10 +484,13 @@ - (void)_handleError:(nullable NSError *)error resource:(nullable OCResource *)r
 					}
 
 					// Restart job
-					job.state = OCResourceManagerJobStateNew;
-					job.sourcesCursorPosition = nil;
+					if (job.primaryRequest.retryIfNotFound)
+					{
+						job.state = OCResourceManagerJobStateNew;
+						job.sourcesCursorPosition = nil;
 
-					[strongSelf setNeedsScheduling];
+						[strongSelf setNeedsScheduling];
+					}
 				});
 			}
 		}];

ownCloudSDK/Core/Resources/Request/OCResourceRequest.h

@@ -70,6 +70,7 @@ typedef NSString* OCResourceRequestGroupIdentifier;
 @property(readonly) CGSize maxPixelSize; //!< Computed from maxPointSize and scale
 
 @property(assign) BOOL waitForConnectivity; //!< Sources that send requests to servers should wait for connectivity
+@property(assign) BOOL retryIfNotFound; //!< Sources that send requests to servers should retry even if the resource has not been found on the server
 
 @property(assign,nonatomic) BOOL cancelled;
 @property(readonly) BOOL ended;

ownCloudSDK/Core/Resources/Request/OCResourceRequest.m

@@ -29,6 +29,7 @@ - (instancetype)init
 	if ((self = [super init]) != nil)
 	{
 		_minimumQuality = OCResourceQualityFallback;
+		_retryIfNotFound = YES;
 	}
 
 	return (self);