Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Briar Desktop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
briar
Briar Desktop
Merge requests
!331
Handle incoming messages in private groups
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Handle incoming messages in private groups
501-group-message
into
main
Overview
5
Commits
1
Pipelines
7
Changes
1
Merged
Handle incoming messages in private groups
Mikolai Gütschow
requested to merge
501-group-message
into
main
Apr 10, 2023
Overview
5
Commits
1
Pipelines
7
Changes
1
That was a fast one
Draft since based on
!329 (merged)
Closes
#501 (closed)
Edited
Apr 15, 2023
by
Mikolai Gütschow
0
0
Merge request reports
Compare
main
version 7
ed0f0fdf
Apr 25, 2023
version 6
70108bbd
Apr 25, 2023
version 5
19309ac8
Apr 15, 2023
version 4
19309ac8
Apr 15, 2023
version 3
937859c7
Apr 15, 2023
version 2
937859c7
Apr 15, 2023
version 1
937859c7
Apr 10, 2023
main (base)
and
latest version
latest version
4094b22e
1 commit,
May 6, 2023
version 7
ed0f0fdf
1 commit,
Apr 25, 2023
version 6
70108bbd
1 commit,
Apr 25, 2023
version 5
19309ac8
1 commit,
Apr 15, 2023
version 4
19309ac8
2 commits,
Apr 15, 2023
version 3
937859c7
4 commits,
Apr 15, 2023
version 2
937859c7
4 commits,
Apr 15, 2023
version 1
937859c7
1 commit,
Apr 10, 2023
1 file
+
8
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/privategroup/conversation/PrivateGroupConversationViewModel.kt
+
8
−
7
View file @ 4094b22e
Edit in single-file editor
Open in Web IDE
Show full file
@@ -40,6 +40,7 @@ import org.briarproject.briar.api.client.MessageTracker
import
org.briarproject.briar.api.privategroup.GroupMessageFactory
import
org.briarproject.briar.api.privategroup.JoinMessageHeader
import
org.briarproject.briar.api.privategroup.PrivateGroupManager
import
org.briarproject.briar.api.privategroup.event.GroupMessageAddedEvent
import
org.briarproject.briar.desktop.privategroup.sharing.PrivateGroupSharingViewModel
import
org.briarproject.briar.desktop.threadedgroup.conversation.ThreadedConversationViewModel
import
org.briarproject.briar.desktop.threading.BriarExecutors
@@ -70,13 +71,13 @@ class PrivateGroupConversationViewModel @Inject constructor(
@UiExecutor
override
fun
eventOccurred
(
e
:
Event
)
{
// todo: handle incoming messages
/*if (e is ForumPostReceivedEvent) {
if (e.groupId == groupItem.value?.id) {
val item = ForumPost
Item(
e.
header
, e.text
)
addItem(item, null
)
}
}
*/
if
(
e
is
GroupMessageAddedEvent
&&
e
.
groupId
==
groupItem
.
value
?.
id
&&
!
e
.
isLocal
)
{
val
header
=
e
.
header
val
item
=
if
(
header
is
JoinMessageHeader
)
PrivateGroupJoin
Item
(
header
)
else
PrivateGroupMessageItem
(
header
,
e
.
text
)
addItem
(
item
,
null
)
}
}
override
fun
loadThreadItems
(
txn
:
Transaction
,
groupId
:
GroupId
)
=
Loading