create new threads only when needed

tibbi · tibbi · commit efa5f1575168 · 2019-12-18T11:42:49.000+01:00
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/MainActivity.kt
@@ -220,14 +220,14 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun checkOTGPath() {
-        Thread {
+        ensureBackgroundThread {
             if (!config.wasOTGHandled && hasPermission(PERMISSION_WRITE_STORAGE) && hasOTGConnected() && config.OTGPath.isEmpty()) {
                 getStorageDirectories().firstOrNull { it.trimEnd('/') != internalStoragePath && it.trimEnd('/') != sdCardPath }?.apply {
                     config.wasOTGHandled = true
                     config.OTGPath = trimEnd('/')
                 }
             }
-        }.start()
+        }
     }
 
     private fun openPath(path: String, forceRefresh: Boolean = false) {
@@ -336,24 +336,24 @@ class MainActivity : SimpleActivity() {
     }
 
     private fun checkIfRootAvailable() {
-        Thread {
+        ensureBackgroundThread {
             config.isRootAvailable = RootTools.isRootAvailable()
             if (config.isRootAvailable && config.enableRootAccess) {
                 RootHelpers(this).askRootIfNeeded {
                     config.enableRootAccess = it
                 }
             }
-        }.start()
+        }
     }
 
     private fun checkInvalidFavorites() {
-        Thread {
+        ensureBackgroundThread {
             config.favorites.forEach {
                 if (!isPathOnOTG(it) && !isPathOnSD(it) && !File(it).exists()) {
                     config.removeFavorite(it)
                 }
             }
-        }.start()
+        }
     }
 
     fun pickedPath(path: String) {
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
@@ -25,6 +25,7 @@ import com.simplemobiletools.commons.dialogs.*
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE
 import com.simplemobiletools.commons.helpers.CONFLICT_SKIP
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.commons.helpers.isOreoPlus
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.models.RadioItem
@@ -229,15 +230,15 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
     }
 
     private fun toggleFileVisibility(hide: Boolean) {
-        Thread {
+        ensureBackgroundThread {
             getSelectedFileDirItems().forEach {
                 activity.toggleItemVisibility(it.path, hide)
             }
             activity.runOnUiThread {
                 listener?.refreshItems()
                 finishActMode()
             }
-        }.start()
+        }
     }
 
     @SuppressLint("NewApi")
@@ -269,7 +270,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
         if (activity.getIsPathDirectory(path)) {
             callback()
         } else {
-            Thread {
+            ensureBackgroundThread {
                 val options = RequestOptions()
                         .format(DecodeFormat.PREFER_ARGB_8888)
                         .skipMemoryCache(true)
@@ -296,7 +297,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
                 activity.runOnUiThread {
                     callback()
                 }
-            }.start()
+            }
         }
     }
 
@@ -370,7 +371,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
 
     private fun copyMoveRootItems(files: ArrayList<FileDirItem>, destinationPath: String, isCopyOperation: Boolean) {
         activity.toast(R.string.copying)
-        Thread {
+        ensureBackgroundThread {
             val fileCnt = files.size
             RootHelpers(activity).copyMoveFiles(files, destinationPath, isCopyOperation) {
                 when (it) {
@@ -384,7 +385,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
                     finishActMode()
                 }
             }
-        }.start()
+        }
     }
 
     private fun compressSelection() {
@@ -403,7 +404,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
 
                 activity.toast(R.string.compressing)
                 val paths = getSelectedFileDirItems().map { it.path }
-                Thread {
+                ensureBackgroundThread {
                     if (compressPaths(paths, destination)) {
                         activity.runOnUiThread {
                             activity.toast(R.string.compression_successful)
@@ -413,7 +414,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
                     } else {
                         activity.toast(R.string.compressing_failed)
                     }
-                }.start()
+                }
             }
         }
     }
@@ -460,9 +461,9 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
 
                 val destinationPath = fileDirItems.first().getParentPath().trimEnd('/')
                 activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {
-                    Thread {
+                    ensureBackgroundThread {
                         decompressPaths(sourcePaths, it, callback)
-                    }.start()
+                    }
                 }
             } catch (exception: Exception) {
                 activity.showErrorToast(exception)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/fragments/ItemsFragment.kt
@@ -10,6 +10,7 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.StoragePickerDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.SORT_BY_SIZE
+import com.simplemobiletools.commons.helpers.ensureBackgroundThread
 import com.simplemobiletools.commons.models.FileDirItem
 import com.simplemobiletools.commons.views.Breadcrumbs
 import com.simplemobiletools.commons.views.MyLinearLayoutManager
@@ -173,7 +174,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
 
     private fun getItems(path: String, callback: (originalPath: String, items: ArrayList<ListItem>) -> Unit) {
         skipItemUpdating = false
-        Thread {
+        ensureBackgroundThread {
             if (activity?.isDestroyed == false && activity?.isFinishing == false) {
                 val config = context!!.config
                 if (context!!.isPathOnOTG(path) && config.OTGTreeUri.isNotEmpty()) {
@@ -187,7 +188,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
                     RootHelpers(activity!!).getFiles(path, callback)
                 }
             }
-        }.start()
+        }
     }
 
     private fun getRegularItemsOf(path: String, callback: (originalPath: String, items: ArrayList<ListItem>) -> Unit) {
@@ -268,9 +269,9 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
     fun searchQueryChanged(text: String) {
         val searchText = text.trim()
         lastSearchedText = searchText
-        Thread {
+        ensureBackgroundThread {
             if (context == null) {
-                return@Thread
+                return@ensureBackgroundThread
             }
 
             when {
@@ -292,7 +293,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
                 else -> {
                     val files = searchFiles(searchText, currentPath)
                     if (lastSearchedText != searchText) {
-                        return@Thread
+                        return@ensureBackgroundThread
                     }
 
                     val listItems = ArrayList<ListItem>()
@@ -317,7 +318,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
                     }
                 }
             }
-        }.start()
+        }
     }
 
     private fun searchFiles(text: String, path: String): ArrayList<ListItem> {

Original file line number	Diff line number	Diff line change
`@@ -220,14 +220,14 @@ class MainActivity : SimpleActivity() {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`private fun checkOTGPath() {`
`223`		`- Thread {`
	`223`	`+ ensureBackgroundThread {`
`224`	`224`	`if (!config.wasOTGHandled && hasPermission(PERMISSION_WRITE_STORAGE) && hasOTGConnected() && config.OTGPath.isEmpty()) {`
`225`	`225`	`getStorageDirectories().firstOrNull { it.trimEnd('/') != internalStoragePath && it.trimEnd('/') != sdCardPath }?.apply {`
`226`	`226`	`config.wasOTGHandled = true`
`227`	`227`	`config.OTGPath = trimEnd('/')`
`228`	`228`	`}`
`229`	`229`	`}`
`230`		`- }.start()`
	`230`	`+ }`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`private fun openPath(path: String, forceRefresh: Boolean = false) {`
`@@ -336,24 +336,24 @@ class MainActivity : SimpleActivity() {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`private fun checkIfRootAvailable() {`
`339`		`- Thread {`
	`339`	`+ ensureBackgroundThread {`
`340`	`340`	`config.isRootAvailable = RootTools.isRootAvailable()`
`341`	`341`	`if (config.isRootAvailable && config.enableRootAccess) {`
`342`	`342`	`RootHelpers(this).askRootIfNeeded {`
`343`	`343`	`config.enableRootAccess = it`
`344`	`344`	`}`
`345`	`345`	`}`
`346`		`- }.start()`
	`346`	`+ }`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`private fun checkInvalidFavorites() {`
`350`		`- Thread {`
	`350`	`+ ensureBackgroundThread {`
`351`	`351`	`config.favorites.forEach {`
`352`	`352`	`if (!isPathOnOTG(it) && !isPathOnSD(it) && !File(it).exists()) {`
`353`	`353`	`config.removeFavorite(it)`
`354`	`354`	`}`
`355`	`355`	`}`
`356`		`- }.start()`
	`356`	`+ }`
`357`	`357`	`}`
`358`	`358`
`359`	`359`	`fun pickedPath(path: String) {`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import com.simplemobiletools.commons.dialogs.*`
`25`	`25`	`import com.simplemobiletools.commons.extensions.*`
`26`	`26`	`import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE`
`27`	`27`	`import com.simplemobiletools.commons.helpers.CONFLICT_SKIP`
	`28`	`+import com.simplemobiletools.commons.helpers.ensureBackgroundThread`
`28`	`29`	`import com.simplemobiletools.commons.helpers.isOreoPlus`
`29`	`30`	`import com.simplemobiletools.commons.models.FileDirItem`
`30`	`31`	`import com.simplemobiletools.commons.models.RadioItem`
`@@ -229,15 +230,15 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`229`	`230`	`}`
`230`	`231`
`231`	`232`	`private fun toggleFileVisibility(hide: Boolean) {`
`232`		`- Thread {`
	`233`	`+ ensureBackgroundThread {`
`233`	`234`	`getSelectedFileDirItems().forEach {`
`234`	`235`	`activity.toggleItemVisibility(it.path, hide)`
`235`	`236`	`}`
`236`	`237`	`activity.runOnUiThread {`
`237`	`238`	`listener?.refreshItems()`
`238`	`239`	`finishActMode()`
`239`	`240`	`}`
`240`		`- }.start()`
	`241`	`+ }`
`241`	`242`	`}`
`242`	`243`
`243`	`244`	`@SuppressLint("NewApi")`
`@@ -269,7 +270,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`269`	`270`	`if (activity.getIsPathDirectory(path)) {`
`270`	`271`	`callback()`
`271`	`272`	`} else {`
`272`		`- Thread {`
	`273`	`+ ensureBackgroundThread {`
`273`	`274`	`val options = RequestOptions()`
`274`	`275`	`.format(DecodeFormat.PREFER_ARGB_8888)`
`275`	`276`	`.skipMemoryCache(true)`
`@@ -296,7 +297,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`296`	`297`	`activity.runOnUiThread {`
`297`	`298`	`callback()`
`298`	`299`	`}`
`299`		`- }.start()`
	`300`	`+ }`
`300`	`301`	`}`
`301`	`302`	`}`
`302`	`303`
`@@ -370,7 +371,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`370`	`371`
`371`	`372`	`private fun copyMoveRootItems(files: ArrayList<FileDirItem>, destinationPath: String, isCopyOperation: Boolean) {`
`372`	`373`	`activity.toast(R.string.copying)`
`373`		`- Thread {`
	`374`	`+ ensureBackgroundThread {`
`374`	`375`	`val fileCnt = files.size`
`375`	`376`	`RootHelpers(activity).copyMoveFiles(files, destinationPath, isCopyOperation) {`
`376`	`377`	`when (it) {`
`@@ -384,7 +385,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`384`	`385`	`finishActMode()`
`385`	`386`	`}`
`386`	`387`	`}`
`387`		`- }.start()`
	`388`	`+ }`
`388`	`389`	`}`
`389`	`390`
`390`	`391`	`private fun compressSelection() {`
`@@ -403,7 +404,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`403`	`404`
`404`	`405`	`activity.toast(R.string.compressing)`
`405`	`406`	`val paths = getSelectedFileDirItems().map { it.path }`
`406`		`- Thread {`
	`407`	`+ ensureBackgroundThread {`
`407`	`408`	`if (compressPaths(paths, destination)) {`
`408`	`409`	`activity.runOnUiThread {`
`409`	`410`	`activity.toast(R.string.compression_successful)`
`@@ -413,7 +414,7 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`413`	`414`	`} else {`
`414`	`415`	`activity.toast(R.string.compressing_failed)`
`415`	`416`	`}`
`416`		`- }.start()`
	`417`	`+ }`
`417`	`418`	`}`
`418`	`419`	`}`
`419`	`420`	`}`
`@@ -460,9 +461,9 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem`
`460`	`461`
`461`	`462`	`val destinationPath = fileDirItems.first().getParentPath().trimEnd('/')`
`462`	`463`	`activity.checkConflicts(fileDirItems, destinationPath, 0, LinkedHashMap()) {`
`463`		`- Thread {`
	`464`	`+ ensureBackgroundThread {`
`464`	`465`	`decompressPaths(sourcePaths, it, callback)`
`465`		`- }.start()`
	`466`	`+ }`
`466`	`467`	`}`
`467`	`468`	`} catch (exception: Exception) {`
`468`	`469`	`activity.showErrorToast(exception)`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import com.simplemobiletools.commons.activities.BaseSimpleActivity`
`10`	`10`	`import com.simplemobiletools.commons.dialogs.StoragePickerDialog`
`11`	`11`	`import com.simplemobiletools.commons.extensions.*`
`12`	`12`	`import com.simplemobiletools.commons.helpers.SORT_BY_SIZE`
	`13`	`+import com.simplemobiletools.commons.helpers.ensureBackgroundThread`
`13`	`14`	`import com.simplemobiletools.commons.models.FileDirItem`
`14`	`15`	`import com.simplemobiletools.commons.views.Breadcrumbs`
`15`	`16`	`import com.simplemobiletools.commons.views.MyLinearLayoutManager`
`@@ -173,7 +174,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb`
`173`	`174`
`174`	`175`	`private fun getItems(path: String, callback: (originalPath: String, items: ArrayList<ListItem>) -> Unit) {`
`175`	`176`	`skipItemUpdating = false`
`176`		`- Thread {`
	`177`	`+ ensureBackgroundThread {`
`177`	`178`	`if (activity?.isDestroyed == false && activity?.isFinishing == false) {`
`178`	`179`	`val config = context!!.config`
`179`	`180`	`if (context!!.isPathOnOTG(path) && config.OTGTreeUri.isNotEmpty()) {`
`@@ -187,7 +188,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb`
`187`	`188`	`RootHelpers(activity!!).getFiles(path, callback)`
`188`	`189`	`}`
`189`	`190`	`}`
`190`		`- }.start()`
	`191`	`+ }`
`191`	`192`	`}`
`192`	`193`
`193`	`194`	`private fun getRegularItemsOf(path: String, callback: (originalPath: String, items: ArrayList<ListItem>) -> Unit) {`
`@@ -268,9 +269,9 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb`
`268`	`269`	`fun searchQueryChanged(text: String) {`
`269`	`270`	`val searchText = text.trim()`
`270`	`271`	`lastSearchedText = searchText`
`271`		`- Thread {`
	`272`	`+ ensureBackgroundThread {`
`272`	`273`	`if (context == null) {`
`273`		`- return@Thread`
	`274`	`+ return@ensureBackgroundThread`
`274`	`275`	`}`
`275`	`276`
`276`	`277`	`when {`
`@@ -292,7 +293,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb`
`292`	`293`	`else -> {`
`293`	`294`	`val files = searchFiles(searchText, currentPath)`
`294`	`295`	`if (lastSearchedText != searchText) {`
`295`		`- return@Thread`
	`296`	`+ return@ensureBackgroundThread`
`296`	`297`	`}`
`297`	`298`
`298`	`299`	`val listItems = ArrayList<ListItem>()`
`@@ -317,7 +318,7 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb`
`317`	`318`	`}`
`318`	`319`	`}`
`319`	`320`	`}`
`320`		`- }.start()`
	`321`	`+ }`
`321`	`322`	`}`
`322`	`323`
`323`	`324`	`private fun searchFiles(text: String, path: String): ArrayList<ListItem> {`