Skip to content

Bump org.matrix.rustcomponents:crypto-android from 0.11.1 to 26.1.22 #9105

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
bmarty merged 3 commits into from
Jan 22, 2026
+9 −2
Merged

Bump org.matrix.rustcomponents:crypto-android from 0.11.1 to 26.1.22 #9105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04883b2
Bump org.matrix.rustcomponents:crypto-android from 0.11.1 to 26.1.4
dependabot[bot] Jan 2, 2026
274d1fc
Upgrade org.matrix.rustcomponents:crypto-android to 26.1.22
bmarty Jan 22, 2026
e618f2b
Fix API break.
bmarty Jan 22, 2026
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
2 changes: 1 addition & 1 deletion matrix-sdk-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ dependencies {

implementation libs.google.phonenumber

implementation("org.matrix.rustcomponents:crypto-android:0.11.1")
implementation("org.matrix.rustcomponents:crypto-android:26.1.22")
// api project(":library:rustCrypto")

testImplementation libs.tests.junit
Expand Down
9 changes: 8 additions & 1 deletion matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,14 @@ internal class OlmMachine @Inject constructor(
val events = adapter.toJson(toDevice ?: ToDeviceSyncResponse())

// field pass in the list of unused fallback keys here
val receiveSyncChanges = inner.receiveSyncChanges(events, devices, counts, deviceUnusedFallbackKeyTypes, nextBatch ?: "")
val receiveSyncChanges = inner.receiveSyncChanges(
events = events,
deviceChanges = devices,
keyCounts = counts,
unusedFallbackKeys = deviceUnusedFallbackKeyTypes,
nextBatchToken = nextBatch ?: "",
decryptionSettings = DecryptionSettings(TrustRequirement.UNTRUSTED),

@bmarty bmarty Jan 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I am using the same value TrustRequirement.UNTRUSTED that is used at this point

@richvdh richvdh Jan 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

at this point

is that the right link? it seems to go back to the same place

@bmarty bmarty Jan 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes, sorry, the correct link is

element-android/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt

Line 466 in e618f2b

decryptionSettings = DecryptionSettings(TrustRequirement.UNTRUSTED)

@richvdh richvdh Jan 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

For future reference: the change that added this param was matrix-org/matrix-rust-sdk#5319. TrustRequirement.UNTRUSTED appears to be the right option here, at least in the absence of an "Exclude insecure devices" on EA.

)

val outAdapter = moshi.adapter(Event::class.java)

Expand Down
Loading