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

improve handling of system files on unrooted devices

Browse source
This commit is contained in:
tibbi 2018-01-08 16:26:22 +01:00
parent 90c854dbf2
commit 7e77d07fd7
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,7 @@ package com.simplemobiletools.filemanager.activities
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import com.simplemobiletools.commons.extensions.getFileOutputStream
import com.simplemobiletools.commons.extensions.getRealPathFromURI
import com.simplemobiletools.commons.extensions.hideKeyboard
import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
import com.simplemobiletools.filemanager.R
import com.simplemobiletools.filemanager.dialogs.SaveAsDialog
@ -77,7 +74,13 @@ class ReadTextActivity : SimpleActivity() {
filePath = uri.path
File(uri.path).readText()
} else {
contentResolver.openInputStream(uri).bufferedReader().use { it.readText() }
try {
contentResolver.openInputStream(uri).bufferedReader().use { it.readText() }
} catch (e: Exception) {
showErrorToast(e)
finish()
return
}
}
read_text_view.setText(text)

2
app/src/main/res/xml/provider_paths.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path name="external_files" path="."/>
<root-path name="external_files" path="/storage/" />
<root-path name="external_files" path="/" />
</paths>