diff --git a/library/src/main/java/libxmtp-version.txt b/library/src/main/java/libxmtp-version.txt index e66634cfc..7b25be2bf 100644 --- a/library/src/main/java/libxmtp-version.txt +++ b/library/src/main/java/libxmtp-version.txt @@ -1,3 +1,3 @@ -Version: 3df528b5 +Version: e08dc95c Branch: main -Date: 2024-07-25 22:27:46 +0000 +Date: 2024-07-26 17:36:50 +0000 diff --git a/library/src/main/java/xmtpv3.kt b/library/src/main/java/xmtpv3.kt index e97424bc0..032f4460c 100644 --- a/library/src/main/java/xmtpv3.kt +++ b/library/src/main/java/xmtpv3.kt @@ -3,7 +3,7 @@ @file:Suppress("NAME_SHADOWING") -package uniffi.xmtpv3; +package uniffi.xmtpv3 // Common helper code. // @@ -250,7 +250,7 @@ internal open class UniffiRustCallStatus : Structure() { } } -class InternalException(message: String) : Exception(message) +class InternalException(message: String) : kotlin.Exception(message) // Each top-level error class has a companion object that can lift the error from the call status's rust buffer interface UniffiRustCallStatusErrorHandler { @@ -262,18 +262,18 @@ interface UniffiRustCallStatusErrorHandler { // synchronize itself // Call a rust function that returns a Result<>. Pass in the Error class companion that corresponds to the Err -private inline fun uniffiRustCallWithError( +private inline fun uniffiRustCallWithError( errorHandler: UniffiRustCallStatusErrorHandler, callback: (UniffiRustCallStatus) -> U, ): U { - var status = UniffiRustCallStatus(); + var status = UniffiRustCallStatus() val return_value = callback(status) uniffiCheckCallStatus(errorHandler, status) return return_value } // Check UniffiRustCallStatus and throw an error if the call wasn't successful -private fun uniffiCheckCallStatus( +private fun uniffiCheckCallStatus( errorHandler: UniffiRustCallStatusErrorHandler, status: UniffiRustCallStatus, ) { @@ -305,7 +305,7 @@ object UniffiNullRustCallStatusErrorHandler : UniffiRustCallStatusErrorHandler uniffiRustCall(callback: (UniffiRustCallStatus) -> U): U { - return uniffiRustCallWithError(UniffiNullRustCallStatusErrorHandler, callback); + return uniffiRustCallWithError(UniffiNullRustCallStatusErrorHandler, callback) } internal inline fun uniffiTraitInterfaceCall( @@ -315,7 +315,7 @@ internal inline fun uniffiTraitInterfaceCall( ) { try { writeReturn(makeCall()) - } catch (e: Exception) { + } catch (e: kotlin.Exception) { callStatus.code = UNIFFI_CALL_UNEXPECTED_ERROR callStatus.error_buf = FfiConverterString.lower(e.toString()) } @@ -329,7 +329,7 @@ internal inline fun uniffiTraitInterfaceCallWithError ) { try { writeReturn(makeCall()) - } catch (e: Exception) { + } catch (e: kotlin.Exception) { if (e is E) { callStatus.code = UNIFFI_CALL_ERROR callStatus.error_buf = lowerError(e) @@ -2204,7 +2204,7 @@ internal object uniffiRustFutureContinuationCallbackImpl : UniffiRustFutureConti } } -internal suspend fun uniffiRustCallAsync( +internal suspend fun uniffiRustCallAsync( rustFuture: Long, pollFunc: (Long, UniffiRustFutureContinuationCallback, Long) -> Unit, completeFunc: (Long, UniffiRustCallStatus) -> F, @@ -7268,7 +7268,7 @@ public object FfiConverterTypeFfiSortDirection : FfiConverterRustBuffer