diff --git a/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt index 2f4a18bc..23e62fcc 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/JournalItemActivity.kt @@ -264,7 +264,13 @@ class JournalItemActivity : BaseActivity(), Refreshable { setTextViewText(view, R.id.title, event.summary) - setTextViewText(view, R.id.when_datetime, getDisplayedDatetime(event.dtStart?.date?.time!!, event.dtEnd?.date!!.time, event.isAllDay(), context)) + val dtStart = event.dtStart?.date?.time + val dtEnd = event.dtEnd?.date?.time + if ((dtStart == null) || (dtEnd == null)) { + setTextViewText(view, R.id.when_datetime, getString(R.string.loading_error_title)) + } else { + setTextViewText(view, R.id.when_datetime, getDisplayedDatetime(dtStart, dtEnd, event.isAllDay(), context)) + } setTextViewText(view, R.id.where, event.location) diff --git a/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionItemFragment.kt b/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionItemFragment.kt index a2e2a0f7..359f9ca0 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionItemFragment.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/etebase/CollectionItemFragment.kt @@ -251,7 +251,13 @@ class PrettyFragment(private val mainFragment: CollectionItemFragment, private v setTextViewText(view, R.id.title, event.summary) - setTextViewText(view, R.id.when_datetime, getDisplayedDatetime(event.dtStart?.date?.time!!, event.dtEnd?.date!!.time, event.isAllDay(), context)) + val dtStart = event.dtStart?.date?.time + val dtEnd = event.dtEnd?.date?.time + if ((dtStart == null) || (dtEnd == null)) { + setTextViewText(view, R.id.when_datetime, getString(R.string.loading_error_title)) + } else { + setTextViewText(view, R.id.when_datetime, getDisplayedDatetime(dtStart, dtEnd, event.isAllDay(), context)) + } setTextViewText(view, R.id.where, event.location)