minor code style update and optimizing imports

This commit is contained in:
Tibor Kaputa 2021-08-12 22:01:29 +02:00 committed by GitHub
parent 3398d582e4
commit 3a0ee3794c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,9 +9,6 @@ import com.simplemobiletools.calendar.pro.models.Event
import com.simplemobiletools.calendar.pro.models.EventType
import com.simplemobiletools.commons.helpers.CHOPPED_LIST_DEFAULT_SIZE
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import java.util.Date
import org.joda.time.DateTime
import org.joda.time.LocalDateTime
class EventsHelper(val context: Context) {
private val config = context.config
@ -302,14 +299,15 @@ class EventsHelper(val context: Context) {
events.forEach {
it.updateIsPastEvent()
val originalEvent = eventsDB.getEventWithId(it.id!!)
if(originalEvent != null &&
if (originalEvent != null &&
(birthDayEventId != -1L && it.eventType == birthDayEventId) or
(anniversaryEventId != -1L && it.eventType == anniversaryEventId)){
(anniversaryEventId != -1L && it.eventType == anniversaryEventId)
) {
val eventStartDate = Formatter.getDateFromTS(it.startTS)
val originalEventStartDate = Formatter.getDateFromTS(originalEvent.startTS)
if(it.hasMissingYear().not()){
if (it.hasMissingYear().not()) {
val years = (eventStartDate.year - originalEventStartDate.year).coerceAtLeast(0)
if(years > 0){
if (years > 0) {
it.title = "${it.title} ($years)"
}
}