diff --git a/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt b/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt index fb7c8783..bf3b53f0 100644 --- a/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt +++ b/app/src/main/kotlin/org/fossify/messages/activities/ThreadActivity.kt @@ -131,6 +131,7 @@ import org.fossify.messages.extensions.getThreadTitle import org.fossify.messages.extensions.indexOfFirstOrNull import org.fossify.messages.extensions.isGifMimeType import org.fossify.messages.extensions.isImageMimeType +import org.fossify.messages.extensions.launchConversationDetails import org.fossify.messages.extensions.markMessageRead import org.fossify.messages.extensions.markThreadMessagesUnread import org.fossify.messages.extensions.messagesDB @@ -387,7 +388,7 @@ class ThreadActivity : SimpleActivity() { R.id.archive -> archiveConversation() R.id.unarchive -> unarchiveConversation() 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.dial_number -> dialNumber() 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") private fun getThreadItems(): ArrayList { val items = ArrayList() diff --git a/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt index 9cfca314..73f9eddd 100644 --- a/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt +++ b/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt @@ -15,17 +15,16 @@ import org.fossify.commons.helpers.KEY_PHONE import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.views.MyRecyclerView import org.fossify.messages.R -import org.fossify.messages.activities.ConversationDetailsActivity import org.fossify.messages.activities.SimpleActivity import org.fossify.messages.dialogs.RenameConversationDialog import org.fossify.messages.extensions.config import org.fossify.messages.extensions.deleteConversation import org.fossify.messages.extensions.dialNumber +import org.fossify.messages.extensions.launchConversationDetails import org.fossify.messages.extensions.markThreadMessagesRead import org.fossify.messages.extensions.markThreadMessagesUnread import org.fossify.messages.extensions.renameConversation import org.fossify.messages.extensions.updateConversationArchivedStatus -import org.fossify.messages.helpers.THREAD_ID import org.fossify.messages.helpers.refreshMessages import org.fossify.messages.messaging.isShortCodeWithLetters import org.fossify.messages.models.Conversation @@ -77,7 +76,9 @@ class ConversationsAdapter( R.id.cab_delete -> askConfirmDelete() R.id.cab_archive -> askConfirmArchive() 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_unread -> markAsUnread() 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() { if (selectedKeys.isEmpty()) { return diff --git a/app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt b/app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt index c9b06817..2ee1c68a 100644 --- a/app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt +++ b/app/src/main/kotlin/org/fossify/messages/extensions/Activity.kt @@ -11,6 +11,8 @@ import org.fossify.commons.helpers.IS_PRIVATE import org.fossify.commons.helpers.SimpleContactsHelper import org.fossify.commons.helpers.ensureBackgroundThread import org.fossify.commons.models.SimpleContact +import org.fossify.messages.activities.ConversationDetailsActivity +import org.fossify.messages.helpers.THREAD_ID import java.util.Locale 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) + } +} \ No newline at end of file