Skip to content

Update after API breaking changes from related Rust PR #220

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

Open
richvdh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update after API breaking changes from related Rust PR #220

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4e98f
Update after API breaking changes from related Rust PR
richvdh Dec 19, 2025
db14d0c
Merge remote-tracking branch 'origin/main' into rav/clean_up_shield_s…
richvdh Dec 19, 2025
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
46 changes: 22 additions & 24 deletions internal/api/rust/rust.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package rust

import (
"fmt"
"github.com/matrix-org/complement-crypto/internal/api/rust/matrix_sdk_common"
"github.com/matrix-org/complement-crypto/internal/api/rust/matrix_sdk_ui"
"log"
"os"
"path/filepath"
Expand Down Expand Up @@ -359,22 +359,22 @@ func (c *RustClient) GetEventShield(t ct.TestLike, roomID, eventID string) (*api
}
shieldState := timelineItem.LazyProvider.GetShields(false)

codeToString := func(code matrix_sdk_common.ShieldStateCode) api.EventShieldCode {
codeToString := func(code matrix_sdk_ui.TimelineEventShieldStateCode) api.EventShieldCode {
var result api.EventShieldCode
switch code {
case matrix_sdk_common.ShieldStateCodeAuthenticityNotGuaranteed:
case matrix_sdk_ui.TimelineEventShieldStateCodeAuthenticityNotGuaranteed:
result = api.EventShieldCodeAuthenticityNotGuaranteed
case matrix_sdk_common.ShieldStateCodeUnknownDevice:
case matrix_sdk_ui.TimelineEventShieldStateCodeUnknownDevice:
result = api.EventShieldCodeUnknownDevice
case matrix_sdk_common.ShieldStateCodeUnsignedDevice:
case matrix_sdk_ui.TimelineEventShieldStateCodeUnsignedDevice:
result = api.EventShieldCodeUnsignedDevice
case matrix_sdk_common.ShieldStateCodeUnverifiedIdentity:
case matrix_sdk_ui.TimelineEventShieldStateCodeUnverifiedIdentity:
result = api.EventShieldCodeUnverifiedIdentity
case matrix_sdk_common.ShieldStateCodeSentInClear:
case matrix_sdk_ui.TimelineEventShieldStateCodeSentInClear:
result = api.EventShieldCodeSentInClear
case matrix_sdk_common.ShieldStateCodeVerificationViolation:
case matrix_sdk_ui.TimelineEventShieldStateCodeVerificationViolation:
result = api.EventShieldCodeVerificationViolation
case matrix_sdk_common.ShieldStateCodeMismatchedSender:
case matrix_sdk_ui.TimelineEventShieldStateCodeMismatchedSender:
result = api.EventShieldCodeMismatchedSender
default:
log.Panicf("Unknown shield code %d", code)
Expand All @@ -384,24 +384,22 @@ func (c *RustClient) GetEventShield(t ct.TestLike, roomID, eventID string) (*api

var eventShield *api.EventShield

if shieldState != nil {
shield := *shieldState
switch shield.(type) {
case matrix_sdk_ffi.ShieldStateNone:
// no-op
switch shieldState.(type) {
case matrix_sdk_ffi.ShieldStateNone:
// no-op

case matrix_sdk_ffi.ShieldStateGrey:
eventShield = &api.EventShield{
Colour: api.EventShieldColourGrey,
Code: codeToString(shield.(matrix_sdk_ffi.ShieldStateGrey).Code),
}
case matrix_sdk_ffi.ShieldStateGrey:
eventShield = &api.EventShield{
Colour: api.EventShieldColourGrey,
Code: codeToString(shieldState.(matrix_sdk_ffi.ShieldStateGrey).Code),
}

case matrix_sdk_ffi.ShieldStateRed:
eventShield = &api.EventShield{
Colour: api.EventShieldColourRed,
Code: codeToString(shield.(matrix_sdk_ffi.ShieldStateRed).Code),
}
case matrix_sdk_ffi.ShieldStateRed:
eventShield = &api.EventShield{
Colour: api.EventShieldColourRed,
Code: codeToString(shieldState.(matrix_sdk_ffi.ShieldStateRed).Code),
}

}
return eventShield, nil
}
Expand Down
Loading