test(testGetFileActivitiesFromDate): Removed deprecated file_trash_in…

…herited parameter test(testGetFileActivities): Removed deprecated file_restore_inherited parameter
Infomaniak · Aug 27, 2024 · 0d39e2c · 0d39e2c
1 parent 79e5d61
commit 0d39e2c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift b/kDrive/UI/View/Files/FileDetail/FileDetailActivityTableViewCell.swift
@@ -68,9 +68,9 @@ class FileDetailActivityTableViewCell: InsetTableViewCell {
             localizedKey = file.isDirectory ? "fileDetailsActivityFolderCreate" : "fileDetailsActivityFileCreate"
         case .fileRename:
             localizedKey = file.isDirectory ? "fileDetailsActivityFolderRename" : "fileDetailsActivityFileRename"
-        case .fileTrash, .fileTrashInherited:
+        case .fileTrash:
             localizedKey = file.isDirectory ? "fileDetailsActivityFolderTrash" : "fileDetailsActivityFileTrash"
-        case .fileRestore, .fileRestoreInherited:
+        case .fileRestore:
             localizedKey = file.isDirectory ? "fileDetailsActivityFolderRestore" : "fileDetailsActivityFileRestore"
         case .fileDelete:
             localizedKey = file.isDirectory ? "fileDetailsActivityFolderDelete" : "fileDetailsActivityFileDelete"

diff --git a/kDriveCore/Data/Cache/DriveFileManager/DriveFileManager+Listing.swift b/kDriveCore/Data/Cache/DriveFileManager/DriveFileManager+Listing.swift
@@ -89,7 +89,7 @@ public extension DriveFileManager {
             let fileUid = File.uid(driveId: directory.driveId, fileId: fileAction.fileId)
 
             switch fileAction.action {
-            case .fileDelete, .fileTrash, .fileTrashInherited:
+            case .fileDelete, .fileTrash:
                 removeFileInDatabase(fileUid: fileUid, cascade: true, writableRealm: writableRealm)
 
             case .fileMoveOut:
@@ -98,7 +98,7 @@ public extension DriveFileManager {
 
                 oldParent.children.remove(movedOutFile)
 
-            case .fileMoveIn, .fileRestore, .fileCreate, .fileRestoreInherited:
+            case .fileMoveIn, .fileRestore, .fileCreate:
                 keepCacheAttributesForFile(
                     newFile: actionFile,
                     keepProperties: [.standard, .extras],

diff --git a/kDriveCore/Data/Models/FileActivity.swift b/kDriveCore/Data/Models/FileActivity.swift
@@ -29,9 +29,7 @@ public enum FileActivityType: String, Codable, CaseIterable {
     case fileMoveIn = "file_move"
     case fileMoveOut = "file_move_out"
     case fileTrash = "file_trash"
-    case fileTrashInherited = "file_trash_inherited"
     case fileRestore = "file_restore"
-    case fileRestoreInherited = "file_restore_inherited"
     case fileDelete = "file_delete"
     case fileUpdate = "file_update"
     case fileCategorize = "file_categorize"
@@ -67,7 +65,6 @@ public enum FileActivityType: String, Codable, CaseIterable {
         .fileMoveIn,
         .fileMoveOut,
         .fileTrash,
-        .fileTrashInherited,
         .fileRestore,
         .fileDelete,
         .fileUpdate,