diff --git a/app/build.gradle b/app/build.gradle index 41b510c5..3c1c9014 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:bdc27c3188' + implementation 'com.github.SimpleMobileTools:Simple-Commons:169f81b78a' implementation 'joda-time:joda-time:2.10.3' implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5' implementation 'com.github.tibbi:IndicatorFastScroll:c3de1d040a' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt index 3c9c25b3..0f612864 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt @@ -547,7 +547,7 @@ class EditContactActivity : ContactActivity() { (eventHolder as ViewGroup).apply { val contactEvent = contact_event.apply { - event.value.getDateTimeFromDateString(this) + event.value.getDateTimeFromDateString(true, this) tag = event.value alpha = 1f } @@ -736,7 +736,7 @@ class EditContactActivity : ContactActivity() { eventField.setOnClickListener { MyDatePickerDialog(this, eventField.tag?.toString() ?: "") { dateTag -> eventField.apply { - dateTag.getDateTimeFromDateString(this) + dateTag.getDateTimeFromDateString(true, this) tag = dateTag alpha = 1f } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index c9f4d43a..78d4b0f4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -416,7 +416,7 @@ class ViewContactActivity : ContactActivity() { events.forEach { layoutInflater.inflate(R.layout.item_view_event, contact_events_holder, false).apply { contact_events_holder.addView(this) - it.value.getDateTimeFromDateString(contact_event) + it.value.getDateTimeFromDateString(true, contact_event) contact_event_type.setText(getEventTextId(it.type)) copyOnLongClick(it.value) } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt index d819f3fe..dcb4907b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/VcfExporter.kt @@ -73,7 +73,7 @@ class VcfExporter { contact.events.forEach { if (it.type == Event.TYPE_ANNIVERSARY || it.type == Event.TYPE_BIRTHDAY) { - val dateTime = it.value.getDateTimeFromDateString() + val dateTime = it.value.getDateTimeFromDateString(false) if (it.value.startsWith("--")) { val partialDate = PartialDate.builder().year(null).month(dateTime.monthOfYear).date(dateTime.dayOfMonth).build() if (it.type == Event.TYPE_BIRTHDAY) {