From 3712f9fb262d79b7dd0e4698234a02cb10e0b302 Mon Sep 17 00:00:00 2001
From: Naveen <snaveen935@gmail.com>
Date: Wed, 13 Mar 2024 19:40:50 +0530
Subject: [PATCH] Move IO operation to background thread

This was causing ANRs when zip files contained more than a few entries.
---
 .../activities/DecompressActivity.kt          | 66 ++++++++++++++-----
 .../main/res/layout/activity_decompress.xml   |  8 +++
 2 files changed, 58 insertions(+), 16 deletions(-)

diff --git a/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt b/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
index 3c2d67e3..0c1c6ef4 100644
--- a/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
+++ b/app/src/main/kotlin/org/fossify/filemanager/activities/DecompressActivity.kt
@@ -1,6 +1,5 @@
 package org.fossify.filemanager.activities
 
-import android.annotation.SuppressLint
 import android.net.Uri
 import android.os.Bundle
 import net.lingala.zip4j.exception.ZipException
@@ -76,11 +75,6 @@ class DecompressActivity : SimpleActivity() {
         }
     }
 
-    private fun setupFilesList() {
-        fillAllListItems(uri!!)
-        updateCurrentPath("")
-    }
-
     override fun onBackPressed() {
         if (currentPath.isEmpty()) {
             super.onBackPressed()
@@ -90,10 +84,24 @@ class DecompressActivity : SimpleActivity() {
         }
     }
 
+    private fun setupFilesList() {
+        fillAllListItems(uri!!) {
+            updateCurrentPath("")
+        }
+    }
+
     private fun updateCurrentPath(path: String) {
         currentPath = path
         try {
             val listItems = getFolderItems(currentPath)
+            updateAdapter(listItems = listItems)
+        } catch (e: Exception) {
+            showErrorToast(e)
+        }
+    }
+
+    private fun updateAdapter(listItems: MutableList<ListItem>) {
+        runOnUiThread {
             DecompressItemsAdapter(this, listItems, binding.decompressList) {
                 if ((it as ListItem).isDirectory) {
                     updateCurrentPath(it.path)
@@ -101,8 +109,6 @@ class DecompressActivity : SimpleActivity() {
             }.apply {
                 binding.decompressList.adapter = this
             }
-        } catch (e: Exception) {
-            showErrorToast(e)
         }
     }
 
@@ -183,13 +189,12 @@ class DecompressActivity : SimpleActivity() {
         }.sortedWith(compareBy({ !it.isDirectory }, { it.mName })).toMutableList() as ArrayList<ListItem>
     }
 
-    @SuppressLint("NewApi")
-    private fun fillAllListItems(uri: Uri) {
+    private fun fillAllListItems(uri: Uri, callback: () -> Unit) = ensureBackgroundThread {
         val inputStream = try {
             contentResolver.openInputStream(uri)
         } catch (e: Exception) {
             showErrorToast(e)
-            return
+            return@ensureBackgroundThread
         }
 
         val zipInputStream = ZipInputStream(BufferedInputStream(inputStream))
@@ -206,9 +211,11 @@ class DecompressActivity : SimpleActivity() {
                         toast(getString(R.string.invalid_password))
                         passwordDialog?.clearPassword()
                     } else {
-                        askForPassword()
+                        runOnUiThread {
+                            askForPassword()
+                        }
                     }
-                    return
+                    return@ensureBackgroundThread
                 } else {
                     break
                 }
@@ -220,12 +227,39 @@ class DecompressActivity : SimpleActivity() {
                 break
             }
 
+            // Show progress bar only after password dialog is dismissed.
+            runOnUiThread {
+                if (binding.progressIndicator.isGone()) {
+                    binding.progressIndicator.show()
+                }
+            }
+
+            if (passwordDialog != null) {
+                passwordDialog?.dismiss(notify = false)
+                passwordDialog = null
+            }
+
             val lastModified = if (isOreoPlus()) zipEntry.lastModifiedTime else 0
             val filename = zipEntry.fileName.removeSuffix("/")
-            val listItem = ListItem(filename, filename.getFilenameFromPath(), zipEntry.isDirectory, 0, 0L, lastModified, false, false)
-            allFiles.add(listItem)
+            allFiles.add(
+                ListItem(
+                    mPath = filename,
+                    mName = filename.getFilenameFromPath(),
+                    mIsDirectory = zipEntry.isDirectory,
+                    mChildren = 0,
+                    mSize = 0L,
+                    mModified = lastModified,
+                    isSectionTitle = false,
+                    isGridTypeDivider = false
+                )
+            )
         }
-        passwordDialog?.dismiss(notify = false)
+
+        runOnUiThread {
+            binding.progressIndicator.hide()
+        }
+
+        callback()
     }
 
     private fun askForPassword() {
diff --git a/app/src/main/res/layout/activity_decompress.xml b/app/src/main/res/layout/activity_decompress.xml
index 8a4fa560..d2ee6c96 100644
--- a/app/src/main/res/layout/activity_decompress.xml
+++ b/app/src/main/res/layout/activity_decompress.xml
@@ -32,4 +32,12 @@
             app:layoutManager="org.fossify.commons.views.MyLinearLayoutManager" />
 
     </RelativeLayout>
+
+    <com.google.android.material.progressindicator.CircularProgressIndicator
+        android:id="@+id/progress_indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:visibility="gone" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>