diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 85cf7bd4c9..1cd78a4f56 100644 --- a/app/build.gradle.kts +++ b/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( diff --git a/app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageParser.kt b/app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageParser.kt index 9caf81ae8b..73eed4bb7b 100644 --- a/app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageParser.kt +++ b/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, ) diff --git a/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageProcessor.kt b/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageProcessor.kt index c4137655d1..cdb269e165 100644 --- a/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageProcessor.kt +++ b/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) } diff --git a/app/src/main/java/org/session/libsession/snode/model/MessageResponses.kt b/app/src/main/java/org/session/libsession/snode/model/MessageResponses.kt index 2c7b6f6d7e..35ec0f25cf 100644 --- a/app/src/main/java/org/session/libsession/snode/model/MessageResponses.kt +++ b/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) } diff --git a/app/src/main/java/org/session/libsession/utilities/Address.kt b/app/src/main/java/org/session/libsession/utilities/Address.kt index f94c823de4..0b72327c7d 100644 --- a/app/src/main/java/org/session/libsession/utilities/Address.kt +++ b/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
{ @@ -81,7 +80,7 @@ sealed interface Address : Parcelable, Comparable
{ } 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
{ 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
{ } } - override val address: String by lazy(LazyThreadSafetyMode.NONE) { + override val address: String by lazy { "${URI_PREFIX}${Uri.encode(serverUrl)}" .toUri() .buildUpon() diff --git a/app/src/main/java/org/thoughtcrime/securesms/auth/LoggedInState.kt b/app/src/main/java/org/thoughtcrime/securesms/auth/LoggedInState.kt index 539ac1113b..79c332d4cb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/auth/LoggedInState.kt +++ b/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) } diff --git a/app/src/main/java/org/thoughtcrime/securesms/pro/FetchProDetailsWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/pro/FetchProDetailsWorker.kt index 3df0e146d3..2140886556 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pro/FetchProDetailsWorker.kt +++ b/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" diff --git a/app/src/main/java/org/thoughtcrime/securesms/pro/ProDetailsRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/pro/ProDetailsRepository.kt index c674d04cbc..97a52d7844 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pro/ProDetailsRepository.kt +++ b/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? @@ -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) diff --git a/app/src/main/proto/Utils.proto b/app/src/main/proto/Utils.proto deleted file mode 100644 index 7d6794016a..0000000000 --- a/app/src/main/proto/Utils.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto2"; - -package signalservice; - -option java_package = "org.session.libsignal.protos"; -option java_outer_classname = "UtilProtos"; - -message ByteArrayList { - repeated bytes content = 1; -} diff --git a/app/src/main/proto/WebSocketResources.proto b/app/src/main/proto/WebSocketResources.proto deleted file mode 100644 index 8f82d9811e..0000000000 --- a/app/src/main/proto/WebSocketResources.proto +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -syntax = "proto2"; - -package signalservice; - -option java_package = "org.session.libsignal.protos"; -option java_outer_classname = "WebSocketProtos"; - -message WebSocketRequestMessage { - optional string verb = 1; - optional string path = 2; - optional bytes body = 3; - repeated string headers = 5; - optional uint64 id = 4; -} - -message WebSocketResponseMessage { - optional uint64 id = 1; - optional uint32 status = 2; - optional string message = 3; - repeated string headers = 5; - optional bytes body = 4; -} - -message WebSocketMessage { - enum Type { - UNKNOWN = 0; - REQUEST = 1; - RESPONSE = 2; - } - - optional Type type = 1; - optional WebSocketRequestMessage request = 2; - optional WebSocketResponseMessage response = 3; -} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 61cad22b2d..f11a63dbd7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -29,7 +29,7 @@ kotlinVersion = "2.2.21" kryoVersion = "5.6.2" kspVersion = "2.3.3" legacySupportV13Version = "1.0.0" -libsessionUtilAndroidVersion = "1.0.9-7-g7866645" +libsessionUtilAndroidVersion = "1.1.0-2-g39d4ac8" media3ExoplayerVersion = "1.8.0" mockitoCoreVersion = "5.20.0" navVersion = "2.9.5"