diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b71ef753b..0c958ef1d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: - release env: - RELEASE_VERSION: "4.6.2" + RELEASE_VERSION: "4.6.3" jobs: library: diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt index 0e83da1c6..5d7c31b26 100644 --- a/library/src/main/java/libxmtp-version.txt +++ b/library/src/main/java/libxmtp-version.txt @@ -1,3 +1,3 @@ -Version: 55ffdc98 -Branch: release/v1.6.2 -Date: 2025-11-26 22:14:31 +0000 +Version: ab0df092 +Branch: release/v1.6 +Date: 2025-11-30 00:29:29 +0000 diff --git a/library/src/main/java/org/xmtp/android/library/Conversations.kt b/library/src/main/java/org/xmtp/android/library/Conversations.kt index f3b9e0b16..fb7f2c19d 100644 --- a/library/src/main/java/org/xmtp/android/library/Conversations.kt +++ b/library/src/main/java/org/xmtp/android/library/Conversations.kt @@ -167,25 +167,30 @@ data class Conversations( groupImageUrlSquare: String = "", groupDescription: String = "", disappearingMessageSettings: DisappearingMessageSettings? = null, - appData: String? = null, + <<<<<<< HEAD + appData: String? = null, + ======= + appData: String?, + >>>>>>> 502528e9 (Release v1.6.2) ): Group = - withContext(Dispatchers.IO) { - newGroupInternalWithIdentities( - identities, - GroupPermissionPreconfiguration.toFfiGroupPermissionOptions(permissions), - groupName, - groupImageUrlSquare, - groupDescription, - null, - disappearingMessageSettings?.let { - FfiMessageDisappearingSettings( - it.disappearStartingAtNs, - it.retentionDurationInNs, - ) - }, - appData, - ) - } + withContext(Dispatchers.IO) + { + newGroupInternalWithIdentities( + identities, + GroupPermissionPreconfiguration.toFfiGroupPermissionOptions(permissions), + groupName, + groupImageUrlSquare, + groupDescription, + null, + disappearingMessageSettings?.let { + FfiMessageDisappearingSettings( + it.disappearStartingAtNs, + it.retentionDurationInNs, + ) + }, + appData, + ) + } suspend fun newGroupCustomPermissionsWithIdentities( identities: List, @@ -236,7 +241,7 @@ data class Conversations( groupDescription = groupDescription, customPermissionPolicySet = permissionsPolicySet, messageDisappearingSettings = - messageDisappearingSettings, + messageDisappearingSettings, appData = appData, ), ) @@ -321,7 +326,7 @@ data class Conversations( groupDescription = groupDescription, customPermissionPolicySet = permissionsPolicySet, messageDisappearingSettings = - messageDisappearingSettings, + messageDisappearingSettings, appData, ), ) diff --git a/library/src/main/java/xmtpv3.kt b/library/src/main/java/xmtpv3.kt index 7db65cd38..54ed523cd 100644 --- a/library/src/main/java/xmtpv3.kt +++ b/library/src/main/java/xmtpv3.kt @@ -1068,6 +1068,8 @@ internal interface IntegrityCheckingUniffiLib : Library { fun uniffi_xmtpv3_checksum_func_decode_attachment(): Short + fun uniffi_xmtpv3_checksum_func_decode_group_updated(): Short + fun uniffi_xmtpv3_checksum_func_decode_intent(): Short fun uniffi_xmtpv3_checksum_func_decode_multi_remote_attachment(): Short @@ -1080,8 +1082,12 @@ internal interface IntegrityCheckingUniffiLib : Library { fun uniffi_xmtpv3_checksum_func_decode_reply(): Short + fun uniffi_xmtpv3_checksum_func_decode_text(): Short + fun uniffi_xmtpv3_checksum_func_decode_transaction_reference(): Short + fun uniffi_xmtpv3_checksum_func_decode_wallet_send_calls(): Short + fun uniffi_xmtpv3_checksum_func_encode_actions(): Short fun uniffi_xmtpv3_checksum_func_encode_attachment(): Short @@ -1098,8 +1104,12 @@ internal interface IntegrityCheckingUniffiLib : Library { fun uniffi_xmtpv3_checksum_func_encode_reply(): Short + fun uniffi_xmtpv3_checksum_func_encode_text(): Short + fun uniffi_xmtpv3_checksum_func_encode_transaction_reference(): Short + fun uniffi_xmtpv3_checksum_func_encode_wallet_send_calls(): Short + fun uniffi_xmtpv3_checksum_func_enter_debug_writer(): Short fun uniffi_xmtpv3_checksum_func_enter_debug_writer_with_level(): Short @@ -2584,6 +2594,11 @@ internal interface UniffiLib : Library { uniffi_out_err: UniffiRustCallStatus, ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_decode_group_updated( + `bytes`: RustBuffer.ByValue, + uniffi_out_err: UniffiRustCallStatus, + ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_decode_intent( `bytes`: RustBuffer.ByValue, uniffi_out_err: UniffiRustCallStatus, @@ -2614,11 +2629,21 @@ internal interface UniffiLib : Library { uniffi_out_err: UniffiRustCallStatus, ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_decode_text( + `bytes`: RustBuffer.ByValue, + uniffi_out_err: UniffiRustCallStatus, + ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_decode_transaction_reference( `bytes`: RustBuffer.ByValue, uniffi_out_err: UniffiRustCallStatus, ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_decode_wallet_send_calls( + `bytes`: RustBuffer.ByValue, + uniffi_out_err: UniffiRustCallStatus, + ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_encode_actions( `actions`: RustBuffer.ByValue, uniffi_out_err: UniffiRustCallStatus, @@ -2659,11 +2684,21 @@ internal interface UniffiLib : Library { uniffi_out_err: UniffiRustCallStatus, ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_encode_text( + `text`: RustBuffer.ByValue, + uniffi_out_err: UniffiRustCallStatus, + ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_encode_transaction_reference( `reference`: RustBuffer.ByValue, uniffi_out_err: UniffiRustCallStatus, ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_encode_wallet_send_calls( + `walletSendCalls`: RustBuffer.ByValue, + uniffi_out_err: UniffiRustCallStatus, + ): RustBuffer.ByValue + fun uniffi_xmtpv3_fn_func_enter_debug_writer( `directory`: RustBuffer.ByValue, `logLevel`: RustBuffer.ByValue, @@ -2976,6 +3011,9 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) { if (lib.uniffi_xmtpv3_checksum_func_decode_attachment() != 20456.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } + if (lib.uniffi_xmtpv3_checksum_func_decode_group_updated() != 277.toShort()) { + throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") + } if (lib.uniffi_xmtpv3_checksum_func_decode_intent() != 24165.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } @@ -2994,9 +3032,15 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) { if (lib.uniffi_xmtpv3_checksum_func_decode_reply() != 41903.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } + if (lib.uniffi_xmtpv3_checksum_func_decode_text() != 7209.toShort()) { + throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") + } if (lib.uniffi_xmtpv3_checksum_func_decode_transaction_reference() != 25896.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } + if (lib.uniffi_xmtpv3_checksum_func_decode_wallet_send_calls() != 2959.toShort()) { + throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") + } if (lib.uniffi_xmtpv3_checksum_func_encode_actions() != 15414.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } @@ -3021,9 +3065,15 @@ private fun uniffiCheckApiChecksums(lib: IntegrityCheckingUniffiLib) { if (lib.uniffi_xmtpv3_checksum_func_encode_reply() != 3022.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } + if (lib.uniffi_xmtpv3_checksum_func_encode_text() != 6696.toShort()) { + throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") + } if (lib.uniffi_xmtpv3_checksum_func_encode_transaction_reference() != 22144.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } + if (lib.uniffi_xmtpv3_checksum_func_encode_wallet_send_calls() != 8163.toShort()) { + throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") + } if (lib.uniffi_xmtpv3_checksum_func_enter_debug_writer() != 7266.toShort()) { throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project") } @@ -12567,6 +12617,10 @@ data class FfiGroupUpdated( var `removedInboxes`: List, var `leftInboxes`: List, var `metadataFieldChanges`: List, + var `addedAdminInboxes`: List, + var `removedAdminInboxes`: List, + var `addedSuperAdminInboxes`: List, + var `removedSuperAdminInboxes`: List, ) { companion object } @@ -12582,6 +12636,10 @@ public object FfiConverterTypeFfiGroupUpdated : FfiConverterRustBuffer + UniffiLib.INSTANCE.uniffi_xmtpv3_fn_func_decode_group_updated(FfiConverterByteArray.lower(`bytes`), _status) + }, + ) + @Throws(GenericException::class) fun `decodeIntent`(`bytes`: kotlin.ByteArray): FfiIntent = FfiConverterTypeFfiIntent.lift( @@ -18214,6 +18288,14 @@ fun `decodeReply`(`bytes`: kotlin.ByteArray): FfiReply = }, ) +@Throws(GenericException::class) +fun `decodeText`(`bytes`: kotlin.ByteArray): kotlin.String = + FfiConverterString.lift( + uniffiRustCallWithError(GenericException) { _status -> + UniffiLib.INSTANCE.uniffi_xmtpv3_fn_func_decode_text(FfiConverterByteArray.lower(`bytes`), _status) + }, + ) + @Throws(GenericException::class) fun `decodeTransactionReference`(`bytes`: kotlin.ByteArray): FfiTransactionReference = FfiConverterTypeFfiTransactionReference.lift( @@ -18222,6 +18304,14 @@ fun `decodeTransactionReference`(`bytes`: kotlin.ByteArray): FfiTransactionRefer }, ) +@Throws(GenericException::class) +fun `decodeWalletSendCalls`(`bytes`: kotlin.ByteArray): FfiWalletSendCalls = + FfiConverterTypeFfiWalletSendCalls.lift( + uniffiRustCallWithError(GenericException) { _status -> + UniffiLib.INSTANCE.uniffi_xmtpv3_fn_func_decode_wallet_send_calls(FfiConverterByteArray.lower(`bytes`), _status) + }, + ) + @Throws(GenericException::class) fun `encodeActions`(`actions`: FfiActions): kotlin.ByteArray = FfiConverterByteArray.lift( @@ -18292,6 +18382,14 @@ fun `encodeReply`(`reply`: FfiReply): kotlin.ByteArray = }, ) +@Throws(GenericException::class) +fun `encodeText`(`text`: kotlin.String): kotlin.ByteArray = + FfiConverterByteArray.lift( + uniffiRustCallWithError(GenericException) { _status -> + UniffiLib.INSTANCE.uniffi_xmtpv3_fn_func_encode_text(FfiConverterString.lower(`text`), _status) + }, + ) + @Throws(GenericException::class) fun `encodeTransactionReference`(`reference`: FfiTransactionReference): kotlin.ByteArray = FfiConverterByteArray.lift( @@ -18303,6 +18401,17 @@ fun `encodeTransactionReference`(`reference`: FfiTransactionReference): kotlin.B }, ) +@Throws(GenericException::class) +fun `encodeWalletSendCalls`(`walletSendCalls`: FfiWalletSendCalls): kotlin.ByteArray = + FfiConverterByteArray.lift( + uniffiRustCallWithError(GenericException) { _status -> + UniffiLib.INSTANCE.uniffi_xmtpv3_fn_func_encode_wallet_send_calls( + FfiConverterTypeFfiWalletSendCalls.lower(`walletSendCalls`), + _status, + ) + }, + ) + /** * turns on logging to a file on-disk in the directory specified. * files will be prefixed with 'libxmtp.log' and suffixed with the timestamp, diff --git a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so index ea3c4f112..14a33536a 100755 Binary files a/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/arm64-v8a/libuniffi_xmtpv3.so differ diff --git a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so index 6b0250d0b..bc5999de7 100755 Binary files a/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/armeabi-v7a/libuniffi_xmtpv3.so differ diff --git a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so index caccd64bd..e793038d2 100755 Binary files a/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/x86/libuniffi_xmtpv3.so differ diff --git a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so index c1c56da30..d1a84aacf 100755 Binary files a/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so and b/library/src/main/jniLibs/x86_64/libuniffi_xmtpv3.so differ