Fixed trash size

D4rK7355608 · Oct 22, 2024 · d1ee539 · d1ee539
1 parent a037831
commit d1ee539
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt b/app/src/main/kotlin/com/d4rk/cleaner/data/datastore/DataStore.kt
@@ -225,6 +225,13 @@ class DataStore(context : Context) {
         }
     }
 
+    suspend fun subtractTrashSize(size: Long) {
+        dataStore.edit { settings ->
+            val currentSize = settings[trashSizeKey] ?: 0L
+            settings[trashSizeKey] = (currentSize - size).coerceAtLeast(0L)
+        }
+    }
+
     private val genericFilterKey =
             booleanPreferencesKey(name = DataStoreNamesConstants.DATA_STORE_GENERIC_FILTER)
     val genericFilter : Flow<Boolean> = dataStore.data.map { preferences ->

diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/home/repository/HomeRepository.kt
@@ -36,7 +36,7 @@ class HomeRepository(
         }
     }
 
-    suspend fun getLastScanInfo(onSuccess: (Int) -> Unit) {
+    suspend fun getLastScanInfo(onSuccess : (Int) -> Unit) {
         withContext(Dispatchers.IO) {
             dataStore.lastScanTimestamp.firstOrNull()?.let { timestamp ->
                 val daysFromLastScan = calculateDaysSince(timestamp)
@@ -140,10 +140,6 @@ class HomeRepository(
         }
     }
 
-    suspend fun addTrashSize(size: Long) {
-        dataStore.addTrashSize(size)
-    }
-
     /**
      * Restores the specified files from the trash directory.
      * @param filesToRestore The set of files to restore from trash.
@@ -159,4 +155,12 @@ class HomeRepository(
             }
         }
     }
+
+    suspend fun addTrashSize(size : Long) {
+        dataStore.addTrashSize(size)
+    }
+
+    suspend fun subtractTrashSize(size : Long) {
+        dataStore.subtractTrashSize(size)
+    }
 }
diff --git a/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashViewModel.kt b/app/src/main/kotlin/com/d4rk/cleaner/ui/screens/trash/TrashViewModel.kt
@@ -51,6 +51,7 @@ class TrashViewModel(application : Application) : BaseViewModel(application) {
             repository.restoreFromTrash(filesToRestore) {
                 loadTrashItems()
             }
+            repository.subtractTrashSize(filesToRestore.sumOf { it.length() })
             hideLoading()
         }
     }
@@ -64,6 +65,7 @@ class TrashViewModel(application : Application) : BaseViewModel(application) {
             repository.deleteFiles(filesToDelete) {
                 loadTrashItems()
             }
+            repository.subtractTrashSize(filesToDelete.sumOf { it.length() })
             hideLoading()
             println("Cleaner for Android -> Hiding loading indicator")
         }