From 4d63dc06c37b251f96b4e67fc08e871369228148 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 28 Oct 2019 16:45:47 +0100
Subject: [PATCH] show some contacts details immediately, the rest just later

---
 .../pro/activities/ViewContactActivity.kt     | 35 ++++++++++++-------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
index 9c437aef..9500cabf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
@@ -205,22 +205,33 @@ class ViewContactActivity : ContactActivity() {
 
         ContactsHelper(this).getContactSources {
             contactSources = it
-            getDuplicateContacts {
-                setupPhoneNumbers()
-                setupEmails()
-                setupAddresses()
-                setupIMs()
-                setupEvents()
-                setupWebsites()
-                setupGroups()
-                setupContactSources()
-                setupNotes()
-                setupOrganization()
-                updateTextColors(contact_scrollview)
+            runOnUiThread {
+                setupContactDetails()
+                getDuplicateContacts {
+                    setupContactDetails()
+                }
             }
         }
     }
 
+    private fun setupContactDetails() {
+        if (isFinishing || isDestroyed) {
+            return
+        }
+
+        setupPhoneNumbers()
+        setupEmails()
+        setupAddresses()
+        setupIMs()
+        setupEvents()
+        setupWebsites()
+        setupGroups()
+        setupContactSources()
+        setupNotes()
+        setupOrganization()
+        updateTextColors(contact_scrollview)
+    }
+
     private fun launchEditContact(contact: Contact) {
         wasEditLaunched = true
         editContact(contact)