Browse Source

Fix merge conflict

pull/7164/head
Daniel García 3 weeks ago
parent
commit
0a4d5d4f3d
No known key found for this signature in database GPG Key ID: FC8A7D14C3CD543A
  1. 4
      src/api/core/ciphers.rs

4
src/api/core/ciphers.rs

@ -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,

Loading…
Cancel
Save