Skip to content

Integrate pro related from config #1709

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
merged 8 commits into from
Nov 23, 2025
Merged

Integrate pro related from config #1709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fb8e92
Remove unused dependency
SessionHero01 Nov 19, 2025
5184290
Import
SessionHero01 Nov 19, 2025
20c4aed
Counting chars using codepoints
SessionHero01 Nov 20, 2025
963c9e9
Update imports
SessionHero01 Nov 21, 2025
7ca0924
Merge remote-tracking branch 'origin/dev' into pro-message-part-4
SessionHero01 Nov 21, 2025
d449fe5
Fix compilation issue
SessionHero01 Nov 21, 2025
8fb87b9
More integration
SessionHero01 Nov 21, 2025
725e66e
Revert unneeded changes
SessionHero01 Nov 23, 2025
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
1 change: 0 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ protobuf {

android {
namespace = "network.loki.messenger"
useLibrary("org.apache.http.legacy")

compileOptions {
sourceCompatibility = JavaVersion.VERSION_21
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.coroutineScope
import network.loki.messenger.libsession_util.ConfigBase
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import org.session.libsession.database.StorageProtocol
import org.session.libsession.messaging.messages.Destination
import org.session.libsession.messaging.messages.Message
Expand Down Expand Up @@ -144,7 +144,7 @@ class BatchMessageReceiveJob @AssistedInject constructor(
message.groupPublicKey == null && // not a group
message.openGroupServerMessageID == null && // not a community
// not marked as hidden
configs.contacts.get(message.senderOrSync)?.priority == ConfigBase.PRIORITY_HIDDEN &&
configs.contacts.get(message.senderOrSync)?.priority == PRIORITY_HIDDEN &&
// the message's sentTimestamp is earlier than the sentTimestamp of the last config
message.sentTimestamp!! < contactConfigTimestamp
}
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import org.session.libsession.messaging.messages.control.TypingIndicator
import org.session.libsession.messaging.messages.control.UnsendRequest
import org.session.libsession.messaging.messages.visible.VisibleMessage
import org.session.libsession.snode.SnodeAPI
import org.session.libsession.utilities.ConfigFactoryProtocol
import org.session.libsignal.crypto.PushTransportDetails
import org.session.libsignal.protos.SignalServiceProtos
import org.session.libsignal.protos.SignalServiceProtos.Envelope
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.SendChannel
import kotlinx.coroutines.launch
import kotlinx.coroutines.supervisorScope
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.Namespace
import network.loki.messenger.libsession_util.ReadableUserProfile
import network.loki.messenger.libsession_util.protocol.SessionProtocol
Expand Down Expand Up @@ -124,7 +124,7 @@ class MessageSender @Inject constructor(
msg.toProto(builder, messageDataProvider)

// Attach pro proof
proDatabase.getCurrentProProof()?.let { proof ->
configFactory.withUserConfigs { it.userProfile.getProConfig() }?.proProof?.let { proof ->
builder.proMessageBuilder.proofBuilder.copyFromLibSession(proof)
}

Expand Down
7 changes: 4 additions & 3 deletions ...rc/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import network.loki.messenger.R
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.ED25519
import network.loki.messenger.libsession_util.util.BaseCommunityInfo
import network.loki.messenger.libsession_util.util.BlindKeyAPI
import network.loki.messenger.libsession_util.util.ExpiryMode
import network.loki.messenger.libsession_util.util.Util
import org.session.libsession.database.MessageDataProvider
import org.session.libsession.database.StorageProtocol
import org.session.libsession.database.userAuth
Expand Down Expand Up @@ -394,7 +395,7 @@ class ReceivedMessageHandler @Inject constructor(

// Verify the incoming message length and truncate it if needed, before saving it to the db
val maxChars = proStatusManager.getIncomingMessageMaxLength(message)
val messageText = message.text?.take(maxChars) // truncate to max char limit for this message
val messageText = message.text?.let { Util.truncateCodepoints(it, maxChars) } // truncate to max char limit for this message
message.text = messageText
message.hasMention = listOfNotNull(userPublicKey, context.userBlindedKey)
.any { key ->
Expand Down
4 changes: 2 additions & 2 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 @@ -6,7 +6,7 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import network.loki.messenger.R
import network.loki.messenger.libsession_util.ConfigBase
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.util.BaseCommunityInfo
import network.loki.messenger.libsession_util.util.BlindKeyAPI
import network.loki.messenger.libsession_util.util.KeyPair
Expand Down Expand Up @@ -493,7 +493,7 @@ class ReceivedMessageProcessor @Inject constructor(
threadAddress: Address.Standard
): Boolean {
val hidden = configFactory.withUserConfigs { configs ->
configs.contacts.get(threadAddress.address)?.priority == ConfigBase.PRIORITY_HIDDEN
configs.contacts.get(threadAddress.address)?.priority == PRIORITY_HIDDEN
}

return hidden &&
Expand Down
7 changes: 4 additions & 3 deletions ...src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package org.session.libsession.messaging.sending_receiving
import android.text.TextUtils
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.util.BaseCommunityInfo
import network.loki.messenger.libsession_util.util.ExpiryMode
import network.loki.messenger.libsession_util.util.Util
import org.session.libsession.database.MessageDataProvider
import org.session.libsession.messaging.groups.GroupManagerV2
import org.session.libsession.messaging.jobs.AttachmentDownloadJob
Expand Down Expand Up @@ -147,7 +148,7 @@ class VisibleMessageHandler @Inject constructor(

// Verify the incoming message length and truncate it if needed, before saving it to the db
val maxChars = proStatusManager.getIncomingMessageMaxLength(message)
Copy link
Collaborator

@ThomasSession ThomasSession Nov 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think getIncomingMessageMaxLength in proStatusManager needs some real logic in there, because right now it isn't basing the decision on the pro status of that message, so it's still only using debug values.

Copy link
Collaborator Author

@SessionHero01 SessionHero01 Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't started on this one yet

val messageText = message.text?.take(maxChars) // truncate to max char limit for this message
val messageText = message.text?.let { Util.truncateCodepoints(it, maxChars) } // truncate to max char limit for this message
message.text = messageText
message.hasMention = (sequenceOf(ctx.currentUserPublicKey) + ctx.getCurrentUserBlindedIDsByThread(threadAddress).asSequence())
.any { key ->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/session/libsession/utilities/recipients/Recipient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.session.libsession.utilities.recipients

import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_PINNED
import network.loki.messenger.libsession_util.PRIORITY_PINNED
import network.loki.messenger.libsession_util.util.ExpiryMode
import org.session.libsession.messaging.open_groups.GroupMemberRole
import org.session.libsession.utilities.Address
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/session/libsession/utilities/recipients/RecipientData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.session.libsession.utilities.recipients

import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.util.ExpiryMode
import network.loki.messenger.libsession_util.util.GroupInfo
import network.loki.messenger.libsession_util.util.GroupMember
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/InputbarViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
import network.loki.messenger.R
import network.loki.messenger.libsession_util.util.Util
import org.session.libsession.utilities.StringSubstitutionConstants.LIMIT_KEY
import org.thoughtcrime.securesms.database.RecipientRepository
import org.thoughtcrime.securesms.pro.ProStatus
Expand All @@ -33,7 +34,7 @@ abstract class InputbarViewModel(
fun onTextChanged(text: CharSequence) {
// check the character limit
val maxChars = proStatusManager.getCharacterLimit(currentUser.isPro)
val charsLeft = maxChars - text.length
val charsLeft = maxChars - Util.countCodepoints(text.toString())

// update the char limit state based on characters left
val charLimitState = if(charsLeft <= CHARACTER_LIMIT_THRESHOLD){
Expand Down
6 changes: 2 additions & 4 deletions app/src/main/java/org/thoughtcrime/securesms/ShareViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import network.loki.messenger.R
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import org.session.libsession.messaging.groups.LegacyGroupDeprecationManager
import org.session.libsession.utilities.Address
import org.session.libsession.utilities.recipients.RecipientData
Expand All @@ -32,7 +32,6 @@ import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2
import org.thoughtcrime.securesms.database.model.ThreadRecord
import org.thoughtcrime.securesms.home.search.searchName
import org.thoughtcrime.securesms.mms.PartAuthority
import org.thoughtcrime.securesms.pro.ProStatusManager
import org.thoughtcrime.securesms.providers.BlobUtils
import org.thoughtcrime.securesms.repository.ConversationRepository
import org.thoughtcrime.securesms.util.AvatarUIData
Expand All @@ -46,9 +45,8 @@ import javax.inject.Inject
class ShareViewModel @Inject constructor(
@param:ApplicationContext private val context: Context,
private val avatarUtils: AvatarUtils,
private val proStatusManager: ProStatusManager,
private val deprecationManager: LegacyGroupDeprecationManager,
private val conversationRepository: ConversationRepository,
conversationRepository: ConversationRepository,
): ViewModel(){
private val TAG = ShareViewModel::class.java.simpleName

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import network.loki.messenger.R
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.util.BlindKeyAPI
import network.loki.messenger.libsession_util.util.BlindedContact
import network.loki.messenger.libsession_util.util.ExpiryMode
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/thoughtcrime/securesms/conversation/v2/settings/ConversationSettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import network.loki.messenger.R
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.ConfigBase.Companion.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.PRIORITY_HIDDEN
import network.loki.messenger.libsession_util.PRIORITY_VISIBLE
import network.loki.messenger.libsession_util.util.ExpiryMode
import org.session.libsession.database.StorageProtocol
import org.session.libsession.messaging.groups.GroupManagerV2
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/java/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Build;

import androidx.annotation.NonNull;

Expand All @@ -31,7 +30,6 @@
import org.session.libsignal.crypto.ecc.DjbECPublicKey;
import org.session.libsignal.crypto.ecc.ECKeyPair;
import org.session.libsignal.crypto.ecc.ECPrivateKey;
import org.session.libsignal.crypto.ecc.ECPublicKey;
import org.session.libsignal.exceptions.InvalidKeyException;
import org.session.libsignal.utilities.Base64;

Expand All @@ -40,7 +38,6 @@
import kotlin.Unit;
import kotlinx.coroutines.channels.BufferOverflow;
import kotlinx.coroutines.flow.MutableSharedFlow;
import kotlinx.coroutines.flow.MutableStateFlow;
import kotlinx.coroutines.flow.SharedFlowKt;
import network.loki.messenger.libsession_util.Curve25519;
import network.loki.messenger.libsession_util.util.KeyPair;
Expand Down
Loading