TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-11 20:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix group encoded id

Browse Source
This commit is contained in:
Ryan ZHAO
2021-01-22 16:15:13 +11:00
parent d4781e64a3
commit 2e3f50f8aa
6 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libsession/src/main/java/org/session/libsession/messaging/threads/Address.kt
View File

@@ -142,7 +142,7 @@ class Address private constructor(address: String) : Parcelable, Comparable<Addr
}
companion object {
val CREATOR: Parcelable.Creator<Address?> = object : Parcelable.Creator<Address?> {
@JvmField val CREATOR: Parcelable.Creator<Address?> = object : Parcelable.Creator<Address?> {
override fun createFromParcel(`in`: Parcel): Address {
return Address(`in`)
}

7
libsession/src/main/java/org/session/libsession/messaging/threads/GroupRecord.kt
View File

@@ -6,9 +6,10 @@ import java.io.IOException
import java.util.*
class GroupRecord(
val encodedId: String, val title: String, members: String?, val avatar: ByteArray,
val avatarId: Long, val avatarKey: ByteArray, val avatarContentType: String,
val relay: String, val isActive: Boolean, val avatarDigest: ByteArray, val isMms: Boolean, val url: String, admins: String?, val createAt: Long
val encodedId: String, val title: String, members: String?, val avatar: ByteArray?,
val avatarId: Long?, val avatarKey: ByteArray?, val avatarContentType: String?,
val relay: String?, val isActive: Boolean, val avatarDigest: ByteArray?, val isMms: Boolean,
val url: String?, admins: String?, val createAt: Long
) {
var members: List<Address> = LinkedList<Address>()
var admins: List<Address> = LinkedList<Address>()

2
libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt
View File

@@ -55,7 +55,7 @@ object GroupUtil {
fun getEncodedId(group: SignalServiceGroup): String {
val groupId = group.groupId
if (group.groupType == SignalServiceGroup.GroupType.PUBLIC_CHAT) {
return getEncodedOpenGroupID(groupId.toString())
return getEncodedOpenGroupID(String(groupId))
}
return getEncodedClosedGroupID(Hex.toStringCondensed(groupId))
}

2
libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt
View File

@@ -916,7 +916,7 @@ object TextSecurePreferences {
@JvmStatic
fun hasSeenWelcomeScreen(context: Context): Boolean {
return getBooleanPreference(context, SEEN_WELCOME_SCREEN_PREF, true)
return getBooleanPreference(context, SEEN_WELCOME_SCREEN_PREF, false)
}
fun setHasSeenWelcomeScreen(context: Context, value: Boolean) {