- [Universal links] Fixed some cases when the server has subpaths

Pablo Carrascal · Pablo Carrascal · commit 998b2ff103cd · 2018-05-17T10:11:30.000+02:00
diff --git a/Owncloud iOs Client/OpenInApp/OpenInAppHandler.m b/Owncloud iOs Client/OpenInApp/OpenInAppHandler.m
@@ -161,10 +161,10 @@ -(NSString *)_getFilePathFromURLWithURL: (NSString *)url andFileName: (NSString
 -(void)_isItemDirectory: (NSString *)itemPath completionHandler:(void (^)(BOOL isDirectory, NSError * error))completionHandler
 {
     NSError *error = NULL;
-    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"(.*)\/remote.php\/dav\/files\/[^\/]*" options:NSRegularExpressionCaseInsensitive error:&error];
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"(.*)\/remote.php\/dav\/files\/[^\/]*\/" options:NSRegularExpressionCaseInsensitive error:&error];
     NSString *result = [regex stringByReplacingMatchesInString:itemPath options:0 range:NSMakeRange(0, [itemPath length]) withTemplate:@""];
 
-    NSString *path = [[UtilsUrls getRemoteServerPathWithoutFolders:_user] stringByAppendingString: [@"/" stringByAppendingString:[k_url_webdav_server_without_last_slash stringByAppendingString:result]]];
+    NSString *path = [[UtilsUrls getFullRemoteServerPathWithWebDav:_user] stringByAppendingString:result];
 
     [[AppDelegate sharedOCCommunication] readFile:path  onCommunication: [AppDelegate sharedOCCommunication] successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer)
     {

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,10 @@ -(NSString )_getFilePathFromURLWithURL: (NSString )url andFileName: (NSString`
`161`	`161`	`-(void)_isItemDirectory: (NSString )itemPath completionHandler:(void (^)(BOOL isDirectory, NSError error))completionHandler`
`162`	`162`	`{`
`163`	`163`	`NSError *error = NULL;`
`164`		`- NSRegularExpression regex = [NSRegularExpression regularExpressionWithPattern:@"(.)\/remote.php\/dav\/files\/[^\/]*" options:NSRegularExpressionCaseInsensitive error:&error];`
	`164`	`+ NSRegularExpression regex = [NSRegularExpression regularExpressionWithPattern:@"(.)\/remote.php\/dav\/files\/[^\/]*\/" options:NSRegularExpressionCaseInsensitive error:&error];`
`165`	`165`	`NSString *result = [regex stringByReplacingMatchesInString:itemPath options:0 range:NSMakeRange(0, [itemPath length]) withTemplate:@""];`
`166`	`166`
`167`		`- NSString *path = [[UtilsUrls getRemoteServerPathWithoutFolders:_user] stringByAppendingString: [@"/" stringByAppendingString:[k_url_webdav_server_without_last_slash stringByAppendingString:result]]];`
	`167`	`+ NSString *path = [[UtilsUrls getFullRemoteServerPathWithWebDav:_user] stringByAppendingString:result];`
`168`	`168`
`169`	`169`	`[[AppDelegate sharedOCCommunication] readFile:path onCommunication: [AppDelegate sharedOCCommunication] successRequest:^(NSHTTPURLResponse response, NSArray items, NSString *redirectedServer)`
`170`	`170`	`{`