wbrawner/Simple-File-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve threading at the file editor to better handle large files

Browse source
This commit is contained in:
tibbi 2019-08-28 22:40:35 +02:00
parent 9b00f60543
commit 87c2eef8bc
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/ReadTextActivity.kt
View file

@ -16,6 +16,7 @@ import androidx.core.view.MenuItemCompat
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
import com.simplemobiletools.commons.helpers.REAL_FILE_PATH
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.FileDirItem
import com.simplemobiletools.filemanager.pro.R
import com.simplemobiletools.filemanager.pro.dialogs.SaveAsDialog
@ -41,7 +42,9 @@ class ReadTextActivity : SimpleActivity() {
handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) {
checkIntent()
read_text_view.onGlobalLayout {
checkIntent()
}
} else {
toast(R.string.no_storage_permissions)
finish()
@ -160,30 +163,34 @@ class ReadTextActivity : SimpleActivity() {
return
}
originalText = if (uri.scheme == "file") {
filePath = uri.path
val file = File(filePath)
if (file.exists()) {
file.readText()
ensureBackgroundThread {
originalText = if (uri.scheme == "file") {
filePath = uri.path
val file = File(filePath)
if (file.exists()) {
file.readText()
} else {
toast(R.string.unknown_error_occurred)
""
}
} else {
toast(R.string.unknown_error_occurred)
""
try {
contentResolver.openInputStream(uri).bufferedReader().use { it.readText() }
} catch (e: Exception) {
showErrorToast(e)
finish()
return@ensureBackgroundThread
}
}
} else {
try {
contentResolver.openInputStream(uri).bufferedReader().use { it.readText() }
} catch (e: Exception) {
showErrorToast(e)
finish()
return
}
}
read_text_view.setText(originalText)
if (originalText.isNotEmpty()) {
hideKeyboard()
} else {
showKeyboard(read_text_view)
runOnUiThread {
read_text_view.setText(originalText)
if (originalText.isNotEmpty()) {
hideKeyboard()
} else {
showKeyboard(read_text_view)
}
}
}
}
}