Merge branch 'dev' into strings-squashed

This commit is contained in:
Al Lansley
2024-08-15 09:38:10 +10:00
36 changed files with 331 additions and 841 deletions

View File

@@ -551,6 +551,7 @@ class InstrumentedTests {
is Conversation.OneToOne -> seen.add("1-to-1: ${convo.accountId}")
is Conversation.Community -> seen.add("og: ${convo.baseCommunityInfo.baseUrl}/r/${convo.baseCommunityInfo.room}")
is Conversation.LegacyGroup -> seen.add("cl: ${convo.groupId}")
null -> TODO()
}
}

View File

@@ -162,7 +162,7 @@ class ConversationVolatileConfig(pointer: Long): ConfigBase(pointer) {
external fun allOneToOnes(): List<Conversation.OneToOne>
external fun allCommunities(): List<Conversation.Community>
external fun allLegacyClosedGroups(): List<Conversation.LegacyGroup>
external fun all(): List<Conversation>
external fun all(): List<Conversation?>
}