Merge pull request #1058 from owncloud/release_3.7.5

Release version 3.7.5

Changelog.md

@@ -1,3 +1,12 @@
+## 3.7.5 (May 2018)
+- Private link 
+- Sort the file list by kind of file
+- Improve iPhoneX support
+- Use WKWebView to display interactive content
+- Fix preview of xls files
+- Improve capability support for resharing
+- Bug fixing
+
 ## 3.7.3 (March 2018)
 - Support whiteListed apps for all iOS version supported
 - Fix preview of files (iPad)

OC Share Sheet/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.4</string>
+	<string>3.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.5</string>
+	<string>1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>

Owncloud iOs Client/AppDelegate.m

@@ -2799,8 +2799,6 @@ - (void) switchActiveUserTo:(UserDto *)user isNewAccount:(BOOL)isNewAccount {
             //We check the connection here because we need to accept the certificate on the self signed server before go to the files tab
             [[CheckAccessToServer sharedManager] isConnectionToTheServerByUrl:[UtilsUrls getFullRemoteServerPath:user]];
 
-            [CheckFeaturesSupported updateServerFeaturesAndCapabilitiesOfActiveUser];
-
             //we create the user folder to have multiuser
             [UtilsFileSystem createFolderForUser:user];
 

Owncloud iOs Client/OpenInApp/OpenInAppHandler.m

@@ -83,14 +83,18 @@ -(void)handleLink:(void (^)(NSArray *))success failure:(void (^)(NSError *))fail
                 });
 
                 dispatch_group_notify(group ,dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0),^{
-                    NSMutableArray *filesFromRootToFile = [self _syncFilesTreeWithFiles:files andUrls:urls];
 
-                    if (filesFromRootToFile.count > 0) {
-                        success([filesFromRootToFile copy]);
+                    if (files.count == urls.count) {
+                        NSMutableArray *filesFromRootToFile = [self _syncFilesTreeWithFiles:files andUrls:urls];
+
+                        if (filesFromRootToFile.count > 0) {
+                            success([filesFromRootToFile copy]);
+                        } else {
+                            failure([UtilsFramework getErrorByCodeId:OCErrorPrivateLinkErrorCachingFile]);
+                        }
                     } else {
                         failure([UtilsFramework getErrorByCodeId:OCErrorPrivateLinkErrorCachingFile]);
                     }
-
                 });
             }
         }];
@@ -156,9 +160,13 @@ -(NSString *)_getFilePathFromURLWithURL: (NSString *)url andFileName: (NSString
 
 -(void)_isItemDirectory: (NSString *)itemPath completionHandler:(void (^)(BOOL isDirectory, NSError * error))completionHandler
 {
-    NSString *path = [[UtilsUrls getRemoteServerPathWithoutFolders:_user] stringByAppendingString:itemPath];
+    NSError *error = NULL;
+    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 getFullRemoteServerPathWithWebDav:_user] stringByAppendingString:result];
 
-    [[AppDelegate sharedOCCommunication] readFile:path onCommunication: [AppDelegate sharedOCCommunication] successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer)
+    [[AppDelegate sharedOCCommunication] readFile:path  onCommunication: [AppDelegate sharedOCCommunication] successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer)
     {
         NSMutableArray<FileDto *> *item = [UtilsDtos passToFileDtoArrayThisOCFileDtoArray:items];
 

Owncloud iOs Client/Owncloud iOs Client-Info.plist

@@ -49,7 +49,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.4</string>
+	<string>3.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -66,7 +66,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.5</string>
+	<string>1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

Owncloud iOs Client/Tabs/FileTab/FilesViewController.m

@@ -351,6 +351,8 @@ - (void)initFilesView {
         if ([[ManageFilesDB getFilesByFileIdForActiveUser:_fileIdToShowFiles.idFile] count] == 0) {
             [self initLoading];
         }
+
+        [CheckFeaturesSupported updateServerFeaturesAndCapabilitiesOfActiveUser];
 
         _isEtagRequestNecessary = YES;
     }

Owncloud iOs Client/Tabs/SettingTab/Account/ManageAccounts.swift

@@ -59,10 +59,6 @@ import Foundation
 
         UtilsCookies.update(inDBOfUser: user)
 
-        if user.activeaccount {
-            CheckFeaturesSupported.updateServerFeaturesAndCapabilitiesOfActiveUser()
-        }
-
         //Change the state of user uploads with credential error
         ManageUploadsDB.updateErrorCredentialFiles(user.userId)
 

Owncloud iOs Client/Utils/UtilsUrls.h

@@ -131,4 +131,6 @@
 
 +(NSString *) getServerSubfolders:(UserDto *)mUser;
 
++ (NSString *) removeUnnecessaryParts:(NSString *)filePath;
+
 @end

Owncloud iOs Client/Utils/UtilsUrls.m

@@ -826,26 +826,24 @@ + (NSString *) getFullRemoteServerPathWithoutProtocolBeginningWithUserDisplayNam
  */
 +(NSArray<NSString *> *) getArrayOfWebdavUrlWithUrlInWebScheme: (NSString *)UrlInWebScheme forUser:(UserDto *)user isDirectory: (BOOL) isDirectory {
 
-    NSString *fileRedirectedURL = [self removeUnnecessaryParts:UrlInWebScheme andUser:user];
+    NSString *fileRedirectedURL = [self removeUnnecessaryParts:UrlInWebScheme];
 
     NSMutableArray<NSString *> *detachedFolderParameters = [[fileRedirectedURL componentsSeparatedByString:@"/"] mutableCopy];
 
-    [detachedFolderParameters removeObject:[user username]];
+//    [detachedFolderParameters removeObjectAtIndex:0]; // This removes the username from the parameters
 
     NSArray<NSString *> *urls = [self getUrlsForFilesFromPath:detachedFolderParameters andBaseServerUrl:[self getFullRemoteServerPathWithWebDav:user] isDirectory: isDirectory];
 
     return urls;
 
 }
 
-+ (NSString *) removeUnnecessaryParts:(NSString *)filePath
-                                         andUser:(UserDto *)mUserDto {
++ (NSString *) removeUnnecessaryParts:(NSString *)filePath {
     NSString *pathOnDB = @"";
 
-    NSString *partToRemove = [NSString stringWithFormat:@"%@%@",k_url_files_private_link, mUserDto.username];
-    if([filePath length] >= [partToRemove length]){
-        pathOnDB = [filePath substringFromIndex:[partToRemove length]];
-    }
+    NSError *error = NULL;
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"(.*)\/remote.php\/dav\/files\/[^\/]*" options:NSRegularExpressionCaseInsensitive error:&error];
+    pathOnDB = [regex stringByReplacingMatchesInString:filePath options:0 range:NSMakeRange(0, [filePath length]) withTemplate:@""];
 
     return pathOnDB;
 }

ownCloudExtApp/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.4</string>
+	<string>3.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.5</string>
+	<string>1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>

ownCloudExtAppFileProvider/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.7.4</string>
+	<string>3.7.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.5</string>
+	<string>1.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>NSAppTransportSecurity</key>