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

Simplified code

This commit is contained in:
Agnieszka C 2021-10-24 17:51:23 +02:00
parent bbadfa1f2e
commit 17c928129e
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
View File

@ -65,8 +65,6 @@ class EditContactActivity : ContactActivity() {
private var originalContactSource = "" private var originalContactSource = ""
private lateinit var contactFields: ArrayList<MyEditText> private lateinit var contactFields: ArrayList<MyEditText>
private val multipleFields = arrayListOf(::getFilledPhoneNumbers, ::getFilledEmails, ::getFilledAddresses, ::getFilledIMs,
::getFilledEvents, ::getFilledWebsites)
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
showTransparentTop = true showTransparentTop = true
@ -912,7 +910,22 @@ class EditContactActivity : ContactActivity() {
return return
} }
if (contactFields.all { it.value.isEmpty() } && multipleFields.all { it().isEmpty() } && currentContactPhotoPath.isEmpty()) { val filledPhoneNumbers = getFilledPhoneNumbers()
val filledEmails = getFilledEmails()
val filledAddresses = getFilledAddresses()
val filledIMs = getFilledIMs()
val filledEvents = getFilledEvents()
val filledWebsites = getFilledWebsites()
if (contactFields.all { it.value.isEmpty() } &&
currentContactPhotoPath.isEmpty() &&
filledPhoneNumbers.isEmpty() &&
filledEmails.isEmpty() &&
filledAddresses.isEmpty() &&
filledIMs.isEmpty() &&
filledEvents.isEmpty() &&
filledWebsites.isEmpty()
) {
toast(R.string.fields_empty) toast(R.string.fields_empty)
return return
} }
@ -927,14 +940,14 @@ class EditContactActivity : ContactActivity() {
suffix = contact_suffix.value suffix = contact_suffix.value
nickname = contact_nickname.value nickname = contact_nickname.value
photoUri = currentContactPhotoPath photoUri = currentContactPhotoPath
phoneNumbers = getFilledPhoneNumbers() phoneNumbers = filledPhoneNumbers
emails = getFilledEmails() emails = filledEmails
addresses = getFilledAddresses() addresses = filledAddresses
IMs = getFilledIMs() IMs = filledIMs
events = getFilledEvents() events = filledEvents
starred = if (isContactStarred()) 1 else 0 starred = if (isContactStarred()) 1 else 0
notes = contact_notes.value notes = contact_notes.value
websites = getFilledWebsites() websites = filledWebsites
val company = contact_organization_company.value val company = contact_organization_company.value
val jobPosition = contact_organization_job_position.value val jobPosition = contact_organization_job_position.value