Merge lp:~ken-vandine/content-hub/lp1429695 into lp:content-hub

[Ken VanDine]

When requesting an import from an unknown peer, abort the transfer. This is most likely to occur when requesting the default peer for a ContentType that has no default registered.

When requesting an import from an unknown peer, abort the transfer. This is most likely to occur when requesting the default peer for a ContentType that has no default registered.

To test this:
 * install the test click package[1]
 * launch it from the app scope
 * click the import ebook button and verify the state displayed below is "5"
 * click the import pictures button, select a picture from gallery and verify the state below is "4"

1. http://people.canonical.com/~kenvandine/lp1429695.ken-vandine_0.1_all.click

[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 UI labels, did you update the pot file?

 * No change

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

 * No change

[lp:~ken-vandine/content-hub/lp1429695]

192. By Ken VanDine on 2015-03-30

merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/content-hub-ci/244/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/40

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Approved, but with a note on one of the comments that might be a typo?

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 'import/Ubuntu/Content/contentpeer.cpp'
--- import/Ubuntu/Content/contentpeer.cpp	2014-08-04 17:57:26 +0000
+++ import/Ubuntu/Content/contentpeer.cpp	2015-03-30 16:20:53 +0000
@@ -221,7 +221,6 @@
 ContentTransfer *ContentPeer::request(ContentStore *store)
 {
     TRACE() << Q_FUNC_INFO;
-
     ContentHub *contentHub = ContentHub::instance();
     ContentTransfer *qmlTransfer = NULL;
     if(m_handler == ContentHandler::Source) {
@@ -239,8 +238,15 @@
     }
     
     /* We only need to start it for import requests */
-    if (m_handler == ContentHandler::Source)
-        qmlTransfer->start();
+    if (m_handler == ContentHandler::Source) {
+        // If there peer isn't known, don't request content
+        if (m_peer == cuc::Peer::unknown()) {
+            qWarning() << "Unknown source for type:" << m_contentType;
+            qmlTransfer->transfer()->abort();
+        } else {
+            qmlTransfer->start();
+        }
+    }
 
     return qmlTransfer;
 }