Skip to content

Fixed incorrect usage of lazy #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SessionHero01 merged 1 commit into from
Dec 4, 2025
Merged

Fixed incorrect usage of lazy #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ import org.session.libsession.utilities.UserConfigType
import org.session.libsession.utilities.recipients.MessageType
import org.session.libsession.utilities.recipients.Recipient
import org.session.libsession.utilities.recipients.getType
import org.session.protos.SessionProtos
import org.session.libsignal.utilities.AccountId
import org.session.libsignal.utilities.Log
import org.session.protos.SessionProtos
import org.thoughtcrime.securesms.database.BlindMappingRepository
import org.thoughtcrime.securesms.database.RecipientRepository
import org.thoughtcrime.securesms.database.Storage
Expand Down Expand Up @@ -515,7 +515,7 @@ class ReceivedMessageProcessor @Inject constructor(

var maxOutgoingMessageTimestamp: Long = 0L

val currentUserEd25519KeyPair: KeyPair by lazy(LazyThreadSafetyMode.NONE) {
val currentUserEd25519KeyPair: KeyPair by lazy {
requireNotNull(storage.getUserED25519KeyPair()) {
"No current user ED25519 key pair available"
}
Expand All @@ -524,7 +524,7 @@ class ReceivedMessageProcessor @Inject constructor(
val currentUserPublicKey: String get() = currentUserId.hexString


val contactConfigTimestamp: Long by lazy(LazyThreadSafetyMode.NONE) {
val contactConfigTimestamp: Long by lazy {
configFactory.getConfigTimestamp(UserConfigType.CONTACTS, currentUserPublicKey)
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/session/libsession/snode/model/MessageResponses.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ data class RetrieveMessageResponse(
@SerialName("data")
val dataB64: String? = null,
) {
val data: ByteArray by lazy(LazyThreadSafetyMode.NONE) {
val data: ByteArray by lazy {
Base64.decode(dataB64, Base64.DEFAULT)
}

Expand Down
9 changes: 4 additions & 5 deletions app/src/main/java/org/session/libsession/utilities/Address.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ import kotlinx.serialization.Serializable
import org.session.libsession.messaging.open_groups.OpenGroup
import org.session.libsignal.utilities.AccountId
import org.session.libsignal.utilities.IdPrefix
import org.session.libsignal.utilities.Log
import org.session.libsignal.utilities.Util
import java.util.LinkedList
import org.session.libsignal.utilities.Log
import kotlin.text.startsWith

@Serializable(with = AddressSerializer::class)
sealed interface Address : Parcelable, Comparable<Address> {
Expand Down Expand Up @@ -81,7 +80,7 @@ sealed interface Address : Parcelable, Comparable<Address> {
}

data class LegacyGroup(val groupPublicKeyHex: String) : Conversable, GroupLike {
override val address: String by lazy(LazyThreadSafetyMode.NONE) {
override val address: String by lazy {
GroupUtil.doubleEncodeGroupID(groupPublicKeyHex)
}

Expand All @@ -101,7 +100,7 @@ sealed interface Address : Parcelable, Comparable<Address> {
override val accountId: AccountId
get() = blindedId.blindedId

override val address: String by lazy(LazyThreadSafetyMode.NONE) {
override val address: String by lazy {
"${URI_PREFIX}${blindedId.blindedId.hexString}"
.toUri()
.buildUpon()
Expand Down Expand Up @@ -136,7 +135,7 @@ sealed interface Address : Parcelable, Comparable<Address> {
}
}

override val address: String by lazy(LazyThreadSafetyMode.NONE) {
override val address: String by lazy {
"${URI_PREFIX}${Uri.encode(serverUrl)}"
.toUri()
.buildUpon()
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/org/thoughtcrime/securesms/auth/LoggedInState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ data class LoggedInState(
}
}

private val paddedSeed: ByteArray by lazy(LazyThreadSafetyMode.NONE) {
private val paddedSeed: ByteArray by lazy {
seed.data + ByteArray(16)
}

val accountEd25519KeyPair: KeyPair by lazy(LazyThreadSafetyMode.NONE) {
val accountEd25519KeyPair: KeyPair by lazy {
ED25519.generate(paddedSeed)
}

val accountX25519KeyPair: KeyPair by lazy(LazyThreadSafetyMode.NONE) {
val accountX25519KeyPair: KeyPair by lazy {
Curve25519.fromED25519(accountEd25519KeyPair)
}

val accountId: AccountId by lazy(LazyThreadSafetyMode.NONE) {
val accountId: AccountId by lazy {
AccountId(IdPrefix.STANDARD, accountX25519KeyPair.pubKey.data)
}

val proMasterPrivateKey: ByteArray by lazy(LazyThreadSafetyMode.NONE) {
val proMasterPrivateKey: ByteArray by lazy {
ED25519.generateProMasterKey(paddedSeed)
}

Expand Down