TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-15 07:06:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed nearby_sharing bugs introduced by upstream merge

Browse Source
This commit is contained in:
Lasan Mahaliyana
2026-02-06 23:30:05 +05:30
parent d238fb589f
commit 007edde124
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sharing/linux/nearby_sharing_app.cc
+14 -12
View File
@@ -258,8 +258,6 @@ class NearbySharingApp {
return;
}
auto attachment_container = std::make_unique<AttachmentContainer>();
// Use the constructor that accepts size
std::string file_name = path.GetFileName().ToString();
std::string mime_type = ""; // Will be auto-detected from extension
@@ -277,8 +275,11 @@ class NearbySharingApp {
// Set the file path after construction
file_attachment.set_file_path(path);
attachment_container->AddFileAttachment(std::move(file_attachment));
auto attachment_container = AttachmentContainer::Builder()
.AddFileAttachment(
std::move(file_attachment))
.Build();
service_->SendAttachments(
target_id,
@@ -298,14 +299,15 @@ class NearbySharingApp {
std::cout << "Target ID: " << target_id << std::endl;
std::cout << "Text: " << text << std::endl;
auto attachment_container = std::make_unique<AttachmentContainer>();
attachment_container->AddTextAttachment(TextAttachment(
nearby::sharing::service::proto::TextMetadata::TEXT,
text,
std::nullopt, // text_title
std::nullopt // mime_type
));
auto attachment_container = AttachmentContainer::Builder()
.AddTextAttachment(TextAttachment(
nearby::sharing::service::proto::
TextMetadata::TEXT,
text,
std::nullopt, // text_title
std::nullopt // mime_type
))
.Build();
service_->SendAttachments(
target_id,
sharing/linux/nearby_sharing_service_linux.cc
+7 -6
View File
@@ -356,10 +356,10 @@ void NearbySharingServiceLinux::SendAttachments(
}
TransferState transfer_state;
transfer_state.attachments = *attachment_container;
transfer_state.attachments = std::move(*attachment_container);
transfer_state.callback = callback;
transfer_state.is_incoming = false;
active_transfers_[*endpoint_id] = transfer_state;
active_transfers_[*endpoint_id] = std::move(transfer_state);
TransferMetadata metadata =
TransferMetadataBuilder().set_status(TransferMetadata::Status::kConnecting)
@@ -368,7 +368,8 @@ void NearbySharingServiceLinux::SendAttachments(
attachment_container->GetAttachmentCount())
.build();
if (auto share_target = GetShareTarget(*endpoint_id)) {
NotifyTransferUpdate(*share_target, transfer_state, metadata);
NotifyTransferUpdate(*share_target, active_transfers_[*endpoint_id],
metadata);
}
connections::ConnectionOptions options;
@@ -903,13 +904,13 @@ void NearbySharingServiceLinux::HandleIncomingConnectionInitiated(
transfer_state.attachments = AttachmentContainer();
transfer_state.callback = PickReceiveTransferCallback();
transfer_state.is_incoming = true;
active_transfers_[endpoint_id] = transfer_state;
active_transfers_[endpoint_id] = std::move(transfer_state);
TransferMetadata metadata = TransferMetadataBuilder()
.set_status(TransferMetadata::Status::kAwaitingLocalConfirmation)
.set_progress(0)
.build();
NotifyTransferUpdate(target, transfer_state, metadata);
NotifyTransferUpdate(target, active_transfers_[endpoint_id], metadata);
}
void NearbySharingServiceLinux::HandleOutgoingConnectionInitiated(
@@ -965,7 +966,7 @@ void NearbySharingServiceLinux::HandleConnectionAccepted(
const auto& file_attachment = attachments.GetFileAttachments()[0];
if (file_attachment.file_path().has_value()) {
std::string file_path = file_attachment.file_path()->ToString();
nearby::InputFile input_file(file_path, file_attachment.size());
nearby::InputFile input_file(file_path);
payload = std::make_unique<connections::Payload>(
std::string(file_attachment.parent_folder()),
std::string(file_attachment.file_name()), std::move(input_file));