Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Delete private messages when their timers expire (needs UI support).

Browse Source
This commit is contained in:
akwizgran
2021-02-25 15:56:29 +00:00
committed by Torsten Grote
parent c89bde08db
commit 240e619248
16 changed files with 710 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/OutputConversationMessage.kt
View File

@@ -53,8 +53,7 @@ internal fun DeletionResult.output() = JsonDict(
"hasIntroductionSessionInProgress" to hasIntroductionSessionInProgress(),
"hasInvitationSessionInProgress" to hasInvitationSessionInProgress(),
"hasNotAllIntroductionSelected" to hasNotAllIntroductionSelected(),
"hasNotAllInvitationSelected" to hasNotAllInvitationSelected(),
"hasNotFullyDownloaded" to hasNotFullyDownloaded()
"hasNotAllInvitationSelected" to hasNotAllInvitationSelected()
)
internal fun MessagesAckedEvent.output() = JsonDict(

4
briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
View File

@@ -386,15 +386,13 @@ internal class MessagingControllerImplTest : ControllerTest() {
if (Random.nextBoolean()) result.addInvitationSessionInProgress()
if (Random.nextBoolean()) result.addIntroductionNotAllSelected()
if (Random.nextBoolean()) result.addIntroductionSessionInProgress()
if (Random.nextBoolean()) result.addNotFullyDownloaded()
val json = """
{
"allDeleted": ${result.allDeleted()},
"hasIntroductionSessionInProgress": ${result.hasIntroductionSessionInProgress()},
"hasInvitationSessionInProgress": ${result.hasInvitationSessionInProgress()},
"hasNotAllIntroductionSelected": ${result.hasNotAllIntroductionSelected()},
"hasNotAllInvitationSelected": ${result.hasNotAllInvitationSelected()},
"hasNotFullyDownloaded": ${result.hasNotFullyDownloaded()}
"hasNotAllInvitationSelected": ${result.hasNotAllInvitationSelected()}
}
"""
assertJsonEquals(json, result.output())