Merge lp:~ken-vandine/content-hub/charge-downloaded into lp:content-hub

[Ken VanDine]

Check for completed downloads when an import handler is registered, charge if necessary. This will trigger an import for completed downloads that might have been dismissed in the notification.

Check for completed downloads when an import handler is registered, charge if necessary. This will trigger an import for completed downloads that might have been dismissed in the notification.

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:102
http://jenkins.qa.ubuntu.com/job/content-hub-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/9

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/152/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'src/com/ubuntu/content/detail/service.cpp'
--- src/com/ubuntu/content/detail/service.cpp	2014-05-05 19:50:10 +0000
+++ src/com/ubuntu/content/detail/service.cpp	2014-05-22 09:32:09 +0000
@@ -552,5 +552,15 @@
                     r->handler->HandleShare(QDBusObjectPath{t->import_path()});
             }
         }
+        else if ((t->destination() == peer_id) && (t->State() == cuc::Transfer::downloaded))
+        {
+            TRACE() << Q_FUNC_INFO << "Found destination:" << peer_id << "Direction:" << t->Direction();
+            if (t->Direction() == cuc::Transfer::Export)
+            {
+                TRACE() << Q_FUNC_INFO << "Found downloaded import, charging";
+                if (r->handler->isValid())
+                    t->Charge(QStringList());
+            }
+        }
     }
 }