From 3ceb83b355b4e53291fe87f162bd77185e0a1615 Mon Sep 17 00:00:00 2001
From: Pavel Poley <pavelpoley88@gmail.com>
Date: Thu, 5 May 2022 13:57:15 +0300
Subject: [PATCH] fetch data after dialog is shown

---
 .../pro/dialogs/FilterContactSourcesDialog.kt | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt
index ef07f938..11a802c7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/FilterContactSourcesDialog.kt
@@ -22,17 +22,24 @@ class FilterContactSourcesDialog(val activity: SimpleActivity, private val callb
     private var isContactsReady = false
 
     init {
-        ContactsHelper(activity).getContactSources { contactSources ->
-            contactSources.mapTo(this.contactSources) { it.copy() }
-            isContactSourcesReady = true
-            processDataIfReady()
-        }
+        dialog = AlertDialog.Builder(activity)
+            .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmContactSources() }
+            .setNegativeButton(R.string.cancel, null)
+            .create().apply {
+                activity.setupDialogStuff(view, this) {
+                    ContactsHelper(activity).getContactSources { contactSources ->
+                        contactSources.mapTo(this@FilterContactSourcesDialog.contactSources) { it.copy() }
+                        isContactSourcesReady = true
+                        processDataIfReady()
+                    }
 
-        ContactsHelper(activity).getContacts(getAll = true) { contacts ->
-            contacts.mapTo(this.contacts) { it.copy() }
-            isContactsReady = true
-            processDataIfReady()
-        }
+                    ContactsHelper(activity).getContacts(getAll = true) { contacts ->
+                        contacts.mapTo(this@FilterContactSourcesDialog.contacts) { it.copy() }
+                        isContactsReady = true
+                        processDataIfReady()
+                    }
+                }
+            }
     }
 
     private fun processDataIfReady() {
@@ -49,16 +56,9 @@ class FilterContactSourcesDialog(val activity: SimpleActivity, private val callb
         contactSources.clear()
         contactSources.addAll(contactSourcesWithCount)
 
-        val selectedSources = activity.getVisibleContactSources()
         activity.runOnUiThread {
+            val selectedSources = activity.getVisibleContactSources()
             view.filter_contact_sources_list.adapter = FilterContactSourcesAdapter(activity, contactSourcesWithCount, selectedSources)
-
-            dialog = AlertDialog.Builder(activity)
-                .setPositiveButton(R.string.ok) { dialogInterface, i -> confirmContactSources() }
-                .setNegativeButton(R.string.cancel, null)
-                .create().apply {
-                    activity.setupDialogStuff(view, this)
-                }
         }
     }