Skip to content

Commit 2837604

Browse files
Fixed incorrect usage of lazy (#1760)
1 parent abd3bcc commit 2837604

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageProcessor.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ import org.session.libsession.utilities.UserConfigType
3939
import org.session.libsession.utilities.recipients.MessageType
4040
import org.session.libsession.utilities.recipients.Recipient
4141
import org.session.libsession.utilities.recipients.getType
42-
import org.session.protos.SessionProtos
4342
import org.session.libsignal.utilities.AccountId
4443
import org.session.libsignal.utilities.Log
44+
import org.session.protos.SessionProtos
4545
import org.thoughtcrime.securesms.database.BlindMappingRepository
4646
import org.thoughtcrime.securesms.database.RecipientRepository
4747
import org.thoughtcrime.securesms.database.Storage
@@ -515,7 +515,7 @@ class ReceivedMessageProcessor @Inject constructor(
515515

516516
var maxOutgoingMessageTimestamp: Long = 0L
517517

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

526526

527-
val contactConfigTimestamp: Long by lazy(LazyThreadSafetyMode.NONE) {
527+
val contactConfigTimestamp: Long by lazy {
528528
configFactory.getConfigTimestamp(UserConfigType.CONTACTS, currentUserPublicKey)
529529
}
530530

app/src/main/java/org/session/libsession/snode/model/MessageResponses.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ data class RetrieveMessageResponse(
3434
@SerialName("data")
3535
val dataB64: String? = null,
3636
) {
37-
val data: ByteArray by lazy(LazyThreadSafetyMode.NONE) {
37+
val data: ByteArray by lazy {
3838
Base64.decode(dataB64, Base64.DEFAULT)
3939
}
4040

app/src/main/java/org/session/libsession/utilities/Address.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ import kotlinx.serialization.Serializable
88
import org.session.libsession.messaging.open_groups.OpenGroup
99
import org.session.libsignal.utilities.AccountId
1010
import org.session.libsignal.utilities.IdPrefix
11+
import org.session.libsignal.utilities.Log
1112
import org.session.libsignal.utilities.Util
1213
import java.util.LinkedList
13-
import org.session.libsignal.utilities.Log
14-
import kotlin.text.startsWith
1514

1615
@Serializable(with = AddressSerializer::class)
1716
sealed interface Address : Parcelable, Comparable<Address> {
@@ -81,7 +80,7 @@ sealed interface Address : Parcelable, Comparable<Address> {
8180
}
8281

8382
data class LegacyGroup(val groupPublicKeyHex: String) : Conversable, GroupLike {
84-
override val address: String by lazy(LazyThreadSafetyMode.NONE) {
83+
override val address: String by lazy {
8584
GroupUtil.doubleEncodeGroupID(groupPublicKeyHex)
8685
}
8786

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

104-
override val address: String by lazy(LazyThreadSafetyMode.NONE) {
103+
override val address: String by lazy {
105104
"${URI_PREFIX}${blindedId.blindedId.hexString}"
106105
.toUri()
107106
.buildUpon()
@@ -136,7 +135,7 @@ sealed interface Address : Parcelable, Comparable<Address> {
136135
}
137136
}
138137

139-
override val address: String by lazy(LazyThreadSafetyMode.NONE) {
138+
override val address: String by lazy {
140139
"${URI_PREFIX}${Uri.encode(serverUrl)}"
141140
.toUri()
142141
.buildUpon()

app/src/main/java/org/thoughtcrime/securesms/auth/LoggedInState.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ data class LoggedInState(
4242
}
4343
}
4444

45-
private val paddedSeed: ByteArray by lazy(LazyThreadSafetyMode.NONE) {
45+
private val paddedSeed: ByteArray by lazy {
4646
seed.data + ByteArray(16)
4747
}
4848

49-
val accountEd25519KeyPair: KeyPair by lazy(LazyThreadSafetyMode.NONE) {
49+
val accountEd25519KeyPair: KeyPair by lazy {
5050
ED25519.generate(paddedSeed)
5151
}
5252

53-
val accountX25519KeyPair: KeyPair by lazy(LazyThreadSafetyMode.NONE) {
53+
val accountX25519KeyPair: KeyPair by lazy {
5454
Curve25519.fromED25519(accountEd25519KeyPair)
5555
}
5656

57-
val accountId: AccountId by lazy(LazyThreadSafetyMode.NONE) {
57+
val accountId: AccountId by lazy {
5858
AccountId(IdPrefix.STANDARD, accountX25519KeyPair.pubKey.data)
5959
}
6060

61-
val proMasterPrivateKey: ByteArray by lazy(LazyThreadSafetyMode.NONE) {
61+
val proMasterPrivateKey: ByteArray by lazy {
6262
ED25519.generateProMasterKey(paddedSeed)
6363
}
6464

0 commit comments

Comments
 (0)