Merge branch 'main' into fix/cipher-type-panic

This commit is contained in:
Daniel García 2026-04-29 22:47:58 +02:00 committed by GitHub
commit 8fb0843376
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -2056,7 +2056,7 @@ async fn archive_multiple_ciphers(
}
// Multi archive does not send out a push for each cipher, we need to send a general sync here
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, &headers.device.push_uuid, conn).await;
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, headers.device.push_uuid.as_ref(), conn).await;
Ok(Json(json!({
"data": ciphers,
@ -2082,7 +2082,7 @@ async fn unarchive_multiple_ciphers(
}
// Multi unarchive does not send out a push for each cipher, we need to send a general sync here
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, &headers.device.push_uuid, conn).await;
nt.send_user_update(UpdateType::SyncCiphers, &headers.user, headers.device.push_uuid.as_ref(), conn).await;
Ok(Json(json!({
"data": ciphers,