add file sharing capabilities database

iOSClient/Database/NCDatabase.swift

@@ -149,19 +149,19 @@ class tableCapabilities: Object {
     @objc dynamic var isFilesSharingReSharing: Bool = false
     @objc dynamic var isFilesSharingPublicShareLinkEnabled: Bool = false
     @objc dynamic var isFilesSharingAllowPublicUploadsEnabled: Bool = false
-    @objc dynamic var isFilesSharingAllowPublicUserSendMailNotificationAboutShareLinkEnabled: Bool = false
+    @objc dynamic var isFilesSharingAllowPublicUserSendMail: Bool = false
     @objc dynamic var isFilesSharingAllowPublicUploadFilesDrop: Bool = false
     @objc dynamic var isFilesSharingAllowPublicMultipleLinks: Bool = false
     @objc dynamic var isFilesSharingPublicExpireDateByDefaultEnabled: Bool = false
     @objc dynamic var isFilesSharingPublicExpireDateEnforceEnabled: Bool = false
     @objc dynamic var filesSharingPublicExpireDateDays : Int = 0
     @objc dynamic var isFilesSharingPublicPasswordEnforced: Bool = false
-    @objc dynamic var isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled: Bool = false
+    @objc dynamic var isFilesSharingAllowUserSendMail: Bool = false
     @objc dynamic var isFilesSharingUserExpireDate: Bool = false
     @objc dynamic var isFilesSharingGroupEnabled: Bool = false
     @objc dynamic var isFilesSharingGroupExpireDate: Bool = false
-    @objc dynamic var isFilesSharingFederationAllowUserSendSharesToOtherServersEnabled: Bool = false
-    @objc dynamic var isFilesSharingFederationAllowUserReceiveSharesToOtherServersEnabled: Bool = false
+    @objc dynamic var isFilesSharingFederationAllowUserSendShares: Bool = false
+    @objc dynamic var isFilesSharingFederationAllowUserReceiveShares: Bool = false
     @objc dynamic var isFilesSharingFederationExpireDate: Bool = false
     @objc dynamic var isFileSharingShareByMailEnabled: Bool = false
     @objc dynamic var isFileSharingShareByMailPassword: Bool = false

iOSClient/Database/NCManageDatabase.swift

@@ -766,10 +766,36 @@ class NCManageDatabase: NSObject {
                     resultCapabilities.richdocumentsMimetypes.append(mimeType as! String)
                 }
                 resultCapabilities.richdocumentsDirectEditing = capabilities.richdocumentsDirectEditing
+                // FILES SHARING
+                resultCapabilities.isFilesSharingAPIEnabled = capabilities.isFilesSharingAPIEnabled
+                resultCapabilities.filesSharingDefaulPermissions = capabilities.filesSharingDefaulPermissions
+                resultCapabilities.isFilesSharingGroupSharing = capabilities.isFilesSharingGroupSharing
+                resultCapabilities.isFilesSharingReSharing = capabilities.isFilesSharingReSharing
+                resultCapabilities.isFilesSharingPublicShareLinkEnabled = capabilities.isFilesSharingPublicShareLinkEnabled
+                resultCapabilities.isFilesSharingAllowPublicUploadsEnabled = capabilities.isFilesSharingAllowPublicUploadsEnabled
+                resultCapabilities.isFilesSharingAllowPublicUserSendMail = capabilities.isFilesSharingAllowPublicUserSendMail
+                resultCapabilities.isFilesSharingAllowPublicUploadFilesDrop = capabilities.isFilesSharingAllowPublicUploadFilesDrop
+                resultCapabilities.isFilesSharingAllowPublicMultipleLinks = capabilities.isFilesSharingAllowPublicMultipleLinks
+                resultCapabilities.isFilesSharingPublicExpireDateByDefaultEnabled = capabilities.isFilesSharingPublicExpireDateByDefaultEnabled
+                resultCapabilities.isFilesSharingPublicExpireDateEnforceEnabled = capabilities.isFilesSharingPublicExpireDateEnforceEnabled
+                resultCapabilities.filesSharingPublicExpireDateDays = capabilities.filesSharingPublicExpireDateDays
+                resultCapabilities.isFilesSharingPublicPasswordEnforced = capabilities.isFilesSharingPublicPasswordEnforced
+                resultCapabilities.isFilesSharingAllowUserSendMail = capabilities.isFilesSharingAllowUserSendMail
+                resultCapabilities.isFilesSharingUserExpireDate = capabilities.isFilesSharingUserExpireDate
+                resultCapabilities.isFilesSharingGroupEnabled = capabilities.isFilesSharingGroupEnabled
+                resultCapabilities.isFilesSharingGroupExpireDate = capabilities.isFilesSharingGroupExpireDate
+                resultCapabilities.isFilesSharingFederationAllowUserSendShares = capabilities.isFilesSharingFederationAllowUserSendShares
+                resultCapabilities.isFilesSharingFederationAllowUserReceiveShares = capabilities.isFilesSharingFederationAllowUserReceiveShares
+                resultCapabilities.isFilesSharingFederationExpireDate = capabilities.isFilesSharingFederationExpireDate
+                resultCapabilities.isFileSharingShareByMailEnabled = capabilities.isFileSharingShareByMailEnabled
+                resultCapabilities.isFileSharingShareByMailPassword = capabilities.isFileSharingShareByMailPassword
+                resultCapabilities.isFileSharingShareByMailUploadFilesDrop = capabilities.isFileSharingShareByMailUploadFilesDrop
                 
                 if result == nil {
                     realm.add(resultCapabilities)
                 }
+                
+                
             }
         } catch let error {
             print("[LOG] Could not write to database: ", error)

iOSClient/Library/OCCommunicationLib/OCCapabilities.h

@@ -33,7 +33,7 @@
 
 @property (nonatomic) BOOL isFilesSharingPublicShareLinkEnabled;
 @property (nonatomic) BOOL isFilesSharingAllowPublicUploadsEnabled;
-@property (nonatomic) BOOL isFilesSharingAllowPublicUserSendMailNotificationAboutShareLinkEnabled;
+@property (nonatomic) BOOL isFilesSharingAllowPublicUserSendMail;
 @property (nonatomic) BOOL isFilesSharingAllowPublicUploadFilesDrop;
 @property (nonatomic) BOOL isFilesSharingAllowPublicMultipleLinks;
 
@@ -45,7 +45,7 @@
 
 //FILE SHARING - USER
 
-@property (nonatomic) BOOL isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled;
+@property (nonatomic) BOOL isFilesSharingAllowUserSendMail;
 @property (nonatomic) BOOL isFilesSharingUserExpireDate;
 
 //FILE SHARING - GROUP
@@ -55,8 +55,8 @@
 
 //FILE SHARING - FEDERATION
 
-@property (nonatomic) BOOL isFilesSharingFederationAllowUserSendSharesToOtherServersEnabled;
-@property (nonatomic) BOOL isFilesSharingFederationAllowUserReceiveSharesToOtherServersEnabled;
+@property (nonatomic) BOOL isFilesSharingFederationAllowUserSendShares;
+@property (nonatomic) BOOL isFilesSharingFederationAllowUserReceiveShares;
 @property (nonatomic) BOOL isFilesSharingFederationExpireDate;
 
 //FILE SHARING - SHAREBYMAIL

iOSClient/Library/OCCommunicationLib/OCCommunication.m

@@ -1352,13 +1352,13 @@
             
                 NSNumber *filesSharingPublicShareLinkEnabledNumber = (NSNumber*)[fileSharingPublic valueForKey:@"enabled"];
                 NSNumber *filesSharingAllowPublicUploadsEnabledNumber = (NSNumber*)[fileSharingPublic valueForKey:@"upload"];
-                NSNumber *filesSharingAllowPublicUserSendMailNotificationAboutShareLinkEnabledNumber = (NSNumber*)[fileSharingPublic valueForKey:@"send_mail"];
+                NSNumber *isFilesSharingAllowPublicUserSendMailNumber = (NSNumber*)[fileSharingPublic valueForKey:@"send_mail"];
                 NSNumber *filesSharingAllowPublicUploadFilesDrop = (NSNumber*)[fileSharingPublic valueForKey:@"upload_files_drop"];
                 NSNumber *filesSharingAllowPublicMultipleLinks = (NSNumber*)[fileSharingPublic valueForKey:@"multiple_links"];
                 
                 capabilities.isFilesSharingPublicShareLinkEnabled = filesSharingPublicShareLinkEnabledNumber.boolValue;
                 capabilities.isFilesSharingAllowPublicUploadsEnabled = filesSharingAllowPublicUploadsEnabledNumber.boolValue;
-                capabilities.isFilesSharingAllowPublicUserSendMailNotificationAboutShareLinkEnabled = filesSharingAllowPublicUserSendMailNotificationAboutShareLinkEnabledNumber.boolValue;
+                capabilities.isFilesSharingAllowPublicUserSendMail = isFilesSharingAllowPublicUserSendMailNumber.boolValue;
                 capabilities.isFilesSharingAllowPublicUploadFilesDrop = filesSharingAllowPublicUploadFilesDrop.boolValue;
                 capabilities.isFilesSharingAllowPublicMultipleLinks = filesSharingAllowPublicMultipleLinks.boolValue;
                 
@@ -1382,9 +1382,9 @@
 
                 NSDictionary *fileSharingUser = [fileSharing valueForKey:@"user"];
             
-                NSNumber *filesSharingAllowUserSendMailNotificationAboutOtherUsersEnabledNumber = (NSNumber*)[fileSharingUser valueForKey:@"send_mail"];
+                NSNumber *isFilesSharingAllowUserSendMailNumber = (NSNumber*)[fileSharingUser valueForKey:@"send_mail"];
             
-                capabilities.isFilesSharingAllowUserSendMailNotificationAboutOtherUsersEnabled = filesSharingAllowUserSendMailNotificationAboutOtherUsersEnabledNumber.boolValue;
+                capabilities.isFilesSharingAllowUserSendMail = isFilesSharingAllowUserSendMailNumber.boolValue;
             
                 NSDictionary *fileSharingUserExpireDate = [fileSharingUser valueForKey:@"expire_date"];
 
@@ -1411,12 +1411,12 @@
                 NSDictionary *fileSharingFederation = [fileSharing valueForKey:@"federation"];
                 NSDictionary *fileSharingFederationExpireDate = [fileSharingFederation valueForKey:@"expire_date"];
 
-                NSNumber *filesSharingFederationAllowUserSendSharesToOtherServersEnabledNumber = (NSNumber*)[fileSharingFederation valueForKey:@"outgoing"];
-                NSNumber *filesSharingFederationAllowUserReceiveSharesToOtherServersEnabledNumber = (NSNumber*)[fileSharingFederation valueForKey:@"incoming"];
+                NSNumber *filesSharingFederationAllowUserSendSharesNumber = (NSNumber*)[fileSharingFederation valueForKey:@"outgoing"];
+                NSNumber *filesSharingFederationAllowUserReceiveSharesNumber = (NSNumber*)[fileSharingFederation valueForKey:@"incoming"];
                 NSNumber *filesSharingFederationExpireDateNumber = (NSNumber*)[fileSharingFederationExpireDate valueForKey:@"enabled"];
 
-                capabilities.isFilesSharingFederationAllowUserSendSharesToOtherServersEnabled = filesSharingFederationAllowUserSendSharesToOtherServersEnabledNumber.boolValue;
-                capabilities.isFilesSharingFederationAllowUserReceiveSharesToOtherServersEnabled = filesSharingFederationAllowUserReceiveSharesToOtherServersEnabledNumber.boolValue;
+                capabilities.isFilesSharingFederationAllowUserSendShares = filesSharingFederationAllowUserSendSharesNumber.boolValue;
+                capabilities.isFilesSharingFederationAllowUserReceiveShares = filesSharingFederationAllowUserReceiveSharesNumber.boolValue;
                 capabilities.isFilesSharingFederationExpireDate = filesSharingFederationExpireDateNumber.boolValue;
             
                 //FILE SHARING - SHAREBYMAIL