Pro features

Author: SessionHero01

library/src/main/cpp/protocol.cpp

@@ -53,14 +53,15 @@ static jobject serializeDecodedEnvelope(JNIEnv *env, const session::DecodedEnvel
     jmethodID init = env->GetMethodID(
             envelopClass.get(),
             "<init>",
-            "(Lnetwork/loki/messenger/libsession_util/protocol/Envelope;Lnetwork/loki/messenger/libsession_util/pro/ProProof$Status;Lnetwork/loki/messenger/libsession_util/pro/ProProof;[B[B[BJ)V"
+            "(Lnetwork/loki/messenger/libsession_util/protocol/Envelope;ILnetwork/loki/messenger/libsession_util/pro/ProProof;J[B[B[BJ)V"
     );
 
     return env->NewObject(envelopClass.get(), init,
                           serializeEnvelop(env, envelop.envelope).get(),
                           envelop.pro ? static_cast<jint>(envelop.pro->status)
                                        : static_cast<jint>(-1),
                           envelop.pro ? serializeProProof(env, envelop.pro->proof).get() : nullptr,
+                          static_cast<jlong>(envelop.pro ? envelop.pro->features : 0),
                           content.get(),
                           sender_ed25519.get(),
                           sender_x25519.get(),
@@ -165,7 +166,7 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_decodeForC
         jmethodID init = env->GetMethodID(
                 envelopClass.get(),
                 "<init>",
-                "(Lnetwork/loki/messenger/libsession_util/protocol/pro/ProProof$Status;Lnetwork/loki/messenger/libsession_util/protocol/pro/ProProof;[B)V"
+                "(Lnetwork/loki/messenger/libsession_util/protocol/pro/ProProof$Status;Lnetwork/loki/messenger/libsession_util/protocol/pro/ProProof;J[B)V"
         );
 
         return env->NewObject(
@@ -174,6 +175,7 @@ Java_network_loki_messenger_libsession_1util_protocol_SessionProtocol_decodeForC
                 decoded.pro ? static_cast<jint>(decoded.pro->status)
                              : static_cast<jint>(-1),
                 decoded.pro ? serializeProProof(env, decoded.pro->proof).get() : nullptr,
+                static_cast<jlong>(decoded.pro ? decoded.pro->features : 0),
                 util::bytes_from_vector(env, decoded.content_plaintext)
         );
     });

library/src/main/java/network/loki/messenger/libsession_util/protocol/DecodedCommunityMessage.kt

@@ -8,16 +8,19 @@ import java.util.EnumSet
 data class DecodedCommunityMessage(
     val proStatus: ProProof.Status?,
     val proProof: ProProof?,
+    val proFeatures: ProFeatures,
     val contentPlainText: Bytes,
 ) {
     @Keep
     constructor(
         status: Int,
         proProof: ProProof?,
+        proFeatures: Long,
         contentPlainText: ByteArray,
     ): this(
         proStatus = ProProof.Status.fromNativeValueOrNull(status),
         proProof = proProof,
+        proFeatures = ProFeatures(proFeatures),
         contentPlainText = Bytes(contentPlainText),
     )
 

library/src/main/java/network/loki/messenger/libsession_util/protocol/DecodedEnvelope.kt

@@ -10,6 +10,7 @@ data class DecodedEnvelope(
     val envelope: Envelope,
     val proStatus: ProProof.Status?,
     val proProof: ProProof?,
+    val proFeatures: ProFeatures,
     val contentPlainText: Bytes,
     val senderEd25519PubKey: Bytes,
     val senderX25519PubKey: Bytes,
@@ -20,6 +21,7 @@ data class DecodedEnvelope(
         envelope: Envelope,
         proStatus: Int,
         proProof: ProProof?,
+        proFeatures: Long,
         contentPlainText: ByteArray,
         senderEd25519PubKey: ByteArray,
         senderX25519PubKey: ByteArray,
@@ -28,6 +30,7 @@ data class DecodedEnvelope(
         envelope = envelope,
         proStatus = ProProof.Status.fromNativeValueOrNull(proStatus),
         proProof = proProof,
+        proFeatures = ProFeatures(proFeatures),
         contentPlainText = Bytes(contentPlainText),
         senderEd25519PubKey = Bytes(senderEd25519PubKey),
         senderX25519PubKey = Bytes(senderX25519PubKey),

library/src/main/java/network/loki/messenger/libsession_util/protocol/ProFeatures.kt

@@ -1,12 +1,30 @@
 package network.loki.messenger.libsession_util.protocol
 
+import kotlinx.serialization.Serializable
+
 
 enum class ProFeature(internal val bitIndex: Int) {
     HIGHER_CHARACTER_LIMIT(0),
     PRO_BADGE(1),
     ANIMATED_AVATAR(2),
 }
 
+@Serializable
+@JvmInline
+value class ProFeatures(val rawValue: Long) {
+    companion object {
+        val NONE = ProFeatures(0L)
+    }
+
+    fun contains(feature: ProFeature): Boolean {
+        return (rawValue and (1L shl feature.bitIndex)) != 0L
+    }
+
+    fun toSet(): Set<ProFeature> {
+        return rawValue.toFeatures()
+    }
+}
+
 internal fun Long.toFeatures(): Set<ProFeature> {
     return buildSet(ProFeature.entries.size) {
         for (entry in ProFeature.entries) {