fix threading at conflict resolution at decompressing

tibbi · tibbi · commit 52035a920ad4 · 2023-01-18T22:13:43.000+01:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/adapters/ItemsAdapter.kt
@@ -545,9 +545,11 @@ class ItemsAdapter(
                     }
                     zipInputStream.closeEntry()
                     val destinationPath = fileDirItems.first().getParentPath().trimEnd('/')
-                    activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {
-                        ensureBackgroundThread {
-                            decompressPaths(sourcePaths, it, callback)
+                    activity.runOnUiThread {
+                        activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {
+                            ensureBackgroundThread {
+                                decompressPaths(sourcePaths, it, callback)
+                            }
                         }
                     }
                 } catch (exception: Exception) {

Original file line number	Diff line number	Diff line change
`@@ -545,9 +545,11 @@ class ItemsAdapter(`
`545`	`545`	`}`
`546`	`546`	`zipInputStream.closeEntry()`
`547`	`547`	`val destinationPath = fileDirItems.first().getParentPath().trimEnd('/')`
`548`		`- activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {`
`549`		`- ensureBackgroundThread {`
`550`		`- decompressPaths(sourcePaths, it, callback)`
	`548`	`+ activity.runOnUiThread {`
	`549`	`+ activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {`
	`550`	`+ ensureBackgroundThread {`
	`551`	`+ decompressPaths(sourcePaths, it, callback)`
	`552`	`+ }`
`551`	`553`	`}`
`552`	`554`	`}`
`553`	`555`	`} catch (exception: Exception) {`