TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-20 15:48:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: compile errors from updating library to use latest branch, now requires cmake 3.22.1

Browse Source
This commit is contained in:
0x330a
2023-02-21 15:45:22 +11:00
parent 0221fb89ce
commit 39c532240c
9 changed files with 83 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@@ -137,8 +137,8 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
// recipient is open group
recipient.isOpenGroupRecipient -> {
val openGroupJoinUrl = getOpenGroup(threadId)?.joinURL ?: return
Conversation.OpenGroup.parseFullUrl(openGroupJoinUrl)?.let { (base, room, pubKey) ->
config.getOrConstructOpenGroup(base, room, pubKey)
Conversation.Community.parseFullUrl(openGroupJoinUrl)?.let { (base, room, pubKey) ->
config.getOrConstructCommunity(base, room, pubKey)
} ?: return
}
// otherwise recipient is one to one
@@ -356,10 +356,10 @@ class Storage(context: Context, helper: SQLCipherOpenHelper, private val configF
is Conversation.OneToOne -> conversation.sessionId.let {
getOrCreateThreadIdFor(fromSerialized(it))
}
is Conversation.LegacyClosedGroup -> conversation.groupId.let {
is Conversation.LegacyGroup -> conversation.groupId.let {
getOrCreateThreadIdFor("", it,null)
}
is Conversation.OpenGroup -> conversation.baseUrl.let {
is Conversation.Community -> conversation.baseUrl.let {
getOrCreateThreadIdFor("",null, it)
}
}