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

Changed result if nothing has been imported

Browse Source
This commit is contained in:
merkost 2023-07-10 23:27:10 +10:00
parent 6614539186
commit cd899849fe
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt
View File

@ -335,6 +335,7 @@ class SettingsActivity : SimpleActivity() {
when (importResult) { when (importResult) {
NotesHelper.ImportResult.IMPORT_OK -> toast(R.string.importing_successful) NotesHelper.ImportResult.IMPORT_OK -> toast(R.string.importing_successful)
NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(R.string.importing_some_entries_failed) NotesHelper.ImportResult.IMPORT_PARTIAL -> toast(R.string.importing_some_entries_failed)
NotesHelper.ImportResult.IMPORT_NOTHING_NEW -> toast(R.string.no_new_items)
else -> toast(R.string.importing_failed) else -> toast(R.string.importing_failed)
} }
} }

3
app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt
View File

@ -115,9 +115,8 @@ class NotesHelper(val context: Context) {
} }
val result = when { val result = when {
skipped == notes.size -> ImportResult.IMPORT_NOTHING_NEW skipped == notes.size || imported == 0 -> ImportResult.IMPORT_NOTHING_NEW
imported == notes.size -> ImportResult.IMPORT_OK imported == notes.size -> ImportResult.IMPORT_OK
imported == 0 -> ImportResult.IMPORT_FAIL
else -> ImportResult.IMPORT_PARTIAL else -> ImportResult.IMPORT_PARTIAL
} }
callback(result) callback(result)