From dabbe0dff12495a0df03007c2174a5430c737037 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 17 Mar 2020 16:51:03 +0100 Subject: [PATCH] do not pass exportPastEvents in the Export dialogs callback --- .../calendar/pro/activities/MainActivity.kt | 34 ++++++++----------- .../pro/dialogs/ExportEventsDialog.kt | 4 +-- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 3ce1819e2..6c0c9d3ee 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -783,25 +783,21 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { private fun tryExportEvents() { handlePermission(PERMISSION_WRITE_STORAGE) { if (it) { - exportEvents() - } - } - } - - private fun exportEvents() { - ExportEventsDialog(this, config.lastExportPath, false) { exportPastEvents, file, eventTypes -> - ensureBackgroundThread { - val events = eventsHelper.getEventsToExport(exportPastEvents, eventTypes) - if (events.isEmpty()) { - toast(R.string.no_entries_for_exporting) - } else { - getFileOutputStream(file.toFileDirItem(this), true) { - IcsExporter().exportEvents(this, it, events, true) { - toast(when (it) { - IcsExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful - IcsExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_entries_failed - else -> R.string.exporting_failed - }) + ExportEventsDialog(this, config.lastExportPath, false) { file, eventTypes -> + ensureBackgroundThread { + val events = eventsHelper.getEventsToExport(config.exportPastEvents, eventTypes) + if (events.isEmpty()) { + toast(R.string.no_entries_for_exporting) + } else { + getFileOutputStream(file.toFileDirItem(this), true) { + IcsExporter().exportEvents(this, it, events, true) { + toast(when (it) { + IcsExporter.ExportResult.EXPORT_OK -> R.string.exporting_successful + IcsExporter.ExportResult.EXPORT_PARTIAL -> R.string.exporting_some_entries_failed + else -> R.string.exporting_failed + }) + } + } } } } 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 5469f5038..495c0a735 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 @@ -15,7 +15,7 @@ import java.io.File import java.util.* class ExportEventsDialog(val activity: SimpleActivity, val path: String, val hidePath: Boolean, - val callback: (exportPastEvents: Boolean, file: File, eventTypes: ArrayList) -> Unit) { + val callback: (file: File, eventTypes: ArrayList) -> Unit) { private var realPath = if (path.isEmpty()) activity.internalStoragePath else path val config = activity.config @@ -72,7 +72,7 @@ class ExportEventsDialog(val activity: SimpleActivity, val path: String, val hid config.exportPastEvents = view.export_events_checkbox.isChecked val eventTypes = (view.export_events_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsList() - callback(view.export_events_checkbox.isChecked, file, eventTypes) + callback(file, eventTypes) dismiss() } else -> activity.toast(R.string.invalid_name)