From 6eade329d6feac8703e0619a0d1a07a143d40640 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 21 Mar 2018 19:20:55 +0100
Subject: [PATCH] add helper functions to handle contact adding and removing
 from groups

---
 .../activities/GroupContactsActivity.kt       | 11 ++++-----
 .../contacts/adapters/ContactsAdapter.kt      | 13 ++++++----
 .../contacts/extensions/Activity.kt           | 24 +++++++++++++++++++
 .../contacts/helpers/DBHelper.kt              |  8 +++++++
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt
index a3295dc4..56ae0909 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt
@@ -5,10 +5,7 @@ import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.contacts.R
 import com.simplemobiletools.contacts.adapters.ContactsAdapter
 import com.simplemobiletools.contacts.dialogs.SelectContactsDialog
-import com.simplemobiletools.contacts.extensions.config
-import com.simplemobiletools.contacts.extensions.editContact
-import com.simplemobiletools.contacts.extensions.tryStartCall
-import com.simplemobiletools.contacts.extensions.viewContact
+import com.simplemobiletools.contacts.extensions.*
 import com.simplemobiletools.contacts.helpers.*
 import com.simplemobiletools.contacts.interfaces.RefreshContactsListener
 import com.simplemobiletools.contacts.interfaces.RemoveFromGroupListener
@@ -48,11 +45,11 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh
 
     private fun fabClicked() {
         SelectContactsDialog(this, allContacts, groupContacts) { addedContacts, removedContacts ->
-            ContactsHelper(this).apply {
+            Thread {
                 addContactsToGroup(addedContacts, group.id)
                 removeContactsFromGroup(removedContacts, group.id)
-            }
-            refreshContacts()
+                refreshContacts()
+            }.start()
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
index aa551595..7cc74c73 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt
@@ -21,6 +21,7 @@ import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.contacts.R
 import com.simplemobiletools.contacts.activities.SimpleActivity
 import com.simplemobiletools.contacts.dialogs.CreateNewGroupDialog
+import com.simplemobiletools.contacts.extensions.addContactsToGroup
 import com.simplemobiletools.contacts.extensions.config
 import com.simplemobiletools.contacts.extensions.editContact
 import com.simplemobiletools.contacts.extensions.shareContacts
@@ -197,13 +198,17 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList<Cont
         RadioGroupDialog(activity, items, 0) {
             if (it as Int == NEW_GROUP_ID) {
                 CreateNewGroupDialog(activity) {
-                    ContactsHelper(activity).addContactsToGroup(selectedContacts, it.id)
-                    refreshListener?.refreshContacts(GROUPS_TAB_MASK)
+                    Thread {
+                        activity.addContactsToGroup(selectedContacts, it.id)
+                        refreshListener?.refreshContacts(GROUPS_TAB_MASK)
+                    }.start()
                     finishActMode()
                 }
             } else {
-                ContactsHelper(activity).addContactsToGroup(selectedContacts, it.toLong())
-                refreshListener?.refreshContacts(GROUPS_TAB_MASK)
+                Thread {
+                    activity.addContactsToGroup(selectedContacts, it.toLong())
+                    refreshListener?.refreshContacts(GROUPS_TAB_MASK)
+                }.start()
                 finishActMode()
             }
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt
index 3aa0661c..85927bf1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Activity.kt
@@ -108,3 +108,27 @@ fun BaseSimpleActivity.getTempFile(): File? {
 
     return File(folder, "contacts.vcf")
 }
+
+fun BaseSimpleActivity.addContactsToGroup(contacts: ArrayList<Contact>, groupId: Long) {
+    val publicContacts = contacts.filter { it.source != SMT_PRIVATE }
+    val privateContacts = contacts.filter { it.source == SMT_PRIVATE }
+    if (publicContacts.isNotEmpty()) {
+        ContactsHelper(this).addContactsToGroup(contacts, groupId)
+    }
+
+    if (privateContacts.isNotEmpty()) {
+        dbHelper.addContactsToGroup(contacts, groupId)
+    }
+}
+
+fun BaseSimpleActivity.removeContactsFromGroup(contacts: ArrayList<Contact>, groupId: Long) {
+    val publicContacts = contacts.filter { it.source != SMT_PRIVATE }
+    val privateContacts = contacts.filter { it.source == SMT_PRIVATE }
+    if (publicContacts.isNotEmpty()) {
+        ContactsHelper(this).removeContactsFromGroup(contacts, groupId)
+    }
+
+    if (privateContacts.isNotEmpty()) {
+        dbHelper.removeContactsFromGroup(contacts, groupId)
+    }
+}
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt
index 78760c3d..b2cddb09 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/DBHelper.kt
@@ -193,6 +193,14 @@ class DBHelper private constructor(val context: Context) : SQLiteOpenHelper(cont
         }
     }
 
+    fun addContactsToGroup(contacts: ArrayList<Contact>, groupId: Long) {
+
+    }
+
+    fun removeContactsFromGroup(contacts: ArrayList<Contact>, groupId: Long) {
+
+    }
+
     fun getContacts(activity: BaseSimpleActivity, selection: String? = null, selectionArgs: Array<String>? = null): ArrayList<Contact> {
         val storedGroups = ContactsHelper(activity).getStoredGroups()
         val contacts = ArrayList<Contact>()