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

do not require any Storage permission at handling intents

Browse Source
This commit is contained in:
tibbi 2020-03-29 19:56:11 +02:00
parent 46237dae0c
commit bfaee46fc4
1 changed files with 54 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ class MainActivity : SimpleActivity() {
if (action == Intent.ACTION_VIEW) { if (action == Intent.ACTION_VIEW) {
val realPath = intent.getStringExtra(REAL_FILE_PATH) val realPath = intent.getStringExtra(REAL_FILE_PATH)
if (realPath != null) { if (realPath != null && hasPermission(PERMISSION_READ_STORAGE)) {
val file = File(realPath) val file = File(realPath)
handleUri(Uri.fromFile(file)) handleUri(Uri.fromFile(file))
} else { } else {
@ -280,13 +280,9 @@ class MainActivity : SimpleActivity() {
return@getNoteIdWithPath return@getNoteIdWithPath
} }
handlePermission(PERMISSION_WRITE_STORAGE) { NotesHelper(this).getNotes {
if (it) { mNotes = it
NotesHelper(this).getNotes { importUri(uri)
mNotes = it
importUri(uri)
}
}
} }
} }
} }
@ -507,7 +503,7 @@ class MainActivity : SimpleActivity() {
private fun openFile() { private fun openFile() {
FilePickerDialog(this, canAddShowHiddenButton = true) { FilePickerDialog(this, canAddShowHiddenButton = true) {
openFile(it, true) { checkFile(it, true) {
ensureBackgroundThread { ensureBackgroundThread {
val fileText = it.readText().trim() val fileText = it.readText().trim()
val checklistItems = fileText.parseChecklistItems() val checklistItems = fileText.parseChecklistItems()
@ -527,7 +523,7 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun openFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) { private fun checkFile(path: String, checkTitle: Boolean, onChecksPassed: (file: File) -> Unit) {
val file = File(path) val file = File(path)
if (path.isMediaFile()) { if (path.isMediaFile()) {
toast(R.string.invalid_file_format) toast(R.string.invalid_file_format)
@ -540,6 +536,15 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun checkUri(uri: Uri, onChecksPassed: () -> Unit) {
val inputStream = contentResolver.openInputStream(uri) ?: return
if (inputStream.available() > 1000 * 1000) {
toast(R.string.file_too_large)
} else {
onChecksPassed()
}
}
private fun openFolder(path: String, onChecksPassed: (file: File) -> Unit) { private fun openFolder(path: String, onChecksPassed: (file: File) -> Unit) {
val file = File(path) val file = File(path)
if (file.isDirectory) { if (file.isDirectory) {
@ -552,17 +557,40 @@ class MainActivity : SimpleActivity() {
"file" -> openPath(uri.path!!) "file" -> openPath(uri.path!!)
"content" -> { "content" -> {
val realPath = getRealPathFromURI(uri) val realPath = getRealPathFromURI(uri)
if (realPath != null) { if (hasPermission(PERMISSION_READ_STORAGE)) {
openPath(realPath) if (realPath != null) {
openPath(realPath)
} else {
R.string.unknown_error_occurred
}
} else if (realPath != null && realPath != "") {
checkFile(realPath, false) {
addNoteFromUri(uri, realPath.getFilenameFromPath())
}
} else { } else {
R.string.unknown_error_occurred checkUri(uri) {
addNoteFromUri(uri)
}
} }
} }
} }
} }
private fun addNoteFromUri(uri: Uri, filename: String? = null) {
val noteTitle = if (filename?.isEmpty() == true) {
getNewNoteTitle()
} else {
filename!!
}
val inputStream = contentResolver.openInputStream(uri)
val content = inputStream?.bufferedReader().use { it!!.readText() }
val note = Note(null, noteTitle, content, NoteType.TYPE_TEXT.value, "")
addNewNote(note)
}
private fun openPath(path: String) { private fun openPath(path: String) {
openFile(path, false) { checkFile(path, false) {
val title = path.getFilenameFromPath() val title = path.getFilenameFromPath()
try { try {
val fileText = it.readText().trim() val fileText = it.readText().trim()
@ -598,6 +626,18 @@ class MainActivity : SimpleActivity() {
} }
} }
private fun getNewNoteTitle(): String {
val base = getString(R.string.text_note)
var i = 1
while (true) {
val tryTitle = "$base $i"
if (mNotes.none { it.title == tryTitle }) {
return tryTitle
}
i++
}
}
private fun tryExportAsFile() { private fun tryExportAsFile() {
handlePermission(PERMISSION_WRITE_STORAGE) { handlePermission(PERMISSION_WRITE_STORAGE) {
if (it) { if (it) {