@@ -907,6 +907,31 @@ class EditContactActivity : ContactActivity() {
907907 return
908908 }
909909
910+ val filledPhoneNumbers = getFilledPhoneNumbers()
911+ val filledEmails = getFilledEmails()
912+ val filledAddresses = getFilledAddresses()
913+ val filledIMs = getFilledIMs()
914+ val filledEvents = getFilledEvents()
915+ val filledWebsites = getFilledWebsites()
916+
917+ val contactFields = arrayListOf (
918+ contact_prefix, contact_first_name, contact_middle_name, contact_surname, contact_suffix, contact_nickname,
919+ contact_notes, contact_organization_company, contact_organization_job_position
920+ )
921+
922+ if (contactFields.all { it.value.isEmpty() } &&
923+ currentContactPhotoPath.isEmpty() &&
924+ filledPhoneNumbers.isEmpty() &&
925+ filledEmails.isEmpty() &&
926+ filledAddresses.isEmpty() &&
927+ filledIMs.isEmpty() &&
928+ filledEvents.isEmpty() &&
929+ filledWebsites.isEmpty()
930+ ) {
931+ toast(R .string.fields_empty)
932+ return
933+ }
934+
910935 contact?.apply {
911936 val oldPhotoUri = photoUri
912937
@@ -917,14 +942,14 @@ class EditContactActivity : ContactActivity() {
917942 suffix = contact_suffix.value
918943 nickname = contact_nickname.value
919944 photoUri = currentContactPhotoPath
920- phoneNumbers = getFilledPhoneNumbers()
921- emails = getFilledEmails()
922- addresses = getFilledAddresses()
923- IMs = getFilledIMs()
924- events = getFilledEvents()
945+ phoneNumbers = filledPhoneNumbers
946+ emails = filledEmails
947+ addresses = filledAddresses
948+ IMs = filledIMs
949+ events = filledEvents
925950 starred = if (isContactStarred()) 1 else 0
926951 notes = contact_notes.value
927- websites = getFilledWebsites()
952+ websites = filledWebsites
928953
929954 val company = contact_organization_company.value
930955 val jobPosition = contact_organization_job_position.value
0 commit comments