New work on contacts

Signed-off-by: Mario Danic <mario@lovelyhq.com>

app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.kt

@@ -161,7 +161,7 @@ class UserItem(
                 ))
 
             }
-        } else if ("groups" == model.source) {
+        } else if ("groups" == model.source || "circles" == model.source) {
             holder.avatarImageView?.load(Images().getImageWithBackground(activityContext, R.drawable.ic_people_group_white_24px))
         } else if ("emails" == model.source) {
             holder.avatarImageView?.load(Images().getImageWithBackground(activityContext, R.drawable.ic_baseline_email_24))

app/src/main/java/com/nextcloud/talk/controllers/ContactsController.kt

@@ -27,7 +27,6 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.text.InputType
-import android.text.TextUtils
 import android.util.Log
 import android.view.*
 import android.view.inputmethod.EditorInfo
@@ -51,7 +50,6 @@ import com.kennyc.bottomsheet.BottomSheet
 import com.nextcloud.talk.R
 import com.nextcloud.talk.activities.MagicCallActivity
 import com.nextcloud.talk.adapters.items.GenericTextHeaderItem
-import com.nextcloud.talk.adapters.items.ProgressItem
 import com.nextcloud.talk.adapters.items.UserItem
 import com.nextcloud.talk.api.NcApi
 import com.nextcloud.talk.controllers.base.BaseController
@@ -65,7 +63,6 @@ import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser
 import com.nextcloud.talk.models.json.conversations.Conversation
 import com.nextcloud.talk.models.json.conversations.RoomOverall
 import com.nextcloud.talk.models.json.participants.Participant
-import com.nextcloud.talk.models.json.sharees.Sharee
 import com.nextcloud.talk.newarch.domain.repository.offline.UsersRepository
 import com.nextcloud.talk.newarch.local.models.UserNgEntity
 import com.nextcloud.talk.utils.ApiUtils
@@ -100,7 +97,7 @@ import kotlin.String
 class ContactsController : BaseController,
         SearchView.OnQueryTextListener,
         FlexibleAdapter.OnItemClickListener,
-        FastScroller.OnScrollStateChangeListener{
+        FastScroller.OnScrollStateChangeListener {
 
     val usersRepository: UsersRepository by inject()
     val ncApi: NcApi by inject()
@@ -160,8 +157,6 @@ class ContactsController : BaseController,
 
     private val selectedUserIds: MutableSet<String> = mutableSetOf()
     private val selectedGroupIds: MutableSet<String> = mutableSetOf()
-    private var existingParticipants: List<String>? = null
-    private var isAddingParticipantsView: Boolean = false
     private var conversationToken: String? = null
 
     constructor() : super() {
@@ -172,16 +167,9 @@ class ContactsController : BaseController,
         setHasOptionsMenu(true)
         if (args.containsKey(BundleKeys.KEY_NEW_CONVERSATION)) {
             isNewConversationView = true
-            existingParticipants = ArrayList()
+        } else {
-        } else if (args.containsKey(BundleKeys.KEY_ADD_PARTICIPANTS)) {
+            isNewConversationView = false
-            isAddingParticipantsView = true
             conversationToken = args.getString(BundleKeys.KEY_TOKEN)
-
-            existingParticipants = ArrayList()
-
-            if (args.containsKey(BundleKeys.KEY_EXISTING_PARTICIPANTS)) {
-                existingParticipants = args.getStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS)
-            }
         }
     }
 
@@ -203,9 +191,7 @@ class ContactsController : BaseController,
 
         if (isNewConversationView) {
             toggleNewCallHeaderVisibility(!isPublicCall)
-        }
+        } else {
-
-        if (isAddingParticipantsView) {
             joinConversationViaLinkLayout!!.visibility = View.GONE
             conversationPrivacyToogleLayout!!.visibility = View.GONE
         }
@@ -246,7 +232,7 @@ class ContactsController : BaseController,
     }
 
     private fun selectionDone() {
-        if (!isAddingParticipantsView) {
+        if (isNewConversationView) {
             if (!isPublicCall && selectedGroupIds.size + selectedUserIds.size == 1) {
                 val userId: String
                 var roomType = "1"
@@ -457,7 +443,7 @@ class ContactsController : BaseController,
 
         val retrofitBucket: RetrofitBucket = ApiUtils.getRetrofitBucketForContactsSearchFor14(currentUser!!.baseUrl, query)
         val modifiedQueryMap = HashMap<String, Any>(retrofitBucket.queryMap)
-        modifiedQueryMap["limit"] = 100
+        modifiedQueryMap["limit"] = 50
 
         var shareTypesList: MutableList<String> = mutableListOf()
         // user
@@ -467,8 +453,8 @@ class ContactsController : BaseController,
         // remote/circles
         shareTypesList.add("7");
 
-        if (!isNewConversationView) {
+        conversationToken?.let {
-            modifiedQueryMap["itemId"] = "difz"
+            modifiedQueryMap["itemId"] = it
             // emails
             shareTypesList.add("4")
         }
@@ -497,39 +483,39 @@ class ContactsController : BaseController,
                             autocompleteUsersHashSet.addAll(autocompleteOverall.ocs.data)
 
                             for (autocompleteUser in autocompleteUsersHashSet) {
-                                if (autocompleteUser.id != currentUser!!.userId && !existingParticipants!!.contains(
+                                participant = Participant()
-                                                autocompleteUser.id
+                                participant.userId = autocompleteUser.id
-                                        )
+                                participant.displayName = autocompleteUser.label
-                                ) {
+                                participant.source = autocompleteUser.source
-                                    participant = Participant()
-                                    participant.userId = autocompleteUser.id
-                                    participant.displayName = autocompleteUser.label
-                                    participant.source = autocompleteUser.source
 
-                                    val headerTitle: String
+                                var headerTitle: String?
 
-                                    if (autocompleteUser.source != "groups") {
-                                        headerTitle = participant.displayName
-                                                .substring(0, 1)
-                                                .toUpperCase()
-                                    } else {
-                                        headerTitle = resources!!.getString(R.string.nc_groups)
-                                    }
 
-                                    val genericTextHeaderItem: GenericTextHeaderItem
+                                if (autocompleteUser.source == "groups") {
-                                    if (!userHeaderItems.containsKey(headerTitle)) {
+                                    headerTitle = resources?.getString(R.string.nc_groups)
-                                        genericTextHeaderItem = GenericTextHeaderItem(headerTitle)
+                                } else if (autocompleteUser.source == "users") {
-                                        userHeaderItems[headerTitle] = genericTextHeaderItem
+                                    headerTitle = resources?.getString(R.string.nc_contacts)
-                                    }
+                                } else if (autocompleteUser.source == "emails") {
+                                    headerTitle = resources?.getString(R.string.nc_emails)
+                                } else {
+                                    headerTitle = ""
+                                }
                                 
-                                    val newContactItem = UserItem(
+                                headerTitle as String
-                                            participant, currentUser!!,
-                                            userHeaderItems[headerTitle], activity!!
-                                    )
                                 
-                                    if (!contactItems!!.contains(newContactItem)) {
+                                val genericTextHeaderItem: GenericTextHeaderItem
-                                        newUserItemList.add(newContactItem)
+                                if (!userHeaderItems.containsKey(headerTitle)) {
-                                    }
+                                    genericTextHeaderItem = GenericTextHeaderItem(headerTitle)
+                                    userHeaderItems[headerTitle] = genericTextHeaderItem
+                                }
+
+                                val newContactItem = UserItem(
+                                        participant, currentUser!!,
+                                        userHeaderItems[headerTitle], activity!!
+                                )
+
+                                if (!contactItems!!.contains(newContactItem)) {
+                                    newUserItemList.add(newContactItem)
                                 }
                             }
                         } catch (exception: Exception) {
@@ -714,11 +700,7 @@ class ContactsController : BaseController,
     }
 
     override fun getTitle(): String? {
-        return if (!isNewConversationView && !isAddingParticipantsView) {
+        return resources?.getString(R.string.nc_select_contacts)
-            resources!!.getString(R.string.nc_app_name)
-        } else {
-            resources!!.getString(R.string.nc_select_contacts)
-        }
     }
 
     override fun onFastScrollerStateChange(scrolling: Boolean) {
@@ -797,117 +779,47 @@ class ContactsController : BaseController,
             view: View,
             position: Int
     ): Boolean {
-        if (adapter!!.getItem(position) is UserItem) {
+        val participant = (adapter!!.getItem(position) as UserItem).model
-            if (!isNewConversationView && !isAddingParticipantsView) {
+        participant.selected = !participant.selected
-                val userItem = adapter!!.getItem(position) as UserItem?
-                var roomType = "1"
 
-                if ("groups" == userItem!!.model.source) {
+        if ("groups" == participant.source) {
-                    roomType = "2"
+            if (participant.selected) {
-                }
+                selectedGroupIds.add(participant.userId)
-
-                val retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(
-                        currentUser!!.baseUrl, roomType,
-                        userItem.model.userId, null
-                )
-
-                ncApi.createRoom(
-                        credentials,
-                        retrofitBucket.url, retrofitBucket.queryMap
-                )
-                        .subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .`as`(AutoDispose.autoDisposable(scopeProvider))
-                        .subscribe(object : Observer<RoomOverall> {
-                            override fun onSubscribe(d: Disposable) {
-
-                            }
-
-                            override fun onNext(roomOverall: RoomOverall) {
-                                if (activity != null) {
-                                    val conversationIntent = Intent(activity, MagicCallActivity::class.java)
-                                    val bundle = Bundle()
-                                    bundle.putParcelable(BundleKeys.KEY_USER_ENTITY, currentUser)
-                                    bundle.putString(
-                                            BundleKeys.KEY_ROOM_TOKEN,
-                                            roomOverall.ocs.data.token
-                                    )
-                                    bundle.putString(
-                                            BundleKeys.KEY_ROOM_ID,
-                                            roomOverall.ocs.data.conversationId
-                                    )
-                                    conversationIntent.putExtras(bundle)
-
-                                    if (currentUser!!.hasSpreedFeatureCapability("chat-v2")) {
-                                        bundle.putParcelable(
-                                                BundleKeys.KEY_ACTIVE_CONVERSATION,
-                                                Parcels.wrap(roomOverall.ocs.data)
-                                        )
-
-                                        ConductorRemapping.remapChatController(
-                                                router,
-                                                currentUser!!.id!!,
-                                                roomOverall.ocs.data.token!!, bundle, true
-                                        )
-                                    } else {
-                                        startActivity(conversationIntent)
-                                        Handler().postDelayed({ router.popCurrentController() }, 100)
-                                    }
-                                }
-                            }
-
-                            override fun onError(e: Throwable) {
-
-                            }
-
-                            override fun onComplete() {
-
-                            }
-                        })
             } else {
-                val participant = (adapter!!.getItem(position) as UserItem).model
+                selectedGroupIds.remove(participant.userId)
-                participant.selected = !participant.selected
-
-                if ("groups" == participant.source) {
-                    if (participant.selected) {
-                        selectedGroupIds.add(participant.userId)
-                    } else {
-                        selectedGroupIds.remove(participant.userId)
-                    }
-                } else {
-                    if (participant.selected) {
-                        selectedUserIds.add(participant.userId)
-                    } else {
-                        selectedUserIds.remove(participant.userId)
-                    }
-                }
-
-                if (currentUser!!.hasSpreedFeatureCapability("last-room-activity")
-                        && !currentUser!!.hasSpreedFeatureCapability("invite-groups-and-mails") &&
-                        "groups" == (adapter!!.getItem(position) as UserItem).model.source &&
-                        participant.selected &&
-                        adapter!!.selectedItemCount > 1
-                ) {
-                    val currentItems = adapter!!.currentItems
-                    var internalParticipant: Participant
-                    for (i in currentItems.indices) {
-                        if (currentItems[i] is UserItem) {
-                            internalParticipant = (currentItems[i] as UserItem).model
-                            if (internalParticipant.userId == participant.userId
-                                    &&
-                                    "groups" == internalParticipant.source
-                                    && internalParticipant.selected
-                            ) {
-                                internalParticipant.selected = false
-                                selectedGroupIds.remove(internalParticipant.userId)
-                            }
-                        }
-                    }
-                }
-
-                adapter!!.notifyDataSetChanged()
-                checkAndHandleDoneMenuItem()
             }
+        } else {
+            if (participant.selected) {
+                selectedUserIds.add(participant.userId)
+            } else {
+                selectedUserIds.remove(participant.userId)
+            }
+        }
+
+        if (currentUser!!.hasSpreedFeatureCapability("last-room-activity")
+                && !currentUser!!.hasSpreedFeatureCapability("invite-groups-and-mails") &&
+                "groups" == (adapter!!.getItem(position) as UserItem).model.source &&
+                participant.selected &&
+                adapter!!.selectedItemCount > 1
+        ) {
+            val currentItems = adapter!!.currentItems
+            var internalParticipant: Participant
+            for (i in currentItems.indices) {
+                if (currentItems[i] is UserItem) {
+                    internalParticipant = (currentItems[i] as UserItem).model
+                    if (internalParticipant.userId == participant.userId
+                            &&
+                            "groups" == internalParticipant.source
+                            && internalParticipant.selected
+                    ) {
+                        internalParticipant.selected = false
+                        selectedGroupIds.remove(internalParticipant.userId)
+                    }
+                }
+            }
+
+            adapter!!.notifyDataSetChanged()
+            checkAndHandleDoneMenuItem()
         }
         return true
     }

app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt

@@ -501,15 +501,6 @@ class ConversationInfoController(args: Bundle) : BaseController(),
             adapter!!.addListener(this)
             actionTextView.setOnClickListener {
                 val bundle = Bundle()
-                val existingParticipantsId = arrayListOf<String>()
-
-                recyclerViewItems.forEach {
-                    val userItem = it as UserItem
-                    existingParticipantsId.add(userItem.model.userId)
-                }
-
-                bundle.putBoolean(BundleKeys.KEY_ADD_PARTICIPANTS, true)
-                bundle.putStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS, existingParticipantsId)
                 bundle.putString(BundleKeys.KEY_TOKEN, conversation!!.token)
 
                 router.pushController(

app/src/main/res/values/strings.xml

@@ -285,6 +285,9 @@
     <!-- Other -->
     <string name="nc_limit_hit">%s characters limit has been hit</string>
     <string name="nc_groups">Groups</string>
+    <string name="nc_contacts">Contacts</string>
+    <string name="nc_circles">Circles</string>
+    <string name="nc_emails">Emails</string>
     <string name="nc_participants">Participants</string>
 
     <string name="nc_owner">Owner</string>