Merge pull request owncloud#916 from owncloud/write-only_shared_folder

Support new public share option "show file listing"

Author: nasli

OCCommunicationLib

@@ -44,6 +44,7 @@ typedef enum {
 @property NSInteger hasCapabilitiesSupport;
 @property NSInteger hasFedSharesOptionShareSupport;
 @property NSInteger hasPublicShareLinkOptionNameSupport;
+@property NSInteger hasPublicShareLinkOptionUploadOnlySupport;
 @property BOOL imageInstantUpload;
 @property BOOL videoInstantUpload;
 @property BOOL backgroundInstantUpload;

Owncloud iOs Client/DataBase/DTOs/UserDto.h

@@ -43,6 +43,7 @@
 #define k_DB_version_18 18
 #define k_DB_version_19 19
 #define k_DB_version_20 20
+#define k_DB_version_21 21
 
 @implementation InitializeDatabase
 
@@ -56,7 +57,7 @@ @implementation InitializeDatabase
 + (void) initDataBase {
 
     //New version
-    static int dbVersion = k_DB_version_20;
+    static int dbVersion = k_DB_version_21;
 
     //This method make a new database
     [ManageDB createDataBase];
@@ -111,6 +112,8 @@ + (void) initDataBase {
                 [ManageDB updateDBVersion18To19];
             case k_DB_version_19:
                 [ManageDB updateDBVersion19To20];
+            case k_DB_version_20:
+                [ManageDB updateDBVersion20To21];
                 break; //Insert your migration above this final break.
         }
     }
@@ -143,7 +146,7 @@ + (void) removeURLEncodingFromAllFilesAndFoldersInTheFileSystem {
 
             NSString *fullPath = [NSString stringWithFormat:@"%@%@",documentsDirectory, smallPath];
             NSString *originalName = [splitedUrl objectAtIndex:[splitedUrl count]-1];
-            NSString *destinyName = [[splitedUrl objectAtIndex:[splitedUrl count]-1] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+            NSString *destinyName = [[splitedUrl objectAtIndex:[splitedUrl count]-1] stringByRemovingPercentEncoding];
 
             NSURL *originalPath = [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@%@",fullPath,originalName]];
             NSURL *destinyPath= [NSURL fileURLWithPath:[NSString stringWithFormat:@"%@%@",fullPath,destinyName]];

Owncloud iOs Client/DataBase/Queries/InitializeDatabase.m

@@ -40,7 +40,31 @@ +(void) insertCapabilities:(OCCapabilities *)capabilities ofUserId:(NSInteger)us
     [queue inTransaction:^(FMDatabase *db, BOOL *rollback) {
         BOOL correctQuery=NO;
 
-        correctQuery = [db executeUpdate:@"INSERT INTO capabilities(id_user, version_major, version_minor, version_micro, version_string, version_edition, core_poll_intervall, is_files_sharing_api_enabled, is_files_sharing_share_link_enabled, is_files_sharing_password_enforced_enabled, is_files_sharing_expire_date_by_default_enabled, is_files_sharing_expire_date_enforce_enabled, files_sharing_expire_date_days_number, is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled, is_files_sharing_allow_public_uploads_enabled, is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled, is_files_sharing_re_sharing_enabled, is_files_sharing_allow_user_send_shares_to_other_servers_enabled, is_files_sharing_allow_user_receive_shares_to_other_servers_enabled, is_file_big_file_chunking_enabled, is_file_undelete_enabled, is_file_versioning_enabled, is_files_sharing_allow_user_create_multiple_public_links_enabled) Values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", [NSNumber numberWithInteger:userId], [NSNumber numberWithInteger:capabilities.versionMajor], [NSNumber numberWithInteger:capabilities.versionMinor], [NSNumber numberWithInteger:capabilities.versionMicro], capabilities.versionString, capabilities.versionEdition, [NSNumber numberWithInteger:capabilities.corePollInterval], [NSNumber numberWithBool:capabilities.isFilesSharingAPIEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingShareLinkEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingPasswordEnforcedEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateByDefaultEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateEnforceEnabled], [NSNumber numberWithInteger:capabilities.filesSharingExpireDateDaysNumber], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowPublicUploadsEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingReSharingEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendSharesToOtherServersEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled], [NSNumber numberWithBool:capabilities.isFileBigFileChunkingEnabled], [NSNumber numberWithBool:capabilities.isFileUndeleteEnabled], [NSNumber numberWithBool:capabilities.isFileVersioningEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled]];
+        correctQuery = [db executeUpdate:@"INSERT INTO capabilities(id_user, version_major, version_minor, version_micro, version_string, version_edition, core_poll_intervall, is_files_sharing_api_enabled, is_files_sharing_share_link_enabled, is_files_sharing_password_enforced_enabled, is_files_sharing_expire_date_by_default_enabled, is_files_sharing_expire_date_enforce_enabled, files_sharing_expire_date_days_number, is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled, is_files_sharing_allow_public_uploads_enabled, is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled, is_files_sharing_re_sharing_enabled, is_files_sharing_allow_user_send_shares_to_other_servers_enabled, is_files_sharing_allow_user_receive_shares_to_other_servers_enabled, is_file_big_file_chunking_enabled, is_file_undelete_enabled, is_file_versioning_enabled, is_files_sharing_allow_user_create_multiple_public_links_enabled, 'is_files_sharing_supports_upload_only_enabled') Values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                        [NSNumber numberWithInteger:userId],
+                        [NSNumber numberWithInteger:capabilities.versionMajor],
+                        [NSNumber numberWithInteger:capabilities.versionMinor],
+                        [NSNumber numberWithInteger:capabilities.versionMicro],
+                        capabilities.versionString,
+                        capabilities.versionEdition,
+                        [NSNumber numberWithInteger:capabilities.corePollInterval],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAPIEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingShareLinkEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingPasswordEnforcedEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateByDefaultEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateEnforceEnabled],
+                        [NSNumber numberWithInteger:capabilities.filesSharingExpireDateDaysNumber],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAllowPublicUploadsEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingReSharingEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendSharesToOtherServersEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled],
+                        [NSNumber numberWithBool:capabilities.isFileBigFileChunkingEnabled],
+                        [NSNumber numberWithBool:capabilities.isFileUndeleteEnabled],
+                        [NSNumber numberWithBool:capabilities.isFileVersioningEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled],
+                        [NSNumber numberWithBool:capabilities.isFilesSharingSupportsUploadOnlyEnabled]];
 
         if (!correctQuery) {
             DLog(@"Error in insert capabilities");
@@ -79,6 +103,7 @@ +(OCCapabilities *) getCapabilitiesOfUserId:(NSInteger) userId{
 
             output.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled = [rs boolForColumn:@"is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled"];
             output.isFilesSharingAllowPublicUploadsEnabled = [rs boolForColumn:@"is_files_sharing_allow_public_uploads_enabled"];
+            output.isFilesSharingSupportsUploadOnlyEnabled = [rs boolForColumn:@"is_files_sharing_supports_upload_only_enabled"];
             output.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled = [rs boolForColumn:@"is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled"];
             output.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled = [rs boolForColumn:@"is_files_sharing_allow_user_create_multiple_public_links_enabled"];
 
@@ -106,7 +131,7 @@ +(void) updateCapabilitiesWith:(OCCapabilities *)capabilities ofUserId:(NSIntege
     [queue inTransaction:^(FMDatabase *db, BOOL *rollback) {
         BOOL correctQuery=NO;
 
-        correctQuery = [db executeUpdate:@"UPDATE capabilities SET version_major=?, version_minor=?, version_micro=?, version_string=?, version_edition=?, core_poll_intervall=?, is_files_sharing_api_enabled=?, is_files_sharing_share_link_enabled=?, is_files_sharing_password_enforced_enabled=?, is_files_sharing_expire_date_by_default_enabled=?, is_files_sharing_expire_date_enforce_enabled=?, files_sharing_expire_date_days_number=?, is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled=?, is_files_sharing_allow_public_uploads_enabled=?, is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled=?, is_files_sharing_re_sharing_enabled=?, is_files_sharing_allow_user_send_shares_to_other_servers_enabled=?, is_files_sharing_allow_user_receive_shares_to_other_servers_enabled=?, is_file_big_file_chunking_enabled=?, is_file_undelete_enabled=?, is_file_versioning_enabled=?, is_files_sharing_allow_user_create_multiple_public_links_enabled=? WHERE id_user = ?",[NSNumber numberWithInteger:capabilities.versionMajor], [NSNumber numberWithInteger:capabilities.versionMinor], [NSNumber numberWithInteger:capabilities.versionMicro], capabilities.versionString, capabilities.versionEdition, [NSNumber numberWithInteger:capabilities.corePollInterval], [NSNumber numberWithBool:capabilities.isFilesSharingAPIEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingShareLinkEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingPasswordEnforcedEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateByDefaultEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateEnforceEnabled], [NSNumber numberWithInteger:capabilities.filesSharingExpireDateDaysNumber], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowPublicUploadsEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingReSharingEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendSharesToOtherServersEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled], [NSNumber numberWithBool:capabilities.isFileBigFileChunkingEnabled], [NSNumber numberWithBool:capabilities.isFileUndeleteEnabled], [NSNumber numberWithBool:capabilities.isFileVersioningEnabled],[NSNumber numberWithBool:capabilities.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled], [NSNumber numberWithInteger:userId]];
+        correctQuery = [db executeUpdate:@"UPDATE capabilities SET version_major=?, version_minor=?, version_micro=?, version_string=?, version_edition=?, core_poll_intervall=?, is_files_sharing_api_enabled=?, is_files_sharing_share_link_enabled=?, is_files_sharing_password_enforced_enabled=?, is_files_sharing_expire_date_by_default_enabled=?, is_files_sharing_expire_date_enforce_enabled=?, files_sharing_expire_date_days_number=?, is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled=?, is_files_sharing_allow_public_uploads_enabled=?, is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled=?, is_files_sharing_re_sharing_enabled=?, is_files_sharing_allow_user_send_shares_to_other_servers_enabled=?, is_files_sharing_allow_user_receive_shares_to_other_servers_enabled=?, is_file_big_file_chunking_enabled=?, is_file_undelete_enabled=?, is_file_versioning_enabled=?, is_files_sharing_allow_user_create_multiple_public_links_enabled=?, is_files_sharing_supports_upload_only_enabled=? WHERE id_user = ?",[NSNumber numberWithInteger:capabilities.versionMajor], [NSNumber numberWithInteger:capabilities.versionMinor], [NSNumber numberWithInteger:capabilities.versionMicro], capabilities.versionString, capabilities.versionEdition, [NSNumber numberWithInteger:capabilities.corePollInterval], [NSNumber numberWithBool:capabilities.isFilesSharingAPIEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingShareLinkEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingPasswordEnforcedEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateByDefaultEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingExpireDateEnforceEnabled], [NSNumber numberWithInteger:capabilities.filesSharingExpireDateDaysNumber], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutShareLinkEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowPublicUploadsEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingReSharingEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserSendSharesToOtherServersEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingAllowUserReceiveSharesToOtherServersEnabled], [NSNumber numberWithBool:capabilities.isFileBigFileChunkingEnabled], [NSNumber numberWithBool:capabilities.isFileUndeleteEnabled], [NSNumber numberWithBool:capabilities.isFileVersioningEnabled],[NSNumber numberWithBool:capabilities.isFilesSharingAllowUserCreateMultiplePublicLinksEnabled], [NSNumber numberWithBool:capabilities.isFilesSharingSupportsUploadOnlyEnabled], [NSNumber numberWithInteger:userId]];
 
         if (!correctQuery) {
             DLog(@"Error updating capabilities");

Owncloud iOs Client/DataBase/Queries/ManageCapabilitiesDB.m

@@ -259,4 +259,12 @@
  */
 + (void) updateDBVersion19To20;
 
+/**
+ * Changes:
+ *
+ * Alter capabilities table, adds new column for capability multiple_public_links and supports_upload_only.
+ */
++ (void) updateDBVersion20To21;
+
+
 @end

Owncloud iOs Client/DataBase/Queries/ManageDB.h

@@ -107,7 +107,7 @@ +(void) createDataBase {
             DLog(@"Error in createDataBase table cookies_storage");
         }
 
-        correctQuery = [db executeUpdate:@"CREATE TABLE IF NOT EXISTS 'capabilities' ('id' INTEGER PRIMARY KEY, 'id_user' INTEGER, 'version_major' INTEGER, 'version_minor' INTEGER, 'version_micro' INTEGER, 'version_string' VARCHAR, 'version_edition' VARCHAR, 'core_poll_intervall' INTEGER, 'is_files_sharing_api_enabled' BOOL, 'is_files_sharing_share_link_enabled' BOOL, 'is_files_sharing_password_enforced_enabled' BOOL, 'is_files_sharing_expire_date_by_default_enabled' BOOL, 'is_files_sharing_expire_date_enforce_enabled' BOOL, 'files_sharing_expire_date_days_number' INTEGER, 'is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled' BOOL, 'is_files_sharing_allow_public_uploads_enabled' BOOL, 'is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled' BOOL, 'is_files_sharing_re_sharing_enabled' BOOL, 'is_files_sharing_allow_user_send_shares_to_other_servers_enabled' BOOL, 'is_files_sharing_allow_user_receive_shares_to_other_servers_enabled' BOOL, 'is_file_big_file_chunking_enabled' BOOL, 'is_file_undelete_enabled' BOOL, 'is_file_versioning_enabled' BOOL,  'is_files_sharing_allow_user_create_multiple_public_links_enabled' BOOL)"];
+        correctQuery = [db executeUpdate:@"CREATE TABLE IF NOT EXISTS 'capabilities' ('id' INTEGER PRIMARY KEY, 'id_user' INTEGER, 'version_major' INTEGER, 'version_minor' INTEGER, 'version_micro' INTEGER, 'version_string' VARCHAR, 'version_edition' VARCHAR, 'core_poll_intervall' INTEGER, 'is_files_sharing_api_enabled' BOOL, 'is_files_sharing_share_link_enabled' BOOL, 'is_files_sharing_password_enforced_enabled' BOOL, 'is_files_sharing_expire_date_by_default_enabled' BOOL, 'is_files_sharing_expire_date_enforce_enabled' BOOL, 'files_sharing_expire_date_days_number' INTEGER, 'is_files_sharing_allow_user_send_mail_notification_about_share_link_enabled' BOOL, 'is_files_sharing_allow_public_uploads_enabled' BOOL, 'is_files_sharing_allow_user_send_mail_notification_about_other_users_enabled' BOOL, 'is_files_sharing_re_sharing_enabled' BOOL, 'is_files_sharing_allow_user_send_shares_to_other_servers_enabled' BOOL, 'is_files_sharing_allow_user_receive_shares_to_other_servers_enabled' BOOL, 'is_file_big_file_chunking_enabled' BOOL, 'is_file_undelete_enabled' BOOL, 'is_file_versioning_enabled' BOOL,  'is_files_sharing_allow_user_create_multiple_public_links_enabled' BOOL, 'is_files_sharing_supports_upload_only_enabled' BOOL)"];
 
         if (!correctQuery) {
             DLog(@"Error in createDataBase table capabilities");
@@ -1238,4 +1238,26 @@ + (void) updateDBVersion19To20 {
 
 }
 
++ (void) updateDBVersion20To21 {
+    FMDatabaseQueue *queue = Managers.sharedDatabase;
+    
+    [queue inTransaction:^(FMDatabase *db, BOOL *rollback) {
+        
+        BOOL dbOperationSuccessful;
+        
+        dbOperationSuccessful =[db executeUpdate:@"ALTER TABLE capabilities ADD is_files_sharing_allow_user_create_multiple_public_links_enabled BOOL NOT NULL DEFAULT 0"];
+        if (!dbOperationSuccessful) {
+            DLog(@"Error update version 20 to 21 table capabilities add column is_files_sharing_allow_user_create_multiple_public_links_enabled");
+        }
+        
+        dbOperationSuccessful = [db executeUpdate:@"ALTER TABLE capabilities ADD is_files_sharing_supports_upload_only_enabled BOOL NOT NULL DEFAULT 0"];
+        if (!dbOperationSuccessful) {
+            DLog(@"Error update version 20 to 21 table capabilities is_files_sharing_supports_upload_only_enabled ");
+        }
+        
+    }];
+
+}
+
+
 @end