Эх сурвалжийг харах

fix shares [lost library]

marinofaggiana 5 жил өмнө
parent
commit
6acb1af0e0

+ 1 - 1
iOSClient/Library/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -617,7 +617,7 @@ NSString const *OCWebDAVModificationDateKey	= @"modificationdate";
     
     NSParameterAssert(success);
 	
-    NSString *postString = [NSString stringWithFormat: @"?path=%@&subfiles=true",path];
+    NSString *postString = [NSString stringWithFormat: @"?path=%@&reshares=true&subfiles=true",path];
     serverPath = [serverPath stringByAppendingString:postString];
     _requestMethod = @"GET";
     

+ 1 - 3
iOSClient/Main/CCMain.m

@@ -1863,13 +1863,11 @@
 
 - (void)readShareWithAccount:(NSString *)account openWindow:(BOOL)openWindow metadata:(tableMetadata *)metadata
 {
-    /*
     NSString *path = [CCUtility returnFileNamePathFromFileName:metadata.fileName serverUrl:self.serverUrl activeUrl:appDelegate.activeUrl];
-      
+    
     [[OCNetworking sharedManager] readShareWithAccount:account path:path completion:^(NSString *account, NSArray *items, NSString *message, NSInteger errorCode) {
         
     }];
-    */
     
     [[OCNetworking sharedManager] readShareWithAccount:account completion:^(NSString *account, NSArray *items, NSString *message, NSInteger errorCode) {
         

+ 4 - 0
iOSClient/Utility/CCUtility.m

@@ -1139,6 +1139,10 @@
                                        
 + (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl activeUrl:(NSString *)activeUrl
 {
+    if (metadataFileName == nil || serverUrl == nil || activeUrl == nil) {
+        return @"";
+    }
+    
     NSString *fileName = [NSString stringWithFormat:@"%@/%@", [serverUrl stringByReplacingOccurrencesOfString:[CCUtility getHomeServerUrlActiveUrl:activeUrl] withString:@""], metadataFileName];
     
     if ([fileName hasPrefix:@"/"]) fileName = [fileName substringFromIndex:1];