From 89519ab78c8bf0d911bf95fd0541f169357a0807 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Mar 2020 19:05:06 +0100 Subject: [PATCH] do not check file existence at scoped storage settings exporting --- app/build.gradle | 2 +- .../calendar/pro/activities/SettingsActivity.kt | 4 +++- .../calendar/pro/dialogs/ExportEventsDialog.kt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c4e04e1fd..ab388d38b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,7 +64,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.23.2' + implementation 'com.simplemobiletools:commons:5.23.4' implementation 'joda-time:joda-time:2.10.1' implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4' diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt index 80adbdcfc..8db505a4a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt @@ -784,8 +784,10 @@ class SettingsActivity : SimpleActivity() { } } - toast(if (configValues.size > 0) R.string.settings_imported_successfully else R.string.no_entries_for_importing) runOnUiThread { + val msg = if (configValues.size > 0) R.string.settings_imported_successfully else R.string.no_entries_for_importing + toast(msg) + setupSettingItems() updateWidgets() } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt index c71559030..d5e598b08 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt @@ -64,7 +64,7 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val hid filename.isEmpty() -> activity.toast(R.string.empty_name) filename.isAValidFilename() -> { val file = File(realPath, "$filename.ics") - if (file.exists()) { + if (!hidePath && file.exists()) { activity.toast(R.string.name_taken) return@setOnClickListener }