Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 00:17:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename collapsed events for 1:1.

Browse Source
This commit is contained in:
Michelle Tang
2026-03-23 11:58:43 -04:00
committed by Cody Henthorne
parent 2bb9578ef9
commit 58ea9a1f48
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -851,7 +851,7 @@ public final class ConversationUpdateItem extends FrameLayout
return switch (type) {
case CALL_EVENT -> R.string.CollapsedEvent__call_event;
case DISAPPEARING_TIMER -> R.string.CollapsedEvent__disappearing_timer;
case GROUP_UPDATE -> R.string.CollapsedEvent__group_update;
case CHAT_UPDATE -> conversationRecipient.isGroup() ? R.string.CollapsedEvent__group_update : R.string.CollapsedEvent__chat_update;
};
}
@@ -859,7 +859,7 @@ public final class ConversationUpdateItem extends FrameLayout
return switch (type) {
case CALL_EVENT -> SignalSymbols.Glyph.PHONE;
case DISAPPEARING_TIMER -> SignalSymbols.Glyph.TIMER;
case GROUP_UPDATE -> SignalSymbols.Glyph.GROUP;
case CHAT_UPDATE -> conversationRecipient.isGroup() ? SignalSymbols.Glyph.GROUP : SignalSymbols.Glyph.THREAD;
};
}

8
app/src/main/java/org/thoughtcrime/securesms/database/CollapsibleEvents.kt
View File

@@ -27,18 +27,18 @@ object CollapsibleEvents {
return if (groupChangeUpdate?.updates?.any { it.groupExpirationTimerUpdate != null } == true) {
CollapsibleType.DISAPPEARING_TIMER
} else if (groupChangeUpdate?.updates?.none { it.groupTerminateChangeUpdate != null } == true) {
CollapsibleType.GROUP_UPDATE
CollapsibleType.CHAT_UPDATE
} else {
null
}
}
if (MessageTypes.isProfileChange(type)) {
return CollapsibleType.GROUP_UPDATE
return CollapsibleType.CHAT_UPDATE
}
if (MessageTypes.isIdentityUpdate(type) || MessageTypes.isIdentityVerified(type) || MessageTypes.isIdentityDefault(type)) {
return CollapsibleType.GROUP_UPDATE
return CollapsibleType.CHAT_UPDATE
}
return null
@@ -46,7 +46,7 @@ object CollapsibleEvents {
enum class CollapsibleType {
DISAPPEARING_TIMER,
GROUP_UPDATE,
CHAT_UPDATE,
CALL_EVENT
}
}

2
app/src/main/res/values/strings.xml
View File

@@ -3692,6 +3692,8 @@
<string name="ConversationUpdateItem_update">Update</string>
<!-- Update item button text to show how many group updates there are. -->
<string name="CollapsedEvent__group_update">%1$d group updates</string>
<!-- Update item button text to show how many group updates there are. -->
<string name="CollapsedEvent__chat_update">%1$d chat updates</string>
<!-- Update item button text to show how many disappearing message timer changes are. -->
<string name="CollapsedEvent__disappearing_timer">%1$d disappearing message timer changes</string>
<!-- Update item button text to show how many call events are. -->