marinofaggiana il y a 4 ans
Parent
commit
55c73bd71c

+ 1 - 1
iOSClient/CCGlobal.h

@@ -84,7 +84,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         102
+#define k_databaseSchemaVersion                         103
 
 // Intro selector
 #define k_intro_login                                   0

+ 0 - 57
iOSClient/Database/NCDatabase.swift

@@ -156,63 +156,6 @@ class tableCapabilities: Object {
     
     @objc dynamic var account = ""
     @objc dynamic var jsondata: Data? = nil
-    @objc dynamic var themingBackground = ""
-    @objc dynamic var themingBackgroundDefault: Bool = false
-    @objc dynamic var themingBackgroundPlain: Bool = false
-    @objc dynamic var themingColor = ""
-    @objc dynamic var themingColorElement = ""
-    @objc dynamic var themingColorText = ""
-    @objc dynamic var themingLogo = ""
-    @objc dynamic var themingName = ""
-    @objc dynamic var themingSlogan = ""
-    @objc dynamic var themingUrl = ""
-    @objc dynamic var versionMajor: Int = 0
-    @objc dynamic var versionMicro: Int = 0
-    @objc dynamic var versionMinor: Int = 0
-    @objc dynamic var versionString = ""
-    @objc dynamic var endToEndEncryption: Bool = false
-    @objc dynamic var endToEndEncryptionVersion = ""
-    let richdocumentsMimetypes = List<String>()
-    @objc dynamic var richdocumentsDirectEditing: Bool = false
-    // FILES SHARING
-    @objc dynamic var isFilesSharingAPIEnabled: Bool = false
-    @objc dynamic var filesSharingDefaulPermissions: Int = 0
-    @objc dynamic var isFilesSharingGroupSharing: Bool = false
-    @objc dynamic var isFilesSharingReSharing: Bool = false
-    @objc dynamic var isFilesSharingPublicShareLinkEnabled: Bool = false
-    @objc dynamic var isFilesSharingAllowPublicUploadsEnabled: 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 isFilesSharingAllowUserSendMail: Bool = false
-    @objc dynamic var isFilesSharingUserExpireDate: Bool = false
-    @objc dynamic var isFilesSharingGroupEnabled: Bool = false
-    @objc dynamic var isFilesSharingGroupExpireDate: 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
-    @objc dynamic var isFileSharingShareByMailUploadFilesDrop: Bool = false
-    // HC
-    @objc dynamic var isHandwerkcloudEnabled: Bool = false
-    @objc dynamic var HCShopUrl = ""
-    // Imagemeter
-    @objc dynamic var isImagemeterEnabled: Bool = false
-    // Fulltextsearch
-    @objc dynamic var isFulltextsearchEnabled: Bool = false
-    // Extended Support
-    @objc dynamic var isExtendedSupportEnabled: Bool = false
-    // Pagination iOS Helper
-    @objc dynamic var isPaginationEnabled: Bool = false
-    @objc dynamic var paginationEndponit = ""
-    // Core
-    @objc dynamic var corePollInterval: Int = 0
-    @objc dynamic var coreWebDavRoot = ""
 }
 
 class tableComments: Object {

+ 0 - 103
iOSClient/Database/NCManageDatabase.swift

@@ -1142,109 +1142,6 @@ class NCManageDatabase: NSObject {
             return false
         }
     }
-        
-    #if !EXTENSION
-    @objc func addCapabilities(_ capabilities: OCCapabilities, account: String) {
-        
-        let realm = try! Realm()
-
-        do {
-            try realm.write {
-            
-                let result = realm.objects(tableCapabilities.self).filter("account == %@", account).first
-
-                var resultCapabilities = tableCapabilities()
-            
-                if let result = result {
-                    resultCapabilities = result
-                }
-                
-                resultCapabilities.account = account
-                resultCapabilities.themingBackground = capabilities.themingBackground
-                resultCapabilities.themingBackgroundDefault = capabilities.themingBackgroundDefault
-                resultCapabilities.themingBackgroundPlain = capabilities.themingBackgroundPlain
-                resultCapabilities.themingColor = capabilities.themingColor
-                resultCapabilities.themingColorElement = capabilities.themingColorElement
-                resultCapabilities.themingColorText = capabilities.themingColorText
-                resultCapabilities.themingLogo = capabilities.themingLogo
-                resultCapabilities.themingName = capabilities.themingName
-                resultCapabilities.themingSlogan = capabilities.themingSlogan
-                resultCapabilities.themingUrl = capabilities.themingUrl
-                
-                resultCapabilities.versionMajor = capabilities.versionMajor
-                resultCapabilities.versionMinor = capabilities.versionMinor
-                resultCapabilities.versionMicro = capabilities.versionMicro
-                resultCapabilities.versionString = capabilities.versionString
-                
-                resultCapabilities.endToEndEncryption = capabilities.isEndToEndEncryptionEnabled
-                resultCapabilities.endToEndEncryptionVersion = capabilities.endToEndEncryptionVersion
-                
-                resultCapabilities.richdocumentsMimetypes.removeAll()
-                for mimeType in capabilities.richdocumentsMimetypes {
-                    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
-                
-                // HC
-                resultCapabilities.isHandwerkcloudEnabled = capabilities.isHandwerkcloudEnabled
-                resultCapabilities.HCShopUrl = capabilities.hcShopUrl
-                
-                // Imagemeter
-                resultCapabilities.isImagemeterEnabled = capabilities.isImagemeterEnabled
-                
-                // Fulltextsearch
-                resultCapabilities.isFulltextsearchEnabled = capabilities.isFulltextsearchEnabled
-                
-                // Extended Support
-                resultCapabilities.isExtendedSupportEnabled = capabilities.isExtendedSupportEnabled
-                
-                // Pagination iOS Helper
-                resultCapabilities.isPaginationEnabled = capabilities.isPaginationEnabled
-                resultCapabilities.paginationEndponit = capabilities.paginationEndponit
-                
-                // Core
-                resultCapabilities.corePollInterval = capabilities.corePollInterval
-                resultCapabilities.coreWebDavRoot = capabilities.coreWebDavRoot
-                
-                if result == nil {
-                    realm.add(resultCapabilities)
-                }
-            }
-        } catch let error {
-            print("[LOG] Could not write to database: ", error)
-        }
-    }
-    #endif
     
     //MARK: -
     //MARK: Table Comments