TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-25 11:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add block to the delete all message requests, only if they're not open group inbox contacts

Browse Source
This commit is contained in:
0x330a 2023-05-11 13:40:35 +10:00
parent db18b156a3
commit ad09888c80
No known key found for this signature in database
GPG Key ID: 267811D6E6A2698C
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsAdapter.kt
View File

@ -48,6 +48,7 @@ class MessageRequestsAdapter(
private fun showPopupMenu(view: MessageRequestView) { private fun showPopupMenu(view: MessageRequestView) {
val popupMenu = PopupMenu(ContextThemeWrapper(context, R.style.PopupMenu_MessageRequests), view) val popupMenu = PopupMenu(ContextThemeWrapper(context, R.style.PopupMenu_MessageRequests), view)
popupMenu.menuInflater.inflate(R.menu.menu_message_request, popupMenu.menu) popupMenu.menuInflater.inflate(R.menu.menu_message_request, popupMenu.menu)
popupMenu.menu.findItem(R.id.menu_block_message_request)?.isVisible = !view.thread!!.recipient.isOpenGroupInboxRecipient
popupMenu.setOnMenuItemClickListener { menuItem -> popupMenu.setOnMenuItemClickListener { menuItem ->
if (menuItem.itemId == R.id.menu_delete_message_request) { if (menuItem.itemId == R.id.menu_delete_message_request) {
listener.onDeleteConversationClick(view.thread!!) listener.onDeleteConversationClick(view.thread!!)

4
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestsViewModel.kt
View File

@ -25,8 +25,8 @@ class MessageRequestsViewModel @Inject constructor(
repository.deleteMessageRequest(thread) repository.deleteMessageRequest(thread)
} }
fun clearAllMessageRequests() = viewModelScope.launch { fun clearAllMessageRequests(block: Boolean) = viewModelScope.launch {
repository.clearAllMessageRequests() repository.clearAllMessageRequests(block)
} }
} }

10
app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt
View File

@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.repository package org.thoughtcrime.securesms.repository
import org.jetbrains.annotations.Contract
import org.session.libsession.database.MessageDataProvider import org.session.libsession.database.MessageDataProvider
import org.session.libsession.messaging.messages.Destination import org.session.libsession.messaging.messages.Destination
import org.session.libsession.messaging.messages.control.MessageRequestResponse import org.session.libsession.messaging.messages.control.MessageRequestResponse
@ -65,7 +64,7 @@ interface ConversationRepository {
suspend fun deleteMessageRequest(thread: ThreadRecord): ResultOf<Unit> suspend fun deleteMessageRequest(thread: ThreadRecord): ResultOf<Unit>
suspend fun clearAllMessageRequests(): ResultOf<Unit> suspend fun clearAllMessageRequests(block: Boolean): ResultOf<Unit>
suspend fun acceptMessageRequest(threadId: Long, recipient: Recipient): ResultOf<Unit> suspend fun acceptMessageRequest(threadId: Long, recipient: Recipient): ResultOf<Unit>
@ -131,7 +130,6 @@ class DefaultConversationRepository @Inject constructor(
} }
// This assumes that recipient.isContactRecipient is true // This assumes that recipient.isContactRecipient is true
@Contract
override fun setBlocked(recipient: Recipient, blocked: Boolean) { override fun setBlocked(recipient: Recipient, blocked: Boolean) {
storage.setBlocked(listOf(recipient), blocked) storage.setBlocked(listOf(recipient), blocked)
} }
@ -267,10 +265,14 @@ class DefaultConversationRepository @Inject constructor(
return ResultOf.Success(Unit) return ResultOf.Success(Unit)
} }
override suspend fun clearAllMessageRequests(): ResultOf<Unit> { override suspend fun clearAllMessageRequests(block: Boolean): ResultOf<Unit> {
threadDb.readerFor(threadDb.unapprovedConversationList).use { reader -> threadDb.readerFor(threadDb.unapprovedConversationList).use { reader ->
while (reader.next != null) { while (reader.next != null) {
deleteMessageRequest(reader.current) deleteMessageRequest(reader.current)
val recipient = reader.current.recipient
if (block && !recipient.isOpenGroupInboxRecipient) {
setBlocked(recipient, true)
}
} }
} }
return ResultOf.Success(Unit) return ResultOf.Success(Unit)