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

[Ken VanDine]

Fixed crash when the service is passed an invalid type via dbus

Fixed crash when the service is passed an invalid type via dbus

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[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

If you changed UI labels, did you update the pot file?

 * No

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

 * No

[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/service/CMakeLists.txt'
--- src/com/ubuntu/content/service/CMakeLists.txt	2014-06-04 16:49:40 +0000
+++ src/com/ubuntu/content/service/CMakeLists.txt	2015-08-28 14:46:59 +0000
@@ -33,6 +33,7 @@
   main.cpp
   registry.cpp
   ../debug.cpp
+  ../utils.cpp
   ${CONTENT_SERVICE_SKELETON}
 )
 

=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2015-06-15 18:20:21 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2015-08-28 14:46:59 +0000
@@ -138,7 +138,7 @@
 
     QStringList peers;
     peers << m_sources->get("all").toStringList();
-    if (type != cuc::Type::unknown())
+    if (type != cuc::Type::unknown() && valid_type(type))
         peers << m_sources->get(type.id()).toStringList();
     Q_FOREACH (QString k, peers)
     {
@@ -171,7 +171,7 @@
 
     QStringList peers;
     peers << m_dests->get("all").toStringList();
-    if (type != cuc::Type::unknown())
+    if (type != cuc::Type::unknown() && valid_type(type))
         peers << m_dests->get(type.id()).toStringList();
     Q_FOREACH (QString k, peers)
     {
@@ -184,7 +184,7 @@
 {
     TRACE() << Q_FUNC_INFO << type.id();
 
-    if (type == cuc::Type::unknown())
+    if (type == cuc::Type::unknown() || !valid_type(type))
         return;
 
     Q_FOREACH (QString k, m_shares->get(type.id()).toStringList())

=== modified file 'src/com/ubuntu/content/utils.cpp'
--- src/com/ubuntu/content/utils.cpp	2015-06-02 12:45:47 +0000
+++ src/com/ubuntu/content/utils.cpp	2015-08-28 14:46:59 +0000
@@ -49,9 +49,25 @@
     types << cuc::Type::Known::music();
     types << cuc::Type::Known::documents();
     types << cuc::Type::Known::contacts();
+    types << cuc::Type::Known::videos();
+    types << cuc::Type::Known::links();
+    types << cuc::Type::Known::ebooks();
+    types << cuc::Type::Known::text();
+    types << cuc::Type::Known::events();
     return types;
 }
 
+bool valid_type(cuc::Type type)
+{
+    Q_FOREACH (cuc::Type t, known_types())
+    {
+        TRACE() << Q_FUNC_INFO << t.id();
+        if (t.id() == type.id())
+            return true;
+    }
+    return false;
+}
+
 /* sanitize the dbus names */
 QString sanitize_id(const QString& appId)
 {