marinofaggiana %!s(int64=3) %!d(string=hai) anos
pai
achega
fce7ede91b

+ 1 - 1
Nextcloud.xcodeproj/project.pbxproj

@@ -2913,7 +2913,7 @@
 			repositoryURL = "https://github.com/nextcloud/ios-communication-library/";
 			requirement = {
 				kind = revision;
-				revision = 5ae5cba7601eee5666873cb27d605c5b7ca4d9a3;
+				revision = e45c8a1f224d6bedbdf4318e3cba18f3ab05fae3;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

+ 1 - 1
Nextcloud.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -105,7 +105,7 @@
         "repositoryURL": "https://github.com/nextcloud/ios-communication-library/",
         "state": {
           "branch": null,
-          "revision": "5ae5cba7601eee5666873cb27d605c5b7ca4d9a3",
+          "revision": "e45c8a1f224d6bedbdf4318e3cba18f3ab05fae3",
           "version": null
         }
       },

+ 1 - 1
iOSClient/Data/NCDatabase.swift

@@ -455,6 +455,7 @@ class tableTag: Object {
 class tableTrash: Object {
     
     @objc dynamic var account = ""
+    @objc dynamic var classFile = ""
     @objc dynamic var contentType = ""
     @objc dynamic var date = NSDate()
     @objc dynamic var directory: Bool = false
@@ -464,7 +465,6 @@ class tableTrash: Object {
     @objc dynamic var hasPreview: Bool = false
     @objc dynamic var iconName = ""
     @objc dynamic var size: Int64 = 0
-    @objc dynamic var typeFile = ""
     @objc dynamic var trashbinFileName = ""
     @objc dynamic var trashbinOriginalLocation = ""
     @objc dynamic var trashbinDeletionTime = NSDate()

+ 3 - 2
iOSClient/Data/NCManageDatabase.swift

@@ -116,12 +116,13 @@ class NCManageDatabase: NSObject {
                         }
                     }
                     
-                    if oldSchemaVersion < 191 {
+                    if oldSchemaVersion < 193 {
                         migration.deleteData(forType: tableDirectory.className())
                         migration.deleteData(forType: tableE2eEncryption.className())
                         migration.deleteData(forType: tableE2eEncryptionLock.className())
                         migration.deleteData(forType: tableMetadata.className())
                         migration.deleteData(forType: tableShare.className())
+                        migration.deleteData(forType: tableTrash.className())
                     }
                     
                 }, shouldCompactOnLaunch: { totalBytes, usedBytes in
@@ -2875,7 +2876,7 @@ class NCManageDatabase: NSObject {
                     object.trashbinDeletionTime = trash.trashbinDeletionTime
                     object.trashbinFileName = trash.trashbinFileName
                     object.trashbinOriginalLocation = trash.trashbinOriginalLocation
-                    object.typeFile = trash.typeFile
+                    object.classFile = trash.classFile
                     
                     realm.add(object, update: .all)
                 }

+ 1 - 1
iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -340,7 +340,7 @@ extension NCCollectionViewCommon {
         // USE AS BACKGROUND
         //
         if #available(iOS 13.0, *) {
-            if metadata.typeFile == NCGlobal.shared.metadataClassImage && self.layoutKey == NCGlobal.shared.layoutViewFiles && !NCBrandOptions.shared.disable_background_image {
+            if metadata.classFile == NCGlobal.shared.metadataClassImage && self.layoutKey == NCGlobal.shared.layoutViewFiles && !NCBrandOptions.shared.disable_background_image {
                 actions.append(
                     NCMenuAction(
                         title: NSLocalizedString("_use_as_background_", comment: ""),

+ 1 - 1
iOSClient/NCGlobal.swift

@@ -79,7 +79,7 @@ class NCGlobal: NSObject {
     // Database Realm
     //
     let databaseDefault                             = "nextcloud.realm"
-    let databaseSchemaVersion: UInt64               = 191
+    let databaseSchemaVersion: UInt64               = 193
     
     // Intro selector
     //

+ 1 - 1
iOSClient/Viewer/NCViewerProviderContextMenu.swift

@@ -102,7 +102,7 @@ class NCViewerProviderContextMenu: UIViewController  {
             }
             
             // AUTO DOWNLOAD VIDEO / AUDIO
-            // if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.typeFile == NCGlobal.shared.metadataClassVideo || metadata.typeFile == NCGlobal.shared.metadataClassFileAudio || metadata.contentType == "application/pdf") {
+            // if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassFileAudio || metadata.contentType == "application/pdf") {
             if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) && (metadata.classFile == NCGlobal.shared.metadataClassVideo || metadata.classFile == NCGlobal.shared.metadataClassFileAudio) {
                 
                 var maxDownload: UInt64 = 0