mirror of
https://github.com/oxen-io/session-android.git
synced 2025-12-05 03:42:38 +00:00
Merge branch 'dev' into strings-squashed
This commit is contained in:
@@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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?>
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user