Merge lp:~dobey/unity-scope-click/bad-appid into lp:unity-scope-click

[dobey]

Handle App-ID fields that aren't package_app_version as "unknown."

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:400
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/690/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/90/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/690/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

LGTM.

review: Approve

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2014-10-17 19:26:35 +0000
+++ libclickscope/click/interface.cpp	2016-01-04 20:59:25 +0000
@@ -180,8 +180,13 @@
                 DESKTOP_FILE_GROUP,
                 DESKTOP_FILE_KEY_APP_ID));
         QStringList id = app_id.split("_", QString::SkipEmptyParts);
-        app.name = id[0].toUtf8().data();
-        app.version = id[2].toUtf8().data();
+        if (id.length() == 3) {
+            app.name = id[0].toUtf8().data();
+            app.version = id[2].toUtf8().data();
+        } else {
+            app.name = "unknown";
+            app.version = "unknown";
+        }
     }
     if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_COMMENT)) {
         app.description = get_translated_string(keyFile,
 
=== added file 'libclickscope/tests/applications/user/badd-appid.desktop'
--- libclickscope/tests/applications/user/badd-appid.desktop	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/applications/user/badd-appid.desktop	2016-01-04 20:59:25 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Exec=processTest
+Icon=/home/phablet/animatedDemos/football-ball.png
+Path=/home/phablet/processTest
+Name=Football
+X-Ubuntu-Touch=true 
+X-Ubuntu-Application-ID=football
 
=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2014-10-17 19:26:35 +0000
+++ libclickscope/tests/test_interface.cpp	2016-01-04 20:59:25 +0000
@@ -185,7 +185,7 @@
 
     click::Interface iface(keyFileLocator);
 
-    auto results = iface.find_installed_apps("foo");
+    auto results = iface.find_installed_apps("xyzzygy");
 
     EXPECT_TRUE(results.empty());
 }