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

Fix legacy closed group messaging

Browse Source
This commit is contained in:
nielsandriesse
2020-08-19 16:32:15 +10:00
parent 39792ef7f9
commit cc6c6dab3d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
View File

@@ -411,8 +411,13 @@ object ClosedGroupsProtocol {
if (GroupUtil.isOpenGroup(groupID)) { if (GroupUtil.isOpenGroup(groupID)) {
return listOf( Address.fromSerialized(groupID) ) return listOf( Address.fromSerialized(groupID) )
} else { } else {
val groupPublicKey = doubleDecodeGroupID(groupID).toHexString() var groupPublicKey: String? = null
if (DatabaseFactory.getSSKDatabase(context).isSSKBasedClosedGroup(groupPublicKey)) { try {
groupPublicKey = doubleDecodeGroupID(groupID).toHexString()
} catch (exception: Exception) {
// Do nothing
}
if (groupPublicKey != null && DatabaseFactory.getSSKDatabase(context).isSSKBasedClosedGroup(groupPublicKey)) {
return listOf( Address.fromSerialized(groupPublicKey) ) return listOf( Address.fromSerialized(groupPublicKey) )
} else { } else {
return DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, false).map { it.address } return DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, false).map { it.address }