From 99b04843e5f6e71592aa3d75728c1719348140c3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 14 Jun 2019 22:48:48 +0200
Subject: [PATCH] fix #377, properly export all fields to .vcf files

---
 .../contacts/pro/activities/MainActivity.kt               | 3 +--
 .../contacts/pro/helpers/ContactsHelper.kt                | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
index 70cacdf5..1cad99b4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt
@@ -527,13 +527,12 @@ class MainActivity : SimpleActivity(), RefreshContactsListener {
             viewpager.currentItem = config.lastUsedViewPagerPage
         }
 
-        ContactsHelper(this).getContacts {
+        ContactsHelper(this).getContacts { contacts ->
             isGettingContacts = false
             if (isDestroyed) {
                 return@getContacts
             }
 
-            val contacts = it
             if (refreshTabsMask and CONTACTS_TAB_MASK != 0) {
                 contacts_fragment?.refreshContacts(contacts)
             }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
index 403acd83..228cab8b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
@@ -28,11 +28,11 @@ class ContactsHelper(val context: Context) {
     private val BATCH_SIZE = 100
     private var displayContactSources = ArrayList<String>()
 
-    fun getContacts(ignoredContactSources: HashSet<String>? = null, callback: (ArrayList<Contact>) -> Unit) {
+    fun getContacts(ignoredContactSources: HashSet<String> = HashSet(), callback: (ArrayList<Contact>) -> Unit) {
         Thread {
             val contacts = SparseArray<Contact>()
             displayContactSources = context.getVisibleContactSources()
-            if (ignoredContactSources != null) {
+            if (ignoredContactSources.isNotEmpty()) {
                 displayContactSources = context.getAllContactSources().filter {
                     !ignoredContactSources.contains(it.getFullIdentifier())
                 }.map { it.getFullIdentifier() }.toMutableList() as ArrayList
@@ -52,7 +52,7 @@ class ContactsHelper(val context: Context) {
             val resultContacts = ArrayList<Contact>(contactsSize)
 
             (0 until contactsSize).filter {
-                if (ignoredContactSources == null && showOnlyContactsWithNumbers) {
+                if (ignoredContactSources.isEmpty() && showOnlyContactsWithNumbers) {
                     contacts.valueAt(it).phoneNumbers.isNotEmpty()
                 } else {
                     true
@@ -61,7 +61,7 @@ class ContactsHelper(val context: Context) {
                 contacts.valueAt(it)
             }
 
-            if (ignoredContactSources == null && context.config.filterDuplicates) {
+            if (ignoredContactSources.isEmpty() && context.config.filterDuplicates) {
                 tempContacts = tempContacts.distinctBy {
                     it.getHashToCompare()
                 } as ArrayList<Contact>