Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
- Added sender names in group conversations ([#81])

### Changed
- Removed avatars from one-to-one conversations ([#215])
- Reduced avatar sizes in group conversations ([#215])

## [1.10.1] - 2026-10-10
### Changed
Expand Down Expand Up @@ -251,6 +257,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#52]: https://github.com/FossifyOrg/Messages/issues/52
[#70]: https://github.com/FossifyOrg/Messages/issues/70
[#75]: https://github.com/FossifyOrg/Messages/issues/75
[#81]: https://github.com/FossifyOrg/Messages/issues/81
[#82]: https://github.com/FossifyOrg/Messages/issues/82
[#99]: https://github.com/FossifyOrg/Messages/issues/99
[#115]: https://github.com/FossifyOrg/Messages/issues/115
Expand All @@ -262,6 +269,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[#180]: https://github.com/FossifyOrg/Messages/issues/180
[#185]: https://github.com/FossifyOrg/Messages/issues/185
[#209]: https://github.com/FossifyOrg/Messages/issues/209
[#215]: https://github.com/FossifyOrg/Messages/issues/215
[#217]: https://github.com/FossifyOrg/Messages/issues/217
[#225]: https://github.com/FossifyOrg/Messages/issues/225
[#234]: https://github.com/FossifyOrg/Messages/issues/234
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,10 @@ import org.fossify.messages.models.SIMCard
import org.fossify.messages.models.ThreadItem
import org.fossify.messages.models.ThreadItem.ThreadDateTime
import org.fossify.messages.models.ThreadItem.ThreadError
import org.fossify.messages.models.ThreadItem.ThreadMessage
import org.fossify.messages.models.ThreadItem.ThreadSending
import org.fossify.messages.models.ThreadItem.ThreadSent
import org.fossify.messages.models.withSenderGrouping
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
Expand Down Expand Up @@ -703,7 +705,7 @@ class ThreadActivity : SimpleActivity() {
fromRecycleBin: Boolean,
) {
val messagesToRemoveSet = messagesToRemove.toSet()
val deletePosition = threadItems.indexOf(messagesToRemove.first())
val deletePosition = threadItems.indexOfFirst { (it as? ThreadMessage)?.message == messagesToRemove.first() }
messages = messages.toSortedMessages()
.filterNot { it in messagesToRemoveSet }
val latestThreadItems = getThreadItems()
Expand Down Expand Up @@ -753,7 +755,7 @@ class ThreadActivity : SimpleActivity() {

private fun jumpToMessage(messageId: Long) {
if (messages.any { it.id == messageId }) {
val index = threadItems.indexOfFirst { (it as? Message)?.id == messageId }
val index = threadItems.indexOfFirst { (it as? ThreadMessage)?.message?.id == messageId }
if (index != -1) binding.threadMessagesList.smoothScrollToPosition(index)
return
}
Expand All @@ -780,7 +782,7 @@ class ThreadActivity : SimpleActivity() {
runOnUiThread {
threadItems = latestThreadItems
loadingOlderMessages = false
val index = latestThreadItems.indexOfFirst { (it as? Message)?.id == messageId }
val index = latestThreadItems.indexOfFirst { (it as? ThreadMessage)?.message?.id == messageId }
getOrCreateThreadAdapter().updateMessages(
newMessages = latestThreadItems, scrollPosition = index, smoothScroll = true
)
Expand Down Expand Up @@ -1358,7 +1360,7 @@ class ThreadActivity : SimpleActivity() {
items.add(ThreadDateTime(message.date, simCardID))
prevDateTime = message.date
}
items.add(message)
items.add(ThreadMessage(message))

if (message.type == Telephony.Sms.MESSAGE_TYPE_FAILED) {
items.add(ThreadError(message.id, message.body))
Expand Down Expand Up @@ -1389,7 +1391,7 @@ class ThreadActivity : SimpleActivity() {
bus?.post(Events.RefreshConversations())
}

return items
return items.withSenderGrouping(participants.getAddresses().distinct().size > 1)
}

private fun launchActivityForResult(
Expand Down
Loading
Loading