Deduplicator: Fix crash on <API34 using perceptual hash

d4rken-org · Nov 15, 2024 · da8dea4 · da8dea4
1 parent 68746db
commit da8dea4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app-common-io/src/main/java/eu/darken/sdmse/common/files/local/DirectLocalWalker.kt b/app-common-io/src/main/java/eu/darken/sdmse/common/files/local/DirectLocalWalker.kt
@@ -29,7 +29,7 @@ class DirectLocalWalker(
             return
         }
 
-        val queue = LinkedList(listOf(startLookUp))
+        val queue = LinkedList(mutableListOf(startLookUp))
 
         while (!queue.isEmpty()) {
             val lookUp = queue.removeFirst()

diff --git a/app/src/main/java/eu/darken/sdmse/common/debug/logviewer/ui/LogViewViewModel.kt b/app/src/main/java/eu/darken/sdmse/common/debug/logviewer/ui/LogViewViewModel.kt
@@ -8,8 +8,10 @@ import eu.darken.sdmse.common.debug.logging.logTag
 import eu.darken.sdmse.common.debug.logviewer.core.LogViewLogger
 import eu.darken.sdmse.common.flow.throttleLatest
 import eu.darken.sdmse.common.uix.ViewModel3
-import eu.darken.sdmse.main.ui.dashboard.items.*
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onStart
+import java.util.LinkedList
 import javax.inject.Inject
 
 @HiltViewModel
@@ -19,7 +21,7 @@ class LogViewViewModel @Inject constructor(
     private val logViewLogger: LogViewLogger,
 ) : ViewModel3(dispatcherProvider = dispatcherProvider) {
 
-    private val currentLog = mutableListOf<LogViewerAdapter.LogViewerRow.Item>()
+    private val currentLog = LinkedList<LogViewerAdapter.LogViewerRow.Item>()
 
     val log = logViewLogger.lines
         .map {

diff --git a/app/src/main/java/eu/darken/sdmse/deduplicator/core/scanner/phash/PHashSleuth.kt b/app/src/main/java/eu/darken/sdmse/deduplicator/core/scanner/phash/PHashSleuth.kt
@@ -63,6 +63,7 @@ import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.isActive
 import java.io.IOException
+import java.util.LinkedList
 import java.util.UUID
 import javax.inject.Inject
 import javax.inject.Provider
@@ -194,7 +195,7 @@ class PHashSleuth @Inject constructor(
             .toMap()
 
         val requiredSim = 0.95f
-        val remainingItems = hashedItems.keys.toMutableList()
+        val remainingItems = LinkedList(hashedItems.keys)
         val hashBuckets = mutableSetOf<Set<Pair<APathLookup<*>, Double>>>()
 
         updateProgressCount(Progress.Count.Percent(remainingItems.size))