From cd899849fe9b9db4812936fce9e074cfb552a2d9 Mon Sep 17 00:00:00 2001 From: merkost Date: Mon, 10 Jul 2023 23:27:10 +1000 Subject: [PATCH] Changed result if nothing has been imported --- .../simplemobiletools/notes/pro/activities/SettingsActivity.kt | 1 + .../com/simplemobiletools/notes/pro/helpers/NotesHelper.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt index ce5e5eb0..12542efb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/SettingsActivity.kt @@ -335,6 +335,7 @@ class SettingsActivity : SimpleActivity() { when (importResult) { NotesHelper.ImportResult.IMPORT_OK -> toast(R.string.importing_successful) 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) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt index 60c39009..6b7e40ae 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/NotesHelper.kt @@ -115,9 +115,8 @@ class NotesHelper(val context: Context) { } 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 == 0 -> ImportResult.IMPORT_FAIL else -> ImportResult.IMPORT_PARTIAL } callback(result)