smartlist, pendinglist: specific menuitems options for swarm 1:1 and group

Display specific menuitems options for "swarm group" and "swarm one to one"

GitLab: #1342
GitLab: #1548
Change-Id: I0d2ac7e190de35f7cd30d27a8f165029b41e258b

jami-android/app/src/main/java/cx/ring/fragments/HomeFragment.kt

@@ -278,16 +278,26 @@ class HomeFragment: BaseSupportFragment<HomePresenter, HomeView>(),
     }.root
 
     private fun displayConversationRequestDialog(conversation: Conversation) {
-        MaterialAlertDialogBuilder(requireContext())
-            .setItems(R.array.swarm_actions) { dialog, which ->
-                when (which) {
-                    0 -> TextUtils.copyToClipboard(
-                            requireContext(),
-                            (conversation.contact?.uri ?: conversation.uri).toString())
-                    1 -> mConversationFacade.discardRequest(conversation.accountId, conversation.uri)
-                    2 -> mConversationFacade.banConversation(conversation.accountId, conversation.uri)
-                }
-            }.show()
+        if (conversation.request!!.mode == Conversation.Mode.OneToOne)
+            MaterialAlertDialogBuilder(requireContext())
+                .setItems(R.array.swarm_request_one_to_one_actions) { _, which ->
+                    when (which) {
+                        0 -> mConversationFacade.acceptRequest(conversation)
+                        1 -> mConversationFacade
+                            .discardRequest(conversation.accountId, conversation.uri)
+                        2 -> mConversationFacade
+                            .banConversation(conversation.accountId, conversation.uri)
+                    }
+                }.show()
+        else
+            MaterialAlertDialogBuilder(requireContext())
+                .setItems(R.array.swarm_request_group_actions) { _, which ->
+                    when (which) {
+                        0 -> mConversationFacade.acceptRequest(conversation)
+                        1 -> mConversationFacade
+                            .discardRequest(conversation.accountId, conversation.uri)
+                    }
+                }.show()
     }
 
     private fun startSearch() {

jami-android/app/src/main/java/cx/ring/fragments/SmartListFragment.kt

@@ -103,8 +103,21 @@ class SmartListFragment : BaseSupportFragment<SmartListPresenter, SmartListView>
         ActionHelper.launchClearAction(requireContext(), accountId, conversationUri, this@SmartListFragment)
     }
 
-    override fun displayDeleteDialog(accountId: String, conversationUri: Uri) {
-        ActionHelper.launchDeleteAction(requireContext(), accountId, conversationUri, this@SmartListFragment)
+    override fun displayDeleteDialog(accountId: String, conversationUri: Uri, isGroup: Boolean) {
+        if (isGroup)
+            ActionHelper.launchDeleteSwarmGroupAction(
+                context = requireContext(),
+                accountId = accountId,
+                uri = conversationUri,
+                callback = this@SmartListFragment
+            )
+        else
+            ActionHelper.launchDeleteSwarmOneToOneAction(
+                context = requireContext(),
+                accountId = accountId,
+                uri = conversationUri,
+                callback = this@SmartListFragment
+            )
     }
 
     override fun copyNumber(uri: Uri) {
@@ -159,33 +172,39 @@ class SmartListFragment : BaseSupportFragment<SmartListPresenter, SmartListView>
     }
 
     override fun onItemLongClick(item: Conversation) {
+
         if (item.isSwarm) {
-            if (item.contacts.size == 2) {
-                MaterialAlertDialogBuilder(requireContext()).setItems(R.array.swarm_actions) { dialog, which ->
-                    when (which) {
-                        0 -> presenter.copyNumber(item)
-                        1 -> presenter.removeConversation(item)
-                        2 -> presenter.banContact(item)
+            // Don't display same menu item if swarm group or if swarm one to one.
+            if (item.isSwarmGroup()) {
+                MaterialAlertDialogBuilder(requireContext())
+                    .setItems(R.array.swarm_group_actions) { _, which ->
+                        when (which) {
+                            0 -> presenter.removeConversation(item)
+                        }
                     }
-                }.show()
+                    .show()
             } else {
-                // swarm group
-                MaterialAlertDialogBuilder(requireContext()).setItems(R.array.swarm_group_actions) { dialog, which ->
-                    when (which) {
-                        1 -> presenter.removeConversation(item)
-                        2 -> presenter.banContact(item)
+                MaterialAlertDialogBuilder(requireContext())
+                    .setItems(R.array.swarm_one_to_one_actions) { _, which ->
+                        when (which) {
+                            0 -> presenter.copyNumber(item)
+                            1 -> presenter.removeConversation(item)
+                            2 -> presenter.banContact(item)
+                        }
                     }
-                }.show()
+                    .show()
             }
         } else {
-            MaterialAlertDialogBuilder(requireContext()).setItems(R.array.conversation_actions) { dialog, which ->
-                when (which) {
-                    ActionHelper.ACTION_COPY -> presenter.copyNumber(item)
-                    ActionHelper.ACTION_CLEAR -> presenter.clearConversation(item)
-                    ActionHelper.ACTION_DELETE -> presenter.removeConversation(item)
-                    ActionHelper.ACTION_BLOCK -> presenter.banContact(item)
+            MaterialAlertDialogBuilder(requireContext())
+                .setItems(R.array.conversation_actions) { _, which ->
+                    when (which) {
+                        ActionHelper.ACTION_COPY -> presenter.copyNumber(item)
+                        ActionHelper.ACTION_CLEAR -> presenter.clearConversation(item)
+                        ActionHelper.ACTION_DELETE -> presenter.removeConversation(item)
+                        ActionHelper.ACTION_BLOCK -> presenter.banContact(item)
+                    }
                 }
-            }.show()
+                .show()
         }
     }
 

jami-android/app/src/main/java/cx/ring/utils/ActionHelper.kt

@@ -115,14 +115,29 @@ object ActionHelper {
             .show()
     }
 
-    fun launchDeleteAction(context: Context, accountId: String, uri: Uri, callback: ConversationActionCallback) {
+    fun launchDeleteSwarmOneToOneAction(
+        context: Context, accountId: String, uri: Uri, callback: ConversationActionCallback,
+    ) {
         MaterialAlertDialogBuilder(context)
             .setTitle(R.string.conversation_action_remove_this_title)
             .setMessage(R.string.conversation_action_remove_this_message)
-            .setPositiveButton(android.R.string.ok) { dialog: DialogInterface?, whichButton: Int ->
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 callback.removeConversation(accountId, uri)
             }
-            .setNegativeButton(android.R.string.cancel) { dialog: DialogInterface?, whichButton: Int -> }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
+            .show()
+    }
+
+    fun launchDeleteSwarmGroupAction(
+        context: Context, accountId: String, uri: Uri, callback: ConversationActionCallback,
+    ) {
+        MaterialAlertDialogBuilder(context)
+            .setTitle(R.string.swarm_group_action_leave_title)
+            .setMessage(R.string.swarm_group_action_leave_message)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                callback.removeConversation(accountId, uri)
+            }
+            .setNegativeButton(android.R.string.cancel) { _, _ -> }
             .show()
     }
 

jami-android/app/src/main/res/values/arrays.xml

@@ -23,15 +23,23 @@ along with this program; if not, write to the Free Software
         <item>@string/conversation_action_remove_this</item>
         <item>@string/conversation_action_block_this</item>
     </string-array>
-    <string-array name="swarm_actions">
+    <string-array name="swarm_one_to_one_actions">
         <item>@string/conversation_action_copy_peer_number</item>
         <item>@string/conversation_action_remove_this</item>
         <item>@string/conversation_action_block_this</item>
     </string-array>
     <string-array name="swarm_group_actions">
-        <item>@string/conversation_action_remove_this</item>
+        <item>@string/swarm_group_action_leave</item>
+    </string-array>
+    <string-array name="swarm_request_one_to_one_actions">
+        <item>@string/accept_request</item>
+        <item>@string/refuse_request</item>
         <item>@string/conversation_action_block_this</item>
     </string-array>
+    <string-array name="swarm_request_group_actions">
+        <item>@string/accept_request</item>
+        <item>@string/refuse_request</item>
+    </string-array>
 
     <string-array name="video_bitrates">
         <item>0</item>

jami-android/app/src/main/res/values/strings.xml

@@ -325,7 +325,10 @@ along with this program; if not, write to the Free Software
     <string name="conversation_action_remove_this">Delete contact</string>
     <string name="conversation_action_remove_this_title">Delete this contact?</string>
     <string name="conversation_action_remove_this_message">This will delete the contact and definitely clear the conversation history.</string>
-    <string name="conversation_action_copy_peer_number">Copy number</string>
+    <string name="swarm_group_action_leave">Leave group</string>
+    <string name="swarm_group_action_leave_title">Leave this group?</string>
+    <string name="swarm_group_action_leave_message">This will remove the conversation from your conversations list</string>
+    <string name="conversation_action_copy_peer_number">Copy contact identifier</string>
     <string name="conversation_action_copied_peer_number_clipboard">%1$s copied to clipboard</string>
     <string name="conversation_action_select_peer_number">Select a number</string>
     <string name="conversation_action_block_this">Block contact</string>
@@ -431,6 +434,8 @@ along with this program; if not, write to the Free Software
     <string name="accept">Accept</string>
     <string name="refuse">Refuse</string>
     <string name="block">Block</string>
+    <string name="refuse_request">Refuse request</string>
+    <string name="accept_request">Accept request</string>
     <string name="contact_request_title">New contact request</string>
     <string name="contact_request_msg">You have %1$d contact requests</string>
     <string name="contact_request_account">For %1$s</string>

jami-android/libjamiclient/src/main/kotlin/net/jami/model/Conversation.kt

@@ -725,7 +725,10 @@ class Conversation : ConversationHistory {
     fun isGroup() = isSwarm && contacts.size > 2
 
     /** Tells if the conversation is a swarm:group. No matter how many participants. */
-    fun isSwarmGroup() = isSwarm && mode.blockingFirst() != Mode.OneToOne
+    fun isSwarmGroup() = isSwarm && mode.blockingFirst().let {
+        if (it == Mode.Request) request?.mode != Mode.OneToOne
+        else it != Mode.OneToOne
+    }
 
     /** Return user. Maybe be null. */
     fun getUser(): Contact? = contacts.firstOrNull { it.isUser }

jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListPresenter.kt

@@ -69,9 +69,12 @@ class SmartListPresenter @Inject constructor(
             .subscribeOn(Schedulers.computation()).subscribe())
     }
 
-    fun removeConversation(conversation: Conversation) {
-        view?.displayDeleteDialog(conversation.accountId, conversation.uri)
-    }
+    fun removeConversation(conversation: Conversation) =
+        view?.displayDeleteDialog(
+            conversation.accountId,
+            conversation.uri,
+            conversation.isSwarmGroup()
+        )
 
     fun removeConversation(accountId: String, uri: Uri) {
         mCompositeDisposable.add(conversationFacade.removeConversation(accountId, uri)

jami-android/libjamiclient/src/main/kotlin/net/jami/smartlist/SmartListView.kt

@@ -24,7 +24,7 @@ interface SmartListView {
     fun displayChooseNumberDialog(numbers: Array<CharSequence>)
     fun displayNoConversationMessage()
     fun displayClearDialog(accountId: String, conversationUri: Uri)
-    fun displayDeleteDialog(accountId: String, conversationUri: Uri)
+    fun displayDeleteDialog(accountId: String, conversationUri: Uri, isGroup: Boolean)
     fun copyNumber(uri: Uri)
     fun setLoading(loading: Boolean)
     fun hideList()