From 6de4f0931917a9fc88c5e46ecb66be0973fca19c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 28 Oct 2018 11:23:13 +0100
Subject: [PATCH] make an if/else check clearer

---
 .../kotlin/com/simplemobiletools/contacts/models/Contact.kt | 6 +++---
 .../com/simplemobiletools/contacts/models/Organization.kt   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt
index da881b7a..2ff8a7ad 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt
@@ -94,12 +94,12 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
         val suffixComma = if (suffix.isEmpty()) "" else ", $suffix"
         val fullName = "$prefix $firstPart $lastPart$suffixComma".trim()
         return if (fullName.isEmpty()) {
-            if (organization.isEmpty()) {
-                emails.firstOrNull()?.value?.trim() ?: ""
-            } else {
+            if (organization.isNotEmpty()) {
                 var fullOrganization = if (organization.jobPosition.isEmpty()) "" else "${organization.jobPosition}, "
                 fullOrganization += organization.company
                 fullOrganization.trim().trimEnd(',')
+            } else {
+                emails.firstOrNull()?.value?.trim() ?: ""
             }
         } else {
             fullName
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt
index fbb7b69c..6c311db9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Organization.kt
@@ -2,4 +2,6 @@ package com.simplemobiletools.contacts.models
 
 data class Organization(var company: String, var jobPosition: String) {
     fun isEmpty() = company.isEmpty() && jobPosition.isEmpty()
+
+    fun isNotEmpty() = !isEmpty()
 }