danvics/Contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

do not mess with the phone numbers if they arent shown anyway

Browse source
This commit is contained in:
tibbi 2019-09-15 12:04:38 +02:00
parent f9bd62b2a7
commit 72ccd10aa1
1 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
View file

@ -200,10 +200,10 @@ class ViewContactActivity : ContactActivity() {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
setupFavorite() setupFavorite()
setupNames() setupNames()
setupContactSources()
getDuplicateContacts { getDuplicateContacts {
setupPhoneNumbers() setupPhoneNumbers()
setupContactSources()
} }
setupEmails() setupEmails()
@ -280,6 +280,7 @@ class ViewContactActivity : ContactActivity() {
} }
private fun setupPhoneNumbers() { private fun setupPhoneNumbers() {
if (showFields and SHOW_PHONE_NUMBERS_FIELD != 0) {
var phoneNumbers = contact!!.phoneNumbers.toMutableSet() as LinkedHashSet<PhoneNumber> var phoneNumbers = contact!!.phoneNumbers.toMutableSet() as LinkedHashSet<PhoneNumber>
duplicateContacts.forEach { duplicateContacts.forEach {
phoneNumbers.addAll(it.phoneNumbers) phoneNumbers.addAll(it.phoneNumbers)
@ -294,7 +295,7 @@ class ViewContactActivity : ContactActivity() {
}.toMutableSet() as LinkedHashSet<PhoneNumber> }.toMutableSet() as LinkedHashSet<PhoneNumber>
contact_numbers_holder.removeAllViews() contact_numbers_holder.removeAllViews()
if (phoneNumbers.isNotEmpty() && showFields and SHOW_PHONE_NUMBERS_FIELD != 0) { if (phoneNumbers.isNotEmpty()) {
phoneNumbers.forEach { phoneNumbers.forEach {
layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply { layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply {
val phoneNumber = it val phoneNumber = it
@ -320,6 +321,10 @@ class ViewContactActivity : ContactActivity() {
contact_numbers_image.beGone() contact_numbers_image.beGone()
contact_numbers_holder.beGone() contact_numbers_holder.beGone()
} }
} else {
contact_numbers_image.beGone()
contact_numbers_holder.beGone()
}
} }
private fun setupEmails() { private fun setupEmails() {