Updated to latest libsession-util

SessionHero01 · SessionHero01 · commit 37033b0cabfc · 2025-09-25T14:43:50.000+08:00
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,6 +7,7 @@ junit = { module = "junit:junit", version = "4.13.2" }
 androidx-test-runner = { module = "androidx.test:runner", version = "1.7.0" }
 androidx-test-rules = { module = "androidx.test:rules", version = "1.7.0" }
 androidx-test-ext = { module = "androidx.test.ext:junit", version = "1.3.0" }
+androidx-annotations = { module = "androidx.annotation:annotation", version = "1.9.1" }
 
 [plugins]
 android-library = { id = "com.android.library", version.ref = "agp" }
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -102,4 +102,6 @@ dependencies {
     androidTestImplementation(libs.androidx.test.runner)
     androidTestImplementation(libs.androidx.test.rules)
     androidTestImplementation(libs.androidx.test.ext)
+
+    implementation(libs.androidx.annotations)
 }
diff --git a/library/src/main/cpp/protocol.cpp b/library/src/main/cpp/protocol.cpp
@@ -17,7 +17,7 @@ static JavaLocalRef<jobject> serializeProStatus(JNIEnv *env, const session::Decr
         return {env, env->GetStaticObjectField(noneClass.get(), fieldId)};
     }
 
-    if (envelope.pro->status == session::config::ProStatus::Valid) {
+    if (envelope.pro->status == session::ProStatus::Valid) {
         JavaLocalRef validClass(env, env->FindClass("network/loki/messenger/libsession_util/protocol/ProStatus$Valid"));
         auto init = env->GetMethodID(validClass.get(), "<init>", "(JJ)V");
         return {env, env->NewObject(validClass.get(), init,
diff --git a/library/src/main/java/network/loki/messenger/libsession_util/protocol/DecryptedEnvelope.kt b/library/src/main/java/network/loki/messenger/libsession_util/protocol/DecryptedEnvelope.kt
@@ -1,5 +1,6 @@
 package network.loki.messenger.libsession_util.protocol
 
+import androidx.annotation.Keep
 import network.loki.messenger.libsession_util.util.Bytes
 import java.time.Instant
 
@@ -10,6 +11,7 @@ data class DecryptedEnvelope(
     val senderX25519PubKey: Bytes,
     val timestamp: Instant
 ) {
+    @Keep
     constructor(
         proStatus: ProStatus,
         contentPlainText: ByteArray,
diff --git a/library/src/main/java/network/loki/messenger/libsession_util/protocol/ProStatus.kt b/library/src/main/java/network/loki/messenger/libsession_util/protocol/ProStatus.kt
@@ -1,5 +1,6 @@
 package network.loki.messenger.libsession_util.protocol
 
+import androidx.annotation.Keep
 import java.time.Instant
 
 
@@ -11,6 +12,7 @@ sealed interface ProStatus {
         val expiresAt: Instant,
         val proFeatures: Set<ProFeature>
     ) {
+        @Keep
         constructor(
             expiresAtEpochSeconds: Long,
             proFeatures: Long
diff --git a/libsession-util b/libsession-util
@@ -1 +1 @@
-Subproject commit c73fd92eb71e8108cc435fc640fbcb8faceacbb0
+Subproject commit db2e063cd73715433a0466c6219671b2c460addf

Original file line number	Diff line number	Diff line change
`@@ -102,4 +102,6 @@ dependencies {`
`102`	`102`	`androidTestImplementation(libs.androidx.test.runner)`
`103`	`103`	`androidTestImplementation(libs.androidx.test.rules)`
`104`	`104`	`androidTestImplementation(libs.androidx.test.ext)`
	`105`	`+`
	`106`	`+ implementation(libs.androidx.annotations)`
`105`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ static JavaLocalRef<jobject> serializeProStatus(JNIEnv *env, const session::Decr`
`17`	`17`	`return {env, env->GetStaticObjectField(noneClass.get(), fieldId)};`
`18`	`18`	`}`
`19`	`19`
`20`		`- if (envelope.pro->status == session::config::ProStatus::Valid) {`
	`20`	`+ if (envelope.pro->status == session::ProStatus::Valid) {`
`21`	`21`	`JavaLocalRef validClass(env, env->FindClass("network/loki/messenger/libsession_util/protocol/ProStatus$Valid"));`
`22`	`22`	`auto init = env->GetMethodID(validClass.get(), "<init>", "(JJ)V");`
`23`	`23`	`return {env, env->NewObject(validClass.get(), init,`