fenix/Simple-Notes
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git synced 2025-04-03 18:21:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

do not require Storage permission at opening a file

Browse Source
This commit is contained in:
tibbi 2020-03-29 20:57:18 +02:00
parent 6774077a1a
commit 25cb371868
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
View File

@ -42,6 +42,7 @@ import java.nio.charset.Charset
class MainActivity : SimpleActivity() { class MainActivity : SimpleActivity() {
private val EXPORT_FILE_SYNC = 1 private val EXPORT_FILE_SYNC = 1
private val EXPORT_FILE_NO_SYNC = 2 private val EXPORT_FILE_NO_SYNC = 2
private val PICK_OPEN_FILE_INTENT = 1
private lateinit var mCurrentNote: Note private lateinit var mCurrentNote: Note
private var mNotes = ArrayList<Note>() private var mNotes = ArrayList<Note>()
@ -221,6 +222,13 @@ class MainActivity : SimpleActivity() {
checkIntents(intent) checkIntents(intent)
} }
override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
super.onActivityResult(requestCode, resultCode, resultData)
if (requestCode == PICK_OPEN_FILE_INTENT && resultCode == RESULT_OK && resultData != null && resultData.data != null) {
importUri(resultData.data!!)
}
}
private val currentItemIsCheckList get() = mAdapter?.isChecklistFragment(view_pager.currentItem) ?: false private val currentItemIsCheckList get() = mAdapter?.isChecklistFragment(view_pager.currentItem) ?: false
private fun checkIntents(intent: Intent) { private fun checkIntents(intent: Intent) {
@ -494,9 +502,13 @@ class MainActivity : SimpleActivity() {
} }
private fun tryOpenFile() { private fun tryOpenFile() {
handlePermission(PERMISSION_WRITE_STORAGE) { if (hasPermission(PERMISSION_READ_STORAGE)) {
if (it) {
openFile() openFile()
} else {
Intent(Intent.ACTION_GET_CONTENT).apply {
addCategory(Intent.CATEGORY_OPENABLE)
type = "text/*"
startActivityForResult(this, PICK_OPEN_FILE_INTENT)
} }
} }
} }
@ -577,10 +589,10 @@ class MainActivity : SimpleActivity() {
} }
private fun addNoteFromUri(uri: Uri, filename: String? = null) { private fun addNoteFromUri(uri: Uri, filename: String? = null) {
val noteTitle = if (filename?.isEmpty() == true) { val noteTitle = if (filename?.isEmpty() == false) {
getNewNoteTitle() filename
} else { } else {
filename!! getNewNoteTitle()
} }
val inputStream = contentResolver.openInputStream(uri) val inputStream = contentResolver.openInputStream(uri)