Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up threadId -1 checks in Conversation code.

Browse Source
This commit is contained in:
Alex Hart
2023-08-17 14:18:05 -03:00
parent 23b3c7f1fd
commit 25aab0f702
3 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationOptionsMenu.kt
View File

@@ -189,10 +189,6 @@ internal object ConversationOptionsMenu {
}
})
if (threadId == -1L) {
hideMenuItem(menu, R.id.menu_view_media)
}
menu.findItem(R.id.menu_format_text_submenu).subMenu?.clearHeader()
menu.findItem(R.id.edittext_bold).applyTitleSpan(MessageStyler.boldStyle())
menu.findItem(R.id.edittext_italic).applyTitleSpan(MessageStyler.italicStyle())

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationRepository.java
View File

@@ -111,7 +111,7 @@ public class ConversationRepository {
conversationRecipient.getExpiresInSeconds() == 0 &&
!conversationRecipient.isGroup() &&
conversationRecipient.isRegistered() &&
(threadId == -1 || SignalDatabase.messages().canSetUniversalTimer(threadId)))
SignalDatabase.messages().canSetUniversalTimer(threadId))
{
showUniversalExpireTimerUpdate = true;
}

19
app/src/main/java/org/thoughtcrime/securesms/conversation/ThreadAnimationState.kt
View File

@@ -1,19 +0,0 @@
package org.thoughtcrime.securesms.conversation
/**
* Represents how conversation bubbles should animate at any given time.
*/
data class ThreadAnimationState constructor(
val threadId: Long,
val threadMetadata: ConversationData?,
val hasCommittedNonEmptyMessageList: Boolean
) {
fun shouldPlayMessageAnimations(): Boolean {
return when {
threadId == -1L || threadMetadata == null -> false
threadMetadata.threadSize == 0 -> true
threadMetadata.threadSize > 0 && hasCommittedNonEmptyMessageList -> true
else -> false
}
}
}