From 4113aa681dd478da46a155a4088e304604d1fcaa Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 15 Sep 2019 21:03:39 +0200
Subject: [PATCH] show websites at contact details

---
 .../pro/activities/ViewContactActivity.kt     | 43 ++++++++++++-------
 1 file changed, 27 insertions(+), 16 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 d8ee9295..4b4eb194 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
@@ -19,10 +19,10 @@ import com.simplemobiletools.contacts.pro.extensions.*
 import com.simplemobiletools.contacts.pro.helpers.*
 import com.simplemobiletools.contacts.pro.models.*
 import kotlinx.android.synthetic.main.activity_view_contact.*
-import kotlinx.android.synthetic.main.item_event.view.*
 import kotlinx.android.synthetic.main.item_view_address.view.*
 import kotlinx.android.synthetic.main.item_view_contact_source.view.*
 import kotlinx.android.synthetic.main.item_view_email.view.*
+import kotlinx.android.synthetic.main.item_view_event.view.*
 import kotlinx.android.synthetic.main.item_view_group.view.*
 import kotlinx.android.synthetic.main.item_view_im.view.*
 import kotlinx.android.synthetic.main.item_view_phone_number.view.*
@@ -208,13 +208,13 @@ class ViewContactActivity : ContactActivity() {
                 setupAddresses()
                 setupIMs()
                 setupEvents()
+                setupNotes()
+                setupOrganization()
+                setupWebsites()
                 setupContactSources()
             }
         }
 
-        setupNotes()
-        setupOrganization()
-        setupWebsites()
         setupGroups()
     }
 
@@ -487,22 +487,33 @@ class ViewContactActivity : ContactActivity() {
 
     private fun setupWebsites() {
         contact_websites_holder.removeAllViews()
-        val websites = contact!!.websites
-        if (websites.isNotEmpty() && showFields and SHOW_WEBSITES_FIELD != 0) {
-            websites.forEach {
-                val url = it
-                layoutInflater.inflate(R.layout.item_website, contact_websites_holder, false).apply {
-                    contact_websites_holder.addView(this)
-                    contact_website.text = url
-                    copyOnLongClick(url)
+        if (showFields and SHOW_WEBSITES_FIELD != 0) {
+            var websites = contact!!.websites.toMutableSet() as LinkedHashSet<String>
+            duplicateContacts.forEach {
+                websites.addAll(it.websites)
+            }
 
-                    setOnClickListener {
-                        openWebsiteIntent(url)
+            websites = websites.sorted().toMutableSet() as LinkedHashSet<String>
+
+            if (websites.isNotEmpty()) {
+                websites.forEach {
+                    val url = it
+                    layoutInflater.inflate(R.layout.item_website, contact_websites_holder, false).apply {
+                        contact_websites_holder.addView(this)
+                        contact_website.text = url
+                        copyOnLongClick(url)
+
+                        setOnClickListener {
+                            openWebsiteIntent(url)
+                        }
                     }
                 }
+                contact_websites_image.beVisible()
+                contact_websites_holder.beVisible()
+            } else {
+                contact_websites_image.beGone()
+                contact_websites_holder.beGone()
             }
-            contact_websites_image.beVisible()
-            contact_websites_holder.beVisible()
         } else {
             contact_websites_image.beGone()
             contact_websites_holder.beGone()