Merge branch 'dev' into feature/pro-settings-non-originating

Author: ThomasSession

app/build.gradle.kts

@@ -26,8 +26,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 417
-val canonicalVersionName = "1.27.0"
+val canonicalVersionCode = 419
+val canonicalVersionName = "1.27.1"
 
 val postFixSize = 10
 val abiPostFix = mapOf(

app/src/main/java/org/session/libsession/messaging/MessagingModuleConfiguration.kt

@@ -2,6 +2,7 @@ package org.session.libsession.messaging
 
 import android.content.Context
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.serialization.json.Json
 import org.session.libsession.database.MessageDataProvider
 import org.session.libsession.database.StorageProtocol
 import org.session.libsession.messaging.groups.GroupManagerV2
@@ -34,6 +35,7 @@ class MessagingModuleConfiguration @Inject constructor(
     val avatarUtils: AvatarUtils,
     val proStatusManager: ProStatusManager,
     val messageSendJobFactory: MessageSendJob.Factory,
+    val json: Json,
 ) {
 
     companion object {

app/src/main/java/org/session/libsession/messaging/messages/ProfileUpdateHandler.kt

@@ -54,7 +54,7 @@ class ProfileUpdateHandler @Inject constructor(
         // If the sender has standard address (either as unblinded, or as is), we will check if
         // they are a contact and update their contact information accordingly.
         val standardSender = unblinded ?: (senderAddress as? Address.Standard)
-        if (standardSender != null && (updates.name != null || updates.pic != null || updates.profileUpdateTime != null)) {
+        if (standardSender != null && (!updates.name.isNullOrBlank() || updates.pic != null)) {
             configFactory.withMutableUserConfigs { configs ->
                 configs.contacts.updateContact(standardSender) {
                     if (shouldUpdateProfile(
@@ -96,6 +96,10 @@ class ProfileUpdateHandler @Inject constructor(
                             c.name = updates.name
                         }
 
+                        if (updates.profileUpdateTime != null) {
+                            c.profileUpdatedEpochSeconds = updates.profileUpdateTime.toEpochSeconds()
+                        }
+
                         configs.contacts.setBlinded(c)
                     }
                 }
@@ -136,7 +140,8 @@ class ProfileUpdateHandler @Inject constructor(
         lastUpdated: Instant?,
         newUpdateTime: Instant?
     ): Boolean {
-        return (lastUpdated == null || newUpdateTime == null) || (newUpdateTime > lastUpdated)
+        return (lastUpdated == null && newUpdateTime == null) ||
+                (newUpdateTime != null && lastUpdated != null && newUpdateTime > lastUpdated)
     }
 
     class Updates private constructor(

app/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt

@@ -7,6 +7,8 @@ import org.session.libsignal.protos.SignalServiceProtos.DataMessage.LokiProfile
 import org.thoughtcrime.securesms.util.DateUtils.Companion.asEpochMillis
 import org.thoughtcrime.securesms.util.DateUtils.Companion.asEpochSeconds
 import org.thoughtcrime.securesms.util.DateUtils.Companion.millsToInstant
+import org.thoughtcrime.securesms.util.DateUtils.Companion.secondsToInstant
+import org.thoughtcrime.securesms.util.DateUtils.Companion.toEpochSeconds
 import java.time.Instant
 import java.time.ZonedDateTime
 
@@ -25,9 +27,9 @@ class Profile(
             val displayName = profileProto.displayName ?: return null
             val profileKey = proto.profileKey
             val profilePictureURL = profileProto.profilePicture
-            val profileUpdated = profileProto.lastProfileUpdateMs.takeIf {
-                profileProto.hasLastProfileUpdateMs()
-            }?.millsToInstant()
+            val profileUpdated = profileProto.lastProfileUpdateSeconds
+                .takeIf { profileProto.hasLastProfileUpdateSeconds() }
+                ?.secondsToInstant()
 
             if (profileKey != null && profilePictureURL != null) {
                 return Profile(displayName, profileKey.toByteArray(), profilePictureURL, profileUpdated = profileUpdated)
@@ -48,7 +50,7 @@ class Profile(
         profileProto.displayName = displayName
         profileKey?.let { dataMessageProto.profileKey = ByteString.copyFrom(it) }
         profilePictureURL?.let { profileProto.profilePicture = it }
-        profileUpdated?.let { profileProto.lastProfileUpdateMs = it.toEpochMilli() }
+        profileUpdated?.let { profileProto.lastProfileUpdateSeconds = it.toEpochSeconds() }
         // Build
         try {
             dataMessageProto.profile = profileProto.build()

app/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupApi.kt

@@ -10,6 +10,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.decodeFromStream
 import network.loki.messenger.libsession_util.ED25519
 import network.loki.messenger.libsession_util.Hash
 import network.loki.messenger.libsession_util.util.BlindKeyAPI
@@ -25,7 +26,6 @@ import org.session.libsession.snode.OnionResponse
 import org.session.libsession.snode.SnodeAPI
 import org.session.libsession.snode.utilities.asyncPromise
 import org.session.libsession.snode.utilities.await
-import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsignal.utilities.AccountId
 import org.session.libsignal.utilities.Base64.encodeBytes
 import org.session.libsignal.utilities.ByteArraySlice
@@ -46,15 +46,6 @@ import kotlin.collections.set
 
 object OpenGroupApi {
     val defaultRooms = MutableSharedFlow<List<DefaultGroup>>(replay = 1)
-    private val hasPerformedInitialPoll = mutableMapOf<String, Boolean>()
-    private var hasUpdatedLastOpenDate = false
-    private val timeSinceLastOpen by lazy {
-        val context = MessagingModuleConfiguration.shared.context
-        val lastOpenDate = TextSecurePreferences.getLastOpenTimeDate(context)
-        val now = System.currentTimeMillis()
-        now - lastOpenDate
-    }
-
     const val defaultServerPublicKey = "a03c383cf63c3c4efe67acc52112a6dd734b3a946b9545f488aaa93da7991238"
     const val legacyServerIP = "116.203.70.33"
     const val legacyDefaultServer = "http://116.203.70.33" // TODO: migrate all references to use new value
@@ -302,8 +293,12 @@ object OpenGroupApi {
         }
     }
 
-    private fun getResponseBodyJson(request: Request, signRequest: Boolean = true): Promise<Map<*, *>, Exception> {
-        return send(request, signRequest = signRequest).map {
+    private fun getResponseBodyJson(
+        request: Request,
+        signRequest: Boolean = true,
+        serverPubKeyHex: String? = null
+    ): Promise<Map<*, *>, Exception> {
+        return send(request, signRequest = signRequest, serverPubKeyHex = serverPubKeyHex).map {
             JsonUtil.fromJson(it.body, Map::class.java)
         }
     }
@@ -316,7 +311,10 @@ object OpenGroupApi {
             return caps
         }
 
-        val fetched = getCapabilities(server).await()
+        val fetched = getCapabilities(server,
+            serverPubKeyHex = defaultServerPublicKey.takeIf { server == defaultServer }
+        ).await()
+
         storage.setServerCapabilities(server, fetched.capabilities)
         return fetched.capabilities
     }
@@ -436,14 +434,15 @@ object OpenGroupApi {
         roomID: String,
         imageId: String,
         signRequest: Boolean = true,
+        serverPubKeyHex: String? = null,
     ): Promise<ByteArraySlice, Exception> {
         val request = Request(
             verb = GET,
             room = roomID,
             server = server,
             endpoint = Endpoint.RoomFileIndividual(roomID, imageId)
         )
-        return getResponseBody(request, signRequest = signRequest)
+        return getResponseBody(request, signRequest = signRequest, serverPubKeyHex = serverPubKeyHex)
     }
 
     // region Upload/Download
@@ -722,7 +721,13 @@ object OpenGroupApi {
                 }
             }
             val images = groups.associate { group ->
-                group.token to group.imageId?.let { downloadOpenGroupProfilePicture(defaultServer, group.token, it, signRequest = false) }
+                group.token to group.imageId?.let { downloadOpenGroupProfilePicture(
+                    server = defaultServer,
+                    roomID = group.token,
+                    imageId = it,
+                    signRequest = false,
+                    serverPubKeyHex = defaultServerPublicKey,
+                ) }
             }
             groups.map { group ->
                 val image = try {
@@ -736,30 +741,21 @@ object OpenGroupApi {
         }
     }
 
-    fun getRoomInfo(roomToken: String, server: String): Promise<RoomInfoDetails, Exception> {
-        val request = Request(
-            verb = GET,
-            room = null,
-            server = server,
-            endpoint = Endpoint.Room(roomToken)
-        )
-        return getResponseBody(request).map { response ->
-            JsonUtil.fromJson(response, RoomInfoDetails::class.java)
-        }
-    }
-
     private fun getAllRooms(): Promise<List<RoomInfoDetails>, Exception> {
         val request = Request(
             verb = GET,
             room = null,
             server = defaultServer,
             endpoint = Endpoint.Rooms
         )
-        return getResponseBody(request, signRequest = false).map { response ->
-            val rawRooms = JsonUtil.fromJson(response, List::class.java) ?: throw Error.ParsingFailed
-            rawRooms.mapNotNull {
-                JsonUtil.fromJson(JsonUtil.toJson(it), RoomInfoDetails::class.java)
-            }
+        return getResponseBody(
+            request = request,
+            signRequest = false,
+            serverPubKeyHex = defaultServerPublicKey
+        ).map { response ->
+            MessagingModuleConfiguration.shared.json
+                .decodeFromStream<Array<RoomInfoDetails>>(response.inputStream())
+                .toList()
         }
     }
 
@@ -770,35 +766,6 @@ object OpenGroupApi {
         }
     }
 
-    fun getCapabilitiesAndRoomInfo(
-        room: String,
-        server: String
-    ): Promise<Pair<Capabilities, RoomInfoDetails>, Exception> {
-        val requests = mutableListOf<BatchRequestInfo<*>>(
-            BatchRequestInfo(
-                request = BatchRequest(
-                    method = GET,
-                    path = "/capabilities"
-                ),
-                endpoint = Endpoint.Capabilities,
-                responseType = object : TypeReference<Capabilities>(){}
-            ),
-            BatchRequestInfo(
-                request = BatchRequest(
-                    method = GET,
-                    path = "/room/$room"
-                ),
-                endpoint = Endpoint.Room(room),
-                responseType = object : TypeReference<RoomInfoDetails>(){}
-            )
-        )
-        return sequentialBatch(server, requests).map {
-            val capabilities = it.firstOrNull()?.body as? Capabilities ?: throw Error.ParsingFailed
-            val roomInfo = it.lastOrNull()?.body as? RoomInfoDetails ?: throw Error.ParsingFailed
-            capabilities to roomInfo
-        }
-    }
-
     fun sendDirectMessage(message: String, blindedAccountId: String, server: String): Promise<DirectMessage, Exception> {
         val request = Request(
             verb = POST,

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

@@ -165,8 +165,9 @@ object MessageReceiver {
             CallMessage.fromProto(proto) ?:
             GroupUpdated.fromProto(proto) ?:
             VisibleMessage.fromProto(proto) ?: throw Error.UnknownMessage
-        // Don't process the envelope any further if the sender is blocked
-        if (isBlocked(sender!!) && message.shouldDiscardIfBlocked()) {
+
+        // Don't process the envelope any further if the sender is blocked (still visible in community chats)
+        if (!isOpenGroupMessage && isBlocked(sender!!) && message.shouldDiscardIfBlocked()) {
             throw Error.SenderBlocked
         }
         val isUserBlindedSender = sender == openGroupPublicKey?.let {

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

@@ -444,7 +444,7 @@ class ReceivedMessageHandler @Inject constructor(
                     picKey = message.profile?.profileKey,
                     blocksCommunityMessageRequests = message.blocksMessageRequests,
                     proStatus = null,
-                    profileUpdateTime = null,
+                    profileUpdateTime = message.profile?.profileUpdated,
                 )
 
                 if (updates != null) {

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

@@ -50,11 +50,12 @@ object StringSubstitutionConstants {
     const val APP_PRO_KEY: StringSubKey                    = "app_pro"
     const val PRO_KEY: StringSubKey                        = "pro"
     const val CURRENT_PLAN_KEY: StringSubKey               = "current_plan"
-    const val SELECTED_PLAN_KEY: StringSubKey               = "selected_plan"
+    const val SELECTED_PLAN_KEY: StringSubKey              = "selected_plan"
     const val PLATFORM_STORE_KEY: StringSubKey             = "platform_store"
     const val PLATFORM_ACCOUNT_KEY: StringSubKey           = "platform_account"
     const val MONTHLY_PRICE_KEY: StringSubKey              = "monthly_price"
     const val PRICE_KEY: StringSubKey                      = "price"
     const val PERCENT_KEY: StringSubKey                    = "percent"
-    const val DEVICE_TYPE_KEY: StringSubKey                    = "device_type"
+    const val DEVICE_TYPE_KEY: StringSubKey                = "device_type"
+    const val SESSION_FOUNDATION_KEY: StringSubKey         = "session_foundation"
 }

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

@@ -47,10 +47,7 @@ import org.session.libsession.utilities.TextSecurePreferences.Companion._events
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.debugmenu.DebugMenuViewModel
 import org.thoughtcrime.securesms.pro.ProStatusManager
-import org.thoughtcrime.securesms.util.DateUtils.Companion.secondsToInstant
-import org.thoughtcrime.securesms.util.DateUtils.Companion.toEpochSeconds
 import java.io.IOException
-import java.time.Instant
 import java.time.ZonedDateTime
 import java.util.Arrays
 import java.util.Date
@@ -231,7 +228,6 @@ interface TextSecurePreferences {
 
     var inAppReviewState: String?
 
-    var lastProfileUpdated: Instant?
 
     companion object {
         val TAG = TextSecurePreferences::class.simpleName
@@ -304,7 +300,6 @@ interface TextSecurePreferences {
         const val GIF_GRID_LAYOUT = "pref_gif_grid_layout"
         val IS_PUSH_ENABLED get() = "pref_is_using_fcm$pushSuffix"
         const val CONFIGURATION_SYNCED = "pref_configuration_synced"
-        const val LAST_PROFILE_UPDATE_TIME = "pref_last_profile_update_time"
         const val PROFILE_PIC_EXPIRY = "profile_pic_expiry"
         const val LAST_OPEN_DATE = "pref_last_open_date"
         const val HAS_HIDDEN_MESSAGE_REQUESTS = "pref_message_requests_hidden"
@@ -873,17 +868,6 @@ interface TextSecurePreferences {
         fun setLastSnodePoolRefreshDate(context: Context?, date: Date) {
             setLongPreference(context!!, "last_snode_pool_refresh_date", date.time)
         }
-
-        @JvmStatic
-        fun shouldUpdateProfile(context: Context, profileUpdateTime: Long): Boolean {
-            return profileUpdateTime > getLongPreference(context, LAST_PROFILE_UPDATE_TIME, 0)
-        }
-
-        @JvmStatic
-        fun setLastProfileUpdateTime(context: Context, profileUpdateTime: Long) {
-            setLongPreference(context, LAST_PROFILE_UPDATE_TIME, profileUpdateTime)
-        }
-
         fun getLastOpenTimeDate(context: Context): Long {
             return getLongPreference(context, LAST_OPEN_DATE, 0)
         }
@@ -1740,13 +1724,6 @@ class AppTextSecurePreferences @Inject constructor(
                 setStringPreference(TextSecurePreferences.DEPRECATING_START_TIME_OVERRIDE, value.toString())
             }
         }
-
-    override var lastProfileUpdated: Instant?
-        get() = getLongPreference(TextSecurePreferences.LAST_PROFILE_UPDATE_TIME, 0).secondsToInstant()
-        set(value) {
-            setLongPreference(TextSecurePreferences.LAST_PROFILE_UPDATE_TIME, value?.toEpochSeconds() ?: 0L)
-        }
-
     override fun getDebugMessageFeatures(): Set<ProStatusManager.MessageProFeature> {
         return getStringSetPreference( TextSecurePreferences.DEBUG_MESSAGE_FEATURES, emptySet())
             ?.map { ProStatusManager.MessageProFeature.valueOf(it) }?.toSet() ?: emptySet()