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

Merge pull request #445 from qwertyfinger/fix/google-drive-export

Browse Source 
Fix error when exporting notes to Google Drive
This commit is contained in:
Tibor Kaputa 2021-09-13 21:19:07 +02:00 committed by GitHub
commit a33e418391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -750,7 +750,8 @@ class MainActivity : SimpleActivity() {
RadioGroupDialog(this, items) { RadioGroupDialog(this, items) {
val syncFile = it as Int == EXPORT_FILE_SYNC val syncFile = it as Int == EXPORT_FILE_SYNC
tryExportNoteValueToFile(exportPath, textToExport, true) { tryExportNoteValueToFile(exportPath, textToExport, true) { exportedSuccessfully ->
if (exportedSuccessfully) {
if (syncFile) { if (syncFile) {
mCurrentNote.path = exportPath mCurrentNote.path = exportPath
mCurrentNote.value = "" mCurrentNote.value = ""
@ -764,6 +765,7 @@ class MainActivity : SimpleActivity() {
} }
} }
} }
}
private fun tryExportAllNotes() { private fun tryExportAllNotes() {
handlePermission(PERMISSION_WRITE_STORAGE) { handlePermission(PERMISSION_WRITE_STORAGE) {
@ -792,7 +794,8 @@ class MainActivity : SimpleActivity() {
toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename))) toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename)))
} else { } else {
val noteStoredValue = note.getNoteStoredValue(this) ?: "" val noteStoredValue = note.getNoteStoredValue(this) ?: ""
tryExportNoteValueToFile(file.absolutePath, note.value, false) { tryExportNoteValueToFile(file.absolutePath, note.value, false) { exportedSuccessfully ->
if (exportedSuccessfully) {
if (syncFile) { if (syncFile) {
note.path = file.absolutePath note.path = file.absolutePath
note.value = "" note.value = ""
@ -802,13 +805,15 @@ class MainActivity : SimpleActivity() {
} }
NotesHelper(this).insertOrUpdateNote(note) NotesHelper(this).insertOrUpdateNote(note)
}
if (mCurrentNote.id == note.id) { if (mCurrentNote.id == note.id) {
mCurrentNote.value = note.value mCurrentNote.value = note.value
mCurrentNote.path = note.path mCurrentNote.path = note.path
getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value) getPagerAdapter().updateCurrentNoteData(view_pager.currentItem, mCurrentNote.path, mCurrentNote.value)
} }
if (!it) { if (!exportedSuccessfully) {
failCount++ failCount++
} }
@ -880,7 +885,7 @@ class MainActivity : SimpleActivity() {
private fun exportNoteValueToUri(uri: Uri, content: String, callback: ((success: Boolean) -> Unit)? = null) { private fun exportNoteValueToUri(uri: Uri, content: String, callback: ((success: Boolean) -> Unit)? = null) {
try { try {
val outputStream = contentResolver.openOutputStream(uri, "wt") val outputStream = contentResolver.openOutputStream(uri, "rwt")
outputStream!!.bufferedWriter().use { out -> outputStream!!.bufferedWriter().use { out ->
out.write(content) out.write(content)
} }