Add launchConversationDetails extension

This commit is contained in:
Naveen Singh 2025-03-02 15:43:46 +05:30
parent d15f688296
commit 0a8273f676
No known key found for this signature in database
GPG key ID: AF5D43C216778C0B
3 changed files with 15 additions and 19 deletions

View file

@ -131,6 +131,7 @@ import org.fossify.messages.extensions.getThreadTitle
import org.fossify.messages.extensions.indexOfFirstOrNull import org.fossify.messages.extensions.indexOfFirstOrNull
import org.fossify.messages.extensions.isGifMimeType import org.fossify.messages.extensions.isGifMimeType
import org.fossify.messages.extensions.isImageMimeType import org.fossify.messages.extensions.isImageMimeType
import org.fossify.messages.extensions.launchConversationDetails
import org.fossify.messages.extensions.markMessageRead import org.fossify.messages.extensions.markMessageRead
import org.fossify.messages.extensions.markThreadMessagesUnread import org.fossify.messages.extensions.markThreadMessagesUnread
import org.fossify.messages.extensions.messagesDB import org.fossify.messages.extensions.messagesDB
@ -387,7 +388,7 @@ class ThreadActivity : SimpleActivity() {
R.id.archive -> archiveConversation() R.id.archive -> archiveConversation()
R.id.unarchive -> unarchiveConversation() R.id.unarchive -> unarchiveConversation()
R.id.rename_conversation -> renameConversation() R.id.rename_conversation -> renameConversation()
R.id.conversation_details -> showConversationDetails() R.id.conversation_details -> launchConversationDetails(threadId)
R.id.add_number_to_contact -> addNumberToContact() R.id.add_number_to_contact -> addNumberToContact()
R.id.dial_number -> dialNumber() R.id.dial_number -> dialNumber()
R.id.manage_people -> managePeople() R.id.manage_people -> managePeople()
@ -1258,13 +1259,6 @@ class ThreadActivity : SimpleActivity() {
} }
} }
private fun showConversationDetails() {
Intent(this, ConversationDetailsActivity::class.java).apply {
putExtra(THREAD_ID, threadId)
startActivity(this)
}
}
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
private fun getThreadItems(): ArrayList<ThreadItem> { private fun getThreadItems(): ArrayList<ThreadItem> {
val items = ArrayList<ThreadItem>() val items = ArrayList<ThreadItem>()

View file

@ -15,17 +15,16 @@ import org.fossify.commons.helpers.KEY_PHONE
import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.commons.views.MyRecyclerView import org.fossify.commons.views.MyRecyclerView
import org.fossify.messages.R import org.fossify.messages.R
import org.fossify.messages.activities.ConversationDetailsActivity
import org.fossify.messages.activities.SimpleActivity import org.fossify.messages.activities.SimpleActivity
import org.fossify.messages.dialogs.RenameConversationDialog import org.fossify.messages.dialogs.RenameConversationDialog
import org.fossify.messages.extensions.config import org.fossify.messages.extensions.config
import org.fossify.messages.extensions.deleteConversation import org.fossify.messages.extensions.deleteConversation
import org.fossify.messages.extensions.dialNumber import org.fossify.messages.extensions.dialNumber
import org.fossify.messages.extensions.launchConversationDetails
import org.fossify.messages.extensions.markThreadMessagesRead import org.fossify.messages.extensions.markThreadMessagesRead
import org.fossify.messages.extensions.markThreadMessagesUnread import org.fossify.messages.extensions.markThreadMessagesUnread
import org.fossify.messages.extensions.renameConversation import org.fossify.messages.extensions.renameConversation
import org.fossify.messages.extensions.updateConversationArchivedStatus import org.fossify.messages.extensions.updateConversationArchivedStatus
import org.fossify.messages.helpers.THREAD_ID
import org.fossify.messages.helpers.refreshMessages import org.fossify.messages.helpers.refreshMessages
import org.fossify.messages.messaging.isShortCodeWithLetters import org.fossify.messages.messaging.isShortCodeWithLetters
import org.fossify.messages.models.Conversation import org.fossify.messages.models.Conversation
@ -77,7 +76,9 @@ class ConversationsAdapter(
R.id.cab_delete -> askConfirmDelete() R.id.cab_delete -> askConfirmDelete()
R.id.cab_archive -> askConfirmArchive() R.id.cab_archive -> askConfirmArchive()
R.id.cab_rename_conversation -> renameConversation(getSelectedItems().first()) R.id.cab_rename_conversation -> renameConversation(getSelectedItems().first())
R.id.cab_conversation_details -> showConversationDetails() R.id.cab_conversation_details ->
activity.launchConversationDetails(getSelectedItems().first().threadId)
R.id.cab_mark_as_read -> markAsRead() R.id.cab_mark_as_read -> markAsRead()
R.id.cab_mark_as_unread -> markAsUnread() R.id.cab_mark_as_unread -> markAsUnread()
R.id.cab_pin_conversation -> pinConversation(true) R.id.cab_pin_conversation -> pinConversation(true)
@ -245,14 +246,6 @@ class ConversationsAdapter(
} }
} }
private fun showConversationDetails() {
val conversation = getSelectedItems().firstOrNull() ?: return
Intent(activity, ConversationDetailsActivity::class.java).apply {
putExtra(THREAD_ID, conversation.threadId)
activity.startActivity(this)
}
}
private fun markAsRead() { private fun markAsRead() {
if (selectedKeys.isEmpty()) { if (selectedKeys.isEmpty()) {
return return

View file

@ -11,6 +11,8 @@ import org.fossify.commons.helpers.IS_PRIVATE
import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.SimpleContactsHelper
import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.helpers.ensureBackgroundThread
import org.fossify.commons.models.SimpleContact import org.fossify.commons.models.SimpleContact
import org.fossify.messages.activities.ConversationDetailsActivity
import org.fossify.messages.helpers.THREAD_ID
import java.util.Locale import java.util.Locale
fun Activity.dialNumber(phoneNumber: String, callback: (() -> Unit)? = null) { fun Activity.dialNumber(phoneNumber: String, callback: (() -> Unit)? = null) {
@ -75,3 +77,10 @@ fun Activity.startContactDetailsIntent(contact: SimpleContact) {
} }
} }
} }
fun Activity.launchConversationDetails(threadId: Long) {
Intent(this, ConversationDetailsActivity::class.java).apply {
putExtra(THREAD_ID, threadId)
startActivity(this)
}
}