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

Respect config when exporting events

Browse Source
This commit is contained in:
Naveen 2023-01-15 02:47:56 +05:30
parent 635fa436c7
commit 01c8a4c977
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/calendar/pro/dialogs/ExportEventsDialog.kt
View File

@ -33,7 +33,7 @@ class ExportEventsDialog(
export_tasks_checkbox_holder.setOnClickListener { export_tasks_checkbox_holder.setOnClickListener {
export_tasks_checkbox.toggle() export_tasks_checkbox.toggle()
} }
export_past_events_checkbox.isChecked = config.exportPastEvents export_past_events_checkbox.isChecked = config.exportPastEntries
export_past_events_checkbox_holder.setOnClickListener { export_past_events_checkbox_holder.setOnClickListener {
export_past_events_checkbox.toggle() export_past_events_checkbox.toggle()
} }
@ -83,7 +83,7 @@ class ExportEventsDialog(
lastExportPath = file.absolutePath.getParentPath() lastExportPath = file.absolutePath.getParentPath()
exportEvents = view.export_events_checkbox.isChecked exportEvents = view.export_events_checkbox.isChecked
exportTasks = view.export_tasks_checkbox.isChecked exportTasks = view.export_tasks_checkbox.isChecked
exportPastEvents = view.export_past_events_checkbox.isChecked exportPastEntries = view.export_past_events_checkbox.isChecked
} }
val eventTypes = (view.export_events_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsList() val eventTypes = (view.export_events_types_list.adapter as FilterEventTypeAdapter).getSelectedItemsList()

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Config.kt
View File

@ -231,7 +231,7 @@ class Config(context: Context) : BaseConfig(context) {
get() = prefs.getBoolean(EXPORT_TASKS, true) get() = prefs.getBoolean(EXPORT_TASKS, true)
set(exportTasks) = prefs.edit().putBoolean(EXPORT_TASKS, exportTasks).apply() set(exportTasks) = prefs.edit().putBoolean(EXPORT_TASKS, exportTasks).apply()
var exportPastEvents: Boolean var exportPastEntries: Boolean
get() = prefs.getBoolean(EXPORT_PAST_EVENTS, false) get() = prefs.getBoolean(EXPORT_PAST_EVENTS, false)
set(exportPastEvents) = prefs.edit().putBoolean(EXPORT_PAST_EVENTS, exportPastEvents).apply() set(exportPastEvents) = prefs.edit().putBoolean(EXPORT_PAST_EVENTS, exportPastEvents).apply()

10
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
View File

@ -523,13 +523,17 @@ class EventsHelper(val context: Context) {
val currTS = getNowSeconds() val currTS = getNowSeconds()
var events = ArrayList<Event>() var events = ArrayList<Event>()
val tasks = ArrayList<Event>() val tasks = ArrayList<Event>()
if (config.exportPastEvents) { if (config.exportPastEntries) {
events.addAll(eventsDB.getAllEventsWithTypes(eventTypes)) if (config.exportEvents) {
events.addAll(eventsDB.getAllEventsWithTypes(eventTypes))
}
if (config.exportTasks) { if (config.exportTasks) {
tasks.addAll(eventsDB.getAllTasksWithTypes(eventTypes)) tasks.addAll(eventsDB.getAllTasksWithTypes(eventTypes))
} }
} else { } else {
events.addAll(eventsDB.getAllFutureEventsWithTypes(currTS, eventTypes)) if (config.exportEvents) {
events.addAll(eventsDB.getAllFutureEventsWithTypes(currTS, eventTypes))
}
if (config.exportTasks) { if (config.exportTasks) {
tasks.addAll(eventsDB.getAllFutureTasksWithTypes(currTS, eventTypes)) tasks.addAll(eventsDB.getAllFutureTasksWithTypes(currTS, eventTypes))
} }