Fix order of files for deletion criteria

TeamAmaze · Aug 28, 2023 · 91dfdac · 91dfdac
1 parent acdf63c
commit 91dfdac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/trashbin/src/main/java/com/amaze/trashbin/TrashBin.kt b/trashbin/src/main/java/com/amaze/trashbin/TrashBin.kt
@@ -90,9 +90,9 @@ class TrashBin constructor(
         filesMetadata.forEach {
             totalSize += it.sizeBytes
         }
-        filesMetadata.sortedBy {
+        filesMetadata.sortedByDescending {
             trashBinFile ->
-            trashBinFile.deleteTime?.times(-1)
+            trashBinFile.deleteTime
         }
         writeMetadataAndTriggerCleanup(filesMetadata, totalSize, doTriggerCleanup)
         return true
@@ -157,9 +157,9 @@ class TrashBin constructor(
         filesMetadata.forEach {
             totalSize += it.sizeBytes
         }
-        filesMetadata.sortedBy {
+        filesMetadata.sortedByDescending {
             trashBinFile ->
-            trashBinFile.deleteTime?.times(-1)
+            trashBinFile.deleteTime
         }
         writeMetadataAndTriggerCleanup(filesMetadata, totalSize, doTriggerCleanup)
         return true

diff --git a/trashbin/src/main/java/com/amaze/trashbin/TrashBinMetadata.kt b/trashbin/src/main/java/com/amaze/trashbin/TrashBinMetadata.kt
@@ -52,7 +52,7 @@ data class TrashBinMetadata(
     fun getFilesWithDeletionCriteria(): List<TrashBinFile> {
         var totalBytes = totalSize
         var numOfFiles = files.size
-        return files.sortedBy { it.deleteTime }.filter {
+        return files.sortedByDescending { it.deleteTime }.filter {
             file ->
             if (config.retentionNumOfFiles != TrashBinConfig.RETENTION_NUM_OF_FILES &&
                 numOfFiles > config.retentionNumOfFiles