Merge pull request #1793 from session-foundation/release/1.30.2

Prepare for release 1.30.2

Author: SessionHero01

app/build.gradle.kts

@@ -26,8 +26,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 434
-val canonicalVersionName = "1.30.1"
+val canonicalVersionCode = 435
+val canonicalVersionName = "1.30.2"
 
 val postFixSize = 10
 val abiPostFix = mapOf(

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

@@ -177,7 +177,6 @@ class MessageParser @Inject constructor(
         val envelop = SessionProtocol.decodeFor1o1(
             myEd25519PrivKey = currentUserEd25519PrivKey,
             payload = data,
-            nowEpochMs = snodeClock.currentTimeMills(),
             proBackendPubKey = proBackendKey,
         )
 
@@ -208,7 +207,6 @@ class MessageParser @Inject constructor(
         val decoded = SessionProtocol.decodeForGroup(
             payload = data,
             myEd25519PrivKey = currentUserEd25519PrivKey,
-            nowEpochMs = snodeClock.currentTimeMills(),
             groupEd25519PublicKey = groupId.pubKeyBytes,
             groupEd25519PrivateKeys = keys.toTypedArray(),
             proBackendPubKey = proBackendKey
@@ -238,7 +236,7 @@ class MessageParser @Inject constructor(
 
         val decoded = SessionProtocol.decodeForCommunity(
             payload = Base64.decode(msg.data),
-            nowEpochMs = snodeClock.currentTimeMills(),
+            timestampMs = snodeClock.currentTimeMills(),
             proBackendPubKey = proBackendKey,
         )
 
@@ -276,7 +274,7 @@ class MessageParser @Inject constructor(
 
         val decoded = SessionProtocol.decodeForCommunity(
             payload = plaintext.data,
-            nowEpochMs = snodeClock.currentTimeMills(),
+            timestampMs = snodeClock.currentTimeMills(),
             proBackendPubKey = proBackendKey,
         )
 

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

@@ -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"
             }
@@ -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)
         }
 

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

@@ -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)
         }
 

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

@@ -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> {
@@ -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)
         }
 
@@ -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()
@@ -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()

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

@@ -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)
         }
 

app/src/main/java/org/thoughtcrime/securesms/pro/FetchProDetailsWorker.kt

@@ -20,6 +20,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.mapNotNull
 import org.session.libsession.snode.SnodeClock
 import org.session.libsession.utilities.ConfigFactoryProtocol
+import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.exceptions.NonRetryableException
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.LoginStateRepository
@@ -48,8 +49,14 @@ class FetchProDetailsWorker @AssistedInject constructor(
     private val loginStateRepository: LoginStateRepository,
     private val snodeClock: SnodeClock,
     private val configFactory: ConfigFactoryProtocol,
+    private val prefs: TextSecurePreferences,
 ) : CoroutineWorker(context, params) {
     override suspend fun doWork(): Result {
+        if (!prefs.forcePostPro()) {
+            Log.d(TAG, "Pro details fetch skipped because pro is not enabled")
+            return Result.success()
+        }
+
         val proMasterKey =
             requireNotNull(loginStateRepository.peekLoginState()?.seeded?.proMasterPrivateKey) {
                 "User must be logged in to fetch pro details"

app/src/main/java/org/thoughtcrime/securesms/pro/ProDetailsRepository.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import org.session.libsession.snode.SnodeClock
+import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.auth.LoginStateRepository
 import org.thoughtcrime.securesms.debugmenu.DebugLogGroup
@@ -29,6 +30,7 @@ class ProDetailsRepository @Inject constructor(
     private val snodeClock: SnodeClock,
     @ManagerScope scope: CoroutineScope,
     loginStateRepository: LoginStateRepository,
+    private val prefs: TextSecurePreferences,
 ) {
     sealed interface LoadState {
         val lastUpdated: Pair<ProDetails, Instant>?
@@ -83,6 +85,11 @@ class ProDetailsRepository @Inject constructor(
      * made regardless of the freshness of the last update.
      */
     fun requestRefresh(force: Boolean = false) {
+        if (!prefs.forcePostPro()) {
+            Log.d(DebugLogGroup.PRO_DATA.label, "Pro hasn't been enabled, skipping refresh")
+            return
+        }
+
         val currentState = loadState.value
         if (!force && (currentState is LoadState.Loading || currentState is LoadState.Loaded) &&
             currentState.lastUpdated?.second?.plusSeconds(MIN_UPDATE_INTERVAL_SECONDS)