Attachment 83893 Details for Bug 67909 – ignore Status=active instead of terminating when seeing it

[patch] ignore Status=active instead of terminating when seeing it

0001-PBAP-do-not-end-Bluez5-transfer-prematurely.patch (text/plain), 1.86 KB, created by Patrick Ohly on 2013-08-09 14:36:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick Ohly

Created: 2013-08-09 14:36:12 UTC

Size: 1.86 KB

patch

obsolete

>From 97a2637c1c3e77cd81d67185e00deed3411ebca2 Mon Sep 17 00:00:00 2001
>From: Patrick Ohly <patrick.ohly@intel.com>
>Date: Fri, 9 Aug 2013 15:46:25 +0200
>Subject: [PATCH] PBAP: do not end Bluez5 transfer prematurely
>
>A transfer was marked as finished prematurely when encountering the
>"active" Status value, which can happen for longer transfers.
>---
> src/backends/pbap/PbapSyncSource.cpp |   17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
>diff --git a/src/backends/pbap/PbapSyncSource.cpp b/src/backends/pbap/PbapSyncSource.cpp
>index 7710362..91e807d 100644
>--- a/src/backends/pbap/PbapSyncSource.cpp
>+++ b/src/backends/pbap/PbapSyncSource.cpp
>@@ -200,15 +200,16 @@ void PbapSession::propChangedCb(const GDBusCXX::Path_t &path,
>         std::string status = boost::get<std::string>(it->second);
>         SE_LOG_DEBUG(NULL, "OBEXD transfer %s: %s",
>                      path.c_str(), status.c_str());
>-        Completion completion = Completion::now();
>-        SE_LOG_DEBUG(NULL, "obexd transfer %s: %s", path.c_str(), status.c_str());
>-        if (status == "error") {
>-            // We have to make up some error descriptions. The Bluez
>-            // 5 API no longer seems to provide that.
>-            completion.m_transferErrorCode = "transfer failed";
>-            completion.m_transferErrorMsg = "reason unknown";
>+        if (status == "complete" || status == "error") {
>+            Completion completion = Completion::now();
>+            if (status == "error") {
>+                // We have to make up some error descriptions. The Bluez
>+                // 5 API no longer seems to provide that.
>+                completion.m_transferErrorCode = "transfer failed";
>+                completion.m_transferErrorMsg = "reason unknown";
>+            }
>+            m_transfers[path] = completion;
>         }
>-        m_transfers[path] = completion;
>     }
> }
> 
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 67909: 83852 | 83853 | 83854 | 83893

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.