Skip to content

Commit da4e98f

Browse files
committed
Update after API breaking changes from related Rust PR
matrix-org/matrix-rust-sdk#5959 has changed the API for `LazyTimelineItemProvider::get_shields`. Update accordingly.
1 parent 53de8fd commit da4e98f

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

internal/api/rust/rust.go

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package rust
22

33
import (
44
"fmt"
5-
"github.com/matrix-org/complement-crypto/internal/api/rust/matrix_sdk_common"
5+
"github.com/matrix-org/complement-crypto/internal/api/rust/matrix_sdk_ui"
66
"log"
77
"os"
88
"path/filepath"
@@ -359,22 +359,22 @@ func (c *RustClient) GetEventShield(t ct.TestLike, roomID, eventID string) (*api
359359
}
360360
shieldState := timelineItem.LazyProvider.GetShields(false)
361361

362-
codeToString := func(code matrix_sdk_common.ShieldStateCode) api.EventShieldCode {
362+
codeToString := func(code matrix_sdk_ui.TimelineEventShieldStateCode) api.EventShieldCode {
363363
var result api.EventShieldCode
364364
switch code {
365-
case matrix_sdk_common.ShieldStateCodeAuthenticityNotGuaranteed:
365+
case matrix_sdk_ui.TimelineEventShieldStateCodeAuthenticityNotGuaranteed:
366366
result = api.EventShieldCodeAuthenticityNotGuaranteed
367-
case matrix_sdk_common.ShieldStateCodeUnknownDevice:
367+
case matrix_sdk_ui.TimelineEventShieldStateCodeUnknownDevice:
368368
result = api.EventShieldCodeUnknownDevice
369-
case matrix_sdk_common.ShieldStateCodeUnsignedDevice:
369+
case matrix_sdk_ui.TimelineEventShieldStateCodeUnsignedDevice:
370370
result = api.EventShieldCodeUnsignedDevice
371-
case matrix_sdk_common.ShieldStateCodeUnverifiedIdentity:
371+
case matrix_sdk_ui.TimelineEventShieldStateCodeUnverifiedIdentity:
372372
result = api.EventShieldCodeUnverifiedIdentity
373-
case matrix_sdk_common.ShieldStateCodeSentInClear:
373+
case matrix_sdk_ui.TimelineEventShieldStateCodeSentInClear:
374374
result = api.EventShieldCodeSentInClear
375-
case matrix_sdk_common.ShieldStateCodeVerificationViolation:
375+
case matrix_sdk_ui.TimelineEventShieldStateCodeVerificationViolation:
376376
result = api.EventShieldCodeVerificationViolation
377-
case matrix_sdk_common.ShieldStateCodeMismatchedSender:
377+
case matrix_sdk_ui.TimelineEventShieldStateCodeMismatchedSender:
378378
result = api.EventShieldCodeMismatchedSender
379379
default:
380380
log.Panicf("Unknown shield code %d", code)
@@ -384,24 +384,22 @@ func (c *RustClient) GetEventShield(t ct.TestLike, roomID, eventID string) (*api
384384

385385
var eventShield *api.EventShield
386386

387-
if shieldState != nil {
388-
shield := *shieldState
389-
switch shield.(type) {
390-
case matrix_sdk_ffi.ShieldStateNone:
391-
// no-op
387+
switch shieldState.(type) {
388+
case matrix_sdk_ffi.ShieldStateNone:
389+
// no-op
392390

393-
case matrix_sdk_ffi.ShieldStateGrey:
394-
eventShield = &api.EventShield{
395-
Colour: api.EventShieldColourGrey,
396-
Code: codeToString(shield.(matrix_sdk_ffi.ShieldStateGrey).Code),
397-
}
391+
case matrix_sdk_ffi.ShieldStateGrey:
392+
eventShield = &api.EventShield{
393+
Colour: api.EventShieldColourGrey,
394+
Code: codeToString(shieldState.(matrix_sdk_ffi.ShieldStateGrey).Code),
395+
}
398396

399-
case matrix_sdk_ffi.ShieldStateRed:
400-
eventShield = &api.EventShield{
401-
Colour: api.EventShieldColourRed,
402-
Code: codeToString(shield.(matrix_sdk_ffi.ShieldStateRed).Code),
403-
}
397+
case matrix_sdk_ffi.ShieldStateRed:
398+
eventShield = &api.EventShield{
399+
Colour: api.EventShieldColourRed,
400+
Code: codeToString(shieldState.(matrix_sdk_ffi.ShieldStateRed).Code),
404401
}
402+
405403
}
406404
return eventShield, nil
407405
}

0 commit comments

Comments
 (0)