TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-24 04:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup ConversationActivityV2

Browse Source
This commit is contained in:
Andrew 2024-02-18 02:21:08 +10:30
parent 835fa6882b
commit d33de9cf6b
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
View File

@ -866,27 +866,15 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
} }
} }
private fun isMessageRequestThread(): Boolean { private fun isOutgoingMessageRequestThread(): Boolean = viewModel.recipient?.run {
val recipient = viewModel.recipient ?: return false !isGroupRecipient && !isLocalNumber &&
if (recipient.isLocalNumber) return false !(hasApprovedMe() || viewModel.hasReceived())
return !recipient.isGroupRecipient && !recipient.isApproved } ?: false
}
private fun isOutgoingMessageRequestThread(): Boolean { private fun isIncomingMessageRequestThread(): Boolean = viewModel.recipient?.run {
val recipient = viewModel.recipient ?: return false !isGroupRecipient && !isApproved && !isLocalNumber &&
return !recipient.isGroupRecipient && !threadDb.getLastSeenAndHasSent(viewModel.threadId).second() && threadDb.getMessageCount(viewModel.threadId) > 0
!recipient.isLocalNumber && } ?: false
!(recipient.hasApprovedMe() || viewModel.hasReceived())
}
private fun isIncomingMessageRequestThread(): Boolean {
val recipient = viewModel.recipient ?: return false
return !recipient.isGroupRecipient &&
!recipient.isApproved &&
!recipient.isLocalNumber &&
!threadDb.getLastSeenAndHasSent(viewModel.threadId).second() &&
threadDb.getMessageCount(viewModel.threadId) > 0
}
override fun inputBarEditTextContentChanged(newContent: CharSequence) { override fun inputBarEditTextContentChanged(newContent: CharSequence) {
val inputBarText = binding?.inputBar?.text ?: return // TODO check if we should be referencing newContent here instead val inputBarText = binding?.inputBar?.text ?: return // TODO check if we should be referencing newContent here instead