fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix a glitch with wrong calendar source at creating new events

This commit is contained in:
tibbi 2017-10-08 17:52:46 +02:00
parent ad48c85c33
commit a13e8f1147
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
View File

@ -399,7 +399,7 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
val calendars = CalDAVHandler(applicationContext).getCalDAVCalendars().filter { val calendars = CalDAVHandler(applicationContext).getCalDAVCalendars().filter {
it.canWrite() && config.getSyncedCalendarIdsAsList().contains(it.id.toString()) it.canWrite() && config.getSyncedCalendarIdsAsList().contains(it.id.toString())
} }
updateCurrentCalendarInfo(getCalendarWithId(calendars, getCalendarId())) updateCurrentCalendarInfo(if (mEventCalendarId == STORED_LOCALLY_ONLY) null else getCalendarWithId(calendars, getCalendarId()))
event_caldav_calendar_holder.setOnClickListener { event_caldav_calendar_holder.setOnClickListener {
hideKeyboard() hideKeyboard()
@ -503,8 +503,17 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
val oldSource = mEvent.source val oldSource = mEvent.source
val newImportId = if (mEvent.id != 0) mEvent.importId else UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis().toString() val newImportId = if (mEvent.id != 0) mEvent.importId else UUID.randomUUID().toString().replace("-", "") + System.currentTimeMillis().toString()
val newEventType = if (!config.caldavSync || config.lastUsedCaldavCalendar == 0) mEventTypeId else dbHelper.getEventTypeWithCalDAVCalendarId(config.lastUsedCaldavCalendar)!!.id val newEventType = if (!config.caldavSync || config.lastUsedCaldavCalendar == 0 || mEventCalendarId == STORED_LOCALLY_ONLY) {
val newSource = if (!config.caldavSync || config.lastUsedCaldavCalendar == 0) SOURCE_SIMPLE_CALENDAR else "$CALDAV-${config.lastUsedCaldavCalendar}" mEventTypeId
} else {
dbHelper.getEventTypeWithCalDAVCalendarId(config.lastUsedCaldavCalendar)!!.id
}
val newSource = if (!config.caldavSync || config.lastUsedCaldavCalendar == 0 || mEventCalendarId == STORED_LOCALLY_ONLY) {
SOURCE_SIMPLE_CALENDAR
} else {
"$CALDAV-${config.lastUsedCaldavCalendar}"
}
val reminders = sortedSetOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes).filter { it != REMINDER_OFF } val reminders = sortedSetOf(mReminder1Minutes, mReminder2Minutes, mReminder3Minutes).filter { it != REMINDER_OFF }
val newDescription = event_description.value val newDescription = event_description.value

1
app/src/main/kotlin/com/simplemobiletools/calendar/extensions/Context.kt
View File

@ -318,7 +318,6 @@ fun Context.addDayEvents(day: DayMonthly, linearLayout: LinearLayout, res: Resou
(View.inflate(this, R.layout.day_monthly_item_view, null) as TextView).apply { (View.inflate(this, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(textColor) setTextColor(textColor)
text = it.title.replace(" ", "\u00A0") // allow word break by char text = it.title.replace(" ", "\u00A0") // allow word break by char
gravity = Gravity.START
background = backgroundDrawable background = backgroundDrawable
layoutParams = eventLayoutParams layoutParams = eventLayoutParams
linearLayout.addView(this) linearLayout.addView(this)

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

@ -19,7 +19,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
private val mToday: String = DateTime().toString(Formatter.DAYCODE_PATTERN) private val mToday: String = DateTime().toString(Formatter.DAYCODE_PATTERN)
private var mEvents = ArrayList<Event>() private var mEvents = ArrayList<Event>()
private var days = ArrayList<DayMonthly>(DAYS_CNT) private var days = ArrayList<DayMonthly>(DAYS_CNT)
var mFilterEventTypes = true private var mFilterEventTypes = true
lateinit var mTargetDate: DateTime lateinit var mTargetDate: DateTime