diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt index a7995535..bbb36948 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/ViewContactActivity.kt @@ -354,12 +354,16 @@ class ViewContactActivity : ContactActivity() { private fun setupOrganization() { val organization = contact!!.organization - if (!organization.isEmpty() && showFields and SHOW_ORGANIZATION_FIELD != 0) { + if (organization.isNotEmpty() && showFields and SHOW_ORGANIZATION_FIELD != 0) { contact_organization_company.text = organization.company contact_organization_job_position.text = organization.jobPosition contact_organization_image.beGoneIf(organization.isEmpty()) contact_organization_company.beGoneIf(organization.company.isEmpty()) contact_organization_job_position.beGoneIf(organization.jobPosition.isEmpty()) + + if (organization.company.isEmpty() && organization.jobPosition.isNotEmpty()) { + (contact_organization_image.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_TOP, contact_organization_job_position.id) + } } else { contact_organization_image.beGone() contact_organization_company.beGone() diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt index c2907e0d..cdffaec2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -1313,7 +1313,7 @@ class ContactsHelper(val activity: Activity) { } // organization - if (!contact.organization.isEmpty()) { + if (contact.organization.isNotEmpty()) { ContentProviderOperation.newInsert(ContactsContract.Data.CONTENT_URI).apply { withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, 0) withValue(ContactsContract.Data.MIMETYPE, CommonDataKinds.Organization.CONTENT_ITEM_TYPE) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt index 3a3dfb92..32c101f3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfExporter.kt @@ -122,7 +122,7 @@ class VcfExporter { card.addNote(contact.notes) } - if (!contact.organization.isEmpty()) { + if (contact.organization.isNotEmpty()) { val organization = Organization() organization.values.add(contact.organization.company) card.organization = organization