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

fix #173, check invalid characters at filenames

Browse Source
This commit is contained in:
tibbi 2018-02-22 23:42:04 +01:00
parent 324f37ad38
commit 1665de156a
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -45,7 +45,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.12.20' implementation 'com.simplemobiletools:commons:3.12.21'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion"

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

@ -369,13 +369,17 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
mNotes.forEachIndexed { index, note -> mNotes.forEachIndexed { index, note ->
val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension" val filename = if (extension.isEmpty()) note.title else "${note.title}.$extension"
val file = File(parent, filename) val file = File(parent, filename)
exportNoteValueToFile(file.absolutePath, note.value, false) { if (!filename.isAValidFilename()) {
if (!it) { toast(String.format(getString(R.string.filename_invalid_characters_placeholder, filename)))
failCount++ } else {
} exportNoteValueToFile(file.absolutePath, note.value, false) {
if (!it) {
failCount++
}
if (index == mNotes.size - 1) { if (index == mNotes.size - 1) {
toast(if (failCount == 0) R.string.exporting_successful else R.string.exporting_some_entries_failed) toast(if (failCount == 0) R.string.exporting_successful else R.string.exporting_some_entries_failed)
}
} }
} }
} }

7
app/src/main/kotlin/com/simplemobiletools/notes/dialogs/ExportFileDialog.kt
View File

@ -44,15 +44,14 @@ class ExportFileDialog(val activity: SimpleActivity, val note: Note, val callbac
} }
val fullFilename = if (extension.isEmpty()) filename else "$filename.$extension" val fullFilename = if (extension.isEmpty()) filename else "$filename.$extension"
val newFile = File(realPath, fullFilename) if (!fullFilename.isAValidFilename()) {
if (!newFile.name.isAValidFilename()) { activity.toast(String.format(activity.getString(R.string.filename_invalid_characters_placeholder, fullFilename)))
activity.toast(R.string.filename_invalid_characters)
return@setOnClickListener return@setOnClickListener
} }
activity.config.lastUsedExtension = extension activity.config.lastUsedExtension = extension
activity.config.lastUsedSavePath = realPath activity.config.lastUsedSavePath = realPath
callback(newFile.absolutePath) callback("$realPath/$fullFilename")
dismiss() dismiss()
} }
} }