Merge lp:~dobey/unity-scope-click/clicksnap into lp:unity-scope-click

[dobey]

Support for snaps.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:496
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/86/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/470
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/476
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/381
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/381
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/381
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/311/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/311
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/311/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/86/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/clicksnap]

497. By dobey on 2016-08-24

Merge up with ual-apps again.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:497
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/88/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/474
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/480
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/385
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/385
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/385
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/315/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/315
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/315/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scope-click-ci/88/rebuild

review: Approve (continuous-integration)

[lp:~dobey/unity-scope-click/clicksnap]

498. By dobey on 2016-08-25

Update dependencies to allow either snaps or clicks to be supported.

499. By dobey on 2016-09-03

Merge up chagnes from ual-apps.

500. By dobey on 2016-09-12

Collapse snapd.socket check to simplify function.

501. By dobey on 2016-09-12

Remove the extra check for downloads.size > 1, as it shouldn't happen.

502. By dobey on 2016-09-12

Some cleanup in download-manager.cpp per code review.

503. By dobey on 2016-09-12

Fixes to index.cpp per code review.

504. By dobey on 2016-09-12

Break up mock responseForReply per code review.

505. By dobey on 2016-09-12

Refactor index tests perh code review.

506. By dobey on 2016-09-12

Use const auto in for loops.

507. By dobey on 2016-09-12

Want const references for the for loops here.

508. By dobey on 2016-09-16

New script to download snap assertions and perform install

509. By dobey on 2016-09-16

Fix the snap script to do the right thing.
Add necessary dependencies for the script.

510. By dobey on 2016-09-20

Check that filename argument is non-empty before continuing.

511. By dobey on 2016-09-20

Check if name is alias instead of using snap_id to determine if snap.

512. By dobey on 2016-09-20

If frameworks list is empty send "none" instead of empty header.

513. By dobey on 2016-09-21

Use a bash function instead of variable for wget, to avoid weird escaping.

Unmerged revisions

513. By dobey on 2016-09-21

Use a bash function instead of variable for wget, to avoid weird escaping.

512. By dobey on 2016-09-20

If frameworks list is empty send "none" instead of empty header.

511. By dobey on 2016-09-20

Check if name is alias instead of using snap_id to determine if snap.

510. By dobey on 2016-09-20

Check that filename argument is non-empty before continuing.

509. By dobey on 2016-09-16

Fix the snap script to do the right thing.
Add necessary dependencies for the script.

508. By dobey on 2016-09-16

New script to download snap assertions and perform install

507. By dobey on 2016-09-12

Want const references for the for loops here.

506. By dobey on 2016-09-12

Use const auto in for loops.

505. By dobey on 2016-09-12

Refactor index tests perh code review.

504. By dobey on 2016-09-12

Break up mock responseForReply per code review.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-14 18:37:27 +0000
+++ CMakeLists.txt	2016-08-24 21:39:08 +0000
@@ -8,7 +8,7 @@
 
 # Some default CFLAGS
 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g -Wall -Wextra -Werror -fPIC")
-SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -g -Wextra -Wall -Werror -Werror=conversion-null -fPIC")
+SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -g -Wextra -Wall -Werror -Werror=conversion-null -Wno-ignored-qualifiers -fPIC")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -24,6 +24,12 @@
 include(UseGSettings)
 find_package (PkgConfig REQUIRED)
 
+pkg_check_modules(UAL REQUIRED ubuntu-app-launch-2>=0.9)
+add_definitions(${UAL_CFLAGS} ${UAL_CFLAGS_OTHER})
+
+pkg_check_modules(CLICK REQUIRED click-0.4)
+add_definitions(${CLICK_CFLAGS} ${CLICK_CFLAGS_OTHER})
+
 pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.6.7 libunity-api>=0.1.3)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 

=== modified file 'bin/install-helper'
--- bin/install-helper	2014-06-20 05:09:01 +0000
+++ bin/install-helper	2016-08-24 21:39:08 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014-2016 Canonical Ltd.
 # 
 # This program is free software: you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 3, as published
@@ -47,7 +47,12 @@
 
 function install-package {
     FILE_NAME="$1"
-    pkcon -p install-local "$FILE_NAME"
+    FILE_TYPE="${FILE_NAME##*.}"
+    if [ ${FILE_TYPE} = "click" ]; then
+        pkcon -p install-local "${FILE_NAME}"
+    else
+        pkexec snap install "${FILE_NAME}"
+    fi
 }
 
 function app_id-from-package_name {

=== modified file 'debian/control'
--- debian/control	2016-05-25 16:17:00 +0000
+++ debian/control	2016-08-24 21:39:08 +0000
@@ -1,8 +1,7 @@
 Source: unity-scope-click
 Section: x11
 Priority: optional
-Build-Depends: click,
-               cmake (>= 2.8.10),
+Build-Depends: cmake (>= 2.8.10),
                cmake-extras,
                dbus-x11,
                debhelper (>= 9),
@@ -12,9 +11,11 @@
                intltool,
                lcov,
                libboost-locale-dev,
+               libclick-0.4-dev,
                libglib2.0-dev (>= 2.32),
                libjsoncpp-dev,
                libpay2-dev (>= 2.0.0+15.04.20150701),
+               libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-download-manager-client-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntu-download-manager-common-dev (>= 0.3+14.10.20140430-0ubuntu1),
                libubuntuoneauth-2.0-dev (>= 15.10),

=== modified file 'libclickscope/click/CMakeLists.txt'
--- libclickscope/click/CMakeLists.txt	2015-04-14 21:19:21 +0000
+++ libclickscope/click/CMakeLists.txt	2016-08-24 21:39:08 +0000
@@ -22,7 +22,6 @@
   highlights.cpp
   index.cpp
   interface.cpp
-  key_file_locator.cpp
   launcher.cpp
   network_access_manager.cpp
   package.cpp
@@ -43,6 +42,8 @@
   ${JSON_CPP_INCLUDE_DIRS}
   ${LIBPAY_INCLUDE_DIRS}
   ${GSETTINGS_QT_INCLUDE_DIRS}
+  ${UAL_INCLUDE_DIRS}
+  ${CLICK_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libclickscope
 )
 
@@ -54,5 +55,7 @@
   ${UBUNTU_DOWNLOAD_MANAGER_CLIENT_LDFLAGS}
   ${UBUNTU_DOWNLOAD_MANAGER_COMMON_LDFLAGS}
   ${GSETTINGS_QT_LIBRARIES}
+  ${UAL_LDFLAGS}
+  ${CLICK_LDFLAGS}
   -lboost_locale
 )

=== modified file 'libclickscope/click/configuration.cpp'
--- libclickscope/click/configuration.cpp	2016-02-19 03:35:43 +0000
+++ libclickscope/click/configuration.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -27,6 +27,8 @@
  * files in the program, then also delete it here.
  */
 
+#include "configuration.h"
+
 #include <string>
 #include <vector>
 
@@ -43,8 +45,9 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
-
-#include "configuration.h"
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 namespace click {
 
@@ -121,6 +124,17 @@
     return arch;
 }
 
+bool Configuration::is_snapd_running() const
+{
+    struct stat sb;
+    int retval = stat("/run/snapd.socket", &sb);
+    if (retval == 0 && (sb.st_mode & S_IFMT) == S_IFSOCK) {
+        return true;
+    }
+
+    return false;
+}
+
 bool Configuration::get_purchases_enabled()
 {
     const char* env_value = std::getenv(PURCHASES_ENVVAR);

=== modified file 'libclickscope/click/configuration.h'
--- libclickscope/click/configuration.h	2016-02-19 03:35:43 +0000
+++ libclickscope/click/configuration.h	2016-08-24 21:39:08 +0000
@@ -54,6 +54,7 @@
 
     virtual std::vector<std::string> get_available_frameworks();
     virtual std::string get_architecture();
+    virtual bool is_snapd_running() const;
     static bool get_purchases_enabled();
     static std::string get_currency(const std::string& fallback = CURRENCY_DEFAULT);
 
@@ -78,11 +79,11 @@
     virtual const std::vector<std::string> get_dconf_strings(const std::string& schema, const std::string& key) const;
     static const std::vector<std::string>& get_default_core_apps() {
         static std::vector<std::string> default_apps {
-            "dialer-app",
-            "messaging-app",
-            "address-book-app",
+            "dialer-app.desktop",
+            "messaging-app.desktop",
+            "address-book-app.desktop",
             "com.ubuntu.camera_camera",
-            "webbrowser-app",
+            "webbrowser-app.desktop",
             "com.ubuntu.clock_clock"
         };
         return default_apps;

=== modified file 'libclickscope/click/download-manager.cpp'
--- libclickscope/click/download-manager.cpp	2016-05-10 13:42:12 +0000
+++ libclickscope/click/download-manager.cpp	2016-08-24 21:39:08 +0000
@@ -57,12 +57,6 @@
 
 static const QString DOWNLOAD_MANAGER_SHA512 = "sha512";
 
-const QByteArray& CLICK_TOKEN_HEADER()
-{
-    static const QByteArray result("X-Click-Token");
-    return result;
-}
-
 DownloadManager::DownloadManager(const QSharedPointer<click::web::Client>& client,
                                  const QSharedPointer<udm::Manager>& manager) :
     client(client),
@@ -86,11 +80,11 @@
         if (downloads.size() > 0) {
             auto download = downloads.at(0);
             object_path = download->id().toStdString();
-        }
-        qDebug() << "Found object path" << QString::fromStdString(object_path)
-                 << "for package" << QString::fromStdString(package_name);
-        if (downloads.size() > 1) {
-            qWarning() << "More than one download with the same object path";
+            qDebug() << "Found object path" << QString::fromStdString(object_path)
+                     << "for package" << QString::fromStdString(package_name);
+            if (downloads.size() > 1) {
+                qWarning() << "More than one download with the same object path";
+            }
         }
         callback(object_path);
     }, [callback, package_name](const QString& /*key*/, const QString& /*value*/, DownloadsList* /*downloads_list*/){
@@ -100,78 +94,44 @@
     });
 }
 
-click::web::Cancellable DownloadManager::start(const std::string& url,
-                                               const std::string& download_sha512,
-                                               const std::string& package_name,
-                                               const std::function<void (std::string, Error)>& callback)
-{
-    QSharedPointer<click::web::Response> response = client->call
-        (url, "HEAD", true);
-
-    QObject::connect(response.data(), &click::web::Response::finished,
-                     [this, callback, url, download_sha512, package_name,
-                      response](QString) {
-                    auto status = response->get_status_code();
-                    if (status == 200) {
-                        auto clickToken = response->get_header(CLICK_TOKEN_HEADER().data());
-                        qDebug() << "Received click token:" << clickToken.c_str();
-                        QVariantMap metadata;
-
-                        QVariant commandline = QVariant(QStringList() << DOWNLOAD_COMMAND << "$file" << package_name.c_str());
-                        metadata[DOWNLOAD_COMMAND_KEY] = commandline;
-                        metadata[DOWNLOAD_APP_ID_KEY] = package_name.c_str();
-                        metadata["package_name"] = package_name.c_str();
-
-                        QMap<QString, QString> headers;
-                        headers[CLICK_TOKEN_HEADER()] = clickToken.c_str();
-
-                        udm::DownloadStruct downloadStruct(url.c_str(),
-                                                           download_sha512.c_str(),
-                                                           DOWNLOAD_MANAGER_SHA512,
-                                                           metadata,
-                                                           headers);
-
-                        dm->createDownload(downloadStruct,
-                                           [callback](Download* download) {
-                                               if (download->isError()) {
-                                                   auto error = download->error()->errorString().toUtf8().data();
-                                                   qDebug() << "Received error from ubuntu-download-manager:" << error;
-                                                   callback(error, Error::DownloadInstallError);
-                                               } else {
-                                                   download->start();
-                                                   callback(download->id().toUtf8().data(), Error::NoError);
-                                               }
-                                           },
-                                           [callback](Download* download) {
-                                               callback(download->error()->errorString().toUtf8().data(),
-                                                        Error::DownloadInstallError);
-                                           });
-                    } else {
-                        std::string error{"Unhandled HTTP response code: "};
-                        error += status;
-                        callback(error, Error::DownloadInstallError);
-                    }
-                });
-    QObject::connect(response.data(), &click::web::Response::error,
-                     [this, callback, package_name](QString error, int error_code) {
-                         qWarning() << QStringLiteral("Network error (%1) fetching click token for:").arg(error_code) << package_name.c_str();
-                         switch(error_code) {
-                         case 401:
-                         case 403:
-                             client->invalidateCredentials();
-                             callback(error.toUtf8().data(), Error::CredentialsError);
-                             break;
-                         default:
-                             callback(error.toUtf8().data(), Error::DownloadInstallError);
-                         }
-                     });
-
-    return click::web::Cancellable(response);
-}
-
-void DownloadManager::setCredentialsService(const QSharedPointer<click::CredentialsService>& credentialsService)
-{
-    sso = credentialsService;
+void DownloadManager::start(const std::string& url,
+                            const std::string& download_sha512,
+                            const std::string& package_name,
+                            const std::function<void (std::string, Error)>& callback)
+{
+    auto signature = client->signUrl(url, "GET");
+
+    QVariantMap metadata;
+
+    QVariant commandline = QVariant(QStringList() << DOWNLOAD_COMMAND << "$file" << package_name.c_str());
+    metadata[DOWNLOAD_COMMAND_KEY] = commandline;
+    metadata[DOWNLOAD_APP_ID_KEY] = package_name.c_str();
+    metadata["package_name"] = package_name.c_str();
+
+    QMap<QString, QString> headers;
+    headers[click::web::AUTHORIZATION_HEADER.c_str()] = signature.c_str();
+
+    udm::DownloadStruct downloadStruct(url.c_str(),
+                                       download_sha512.c_str(),
+                                       DOWNLOAD_MANAGER_SHA512,
+                                       metadata,
+                                       headers);
+
+    dm->createDownload(downloadStruct,
+                       [callback](Download* download) {
+                           if (download->isError()) {
+                               auto error = download->error()->errorString().toUtf8().data();
+                               qDebug() << "Received error from ubuntu-download-manager:" << error;
+                               callback(error, Error::DownloadInstallError);
+                           } else {
+                               download->start();
+                               callback(download->id().toUtf8().data(), Error::NoError);
+                           }
+                       },
+                       [callback](Download* download) {
+                           callback(download->error()->errorString().toUtf8().data(),
+                                    Error::DownloadInstallError);
+                       });
 }
 
 } // namespace click

=== modified file 'libclickscope/click/download-manager.h'
--- libclickscope/click/download-manager.h	2016-02-26 18:51:22 +0000
+++ libclickscope/click/download-manager.h	2016-08-24 21:39:08 +0000
@@ -68,18 +68,14 @@
 
     virtual void get_progress(const std::string& package_name,
                               const std::function<void (std::string)>& callback);
-    virtual click::web::Cancellable start(const std::string& url,
-                                          const std::string& download_sha512,
-                                          const std::string& package_name,
-                                          const std::function<void (std::string,
-                                                                    Error)>& callback);
-
-    virtual void setCredentialsService(const QSharedPointer<click::CredentialsService>& credentialsService);
+    virtual void start(const std::string& url,
+                       const std::string& download_sha512,
+                       const std::string& package_name,
+                       const std::function<void (std::string, Error)>& callback);
 
 protected:
     QSharedPointer<click::web::Client> client;
     QSharedPointer<Ubuntu::DownloadManager::Manager> dm;
-    QSharedPointer<click::CredentialsService> sso;
 };
 
 }

=== modified file 'libclickscope/click/index.cpp'
--- libclickscope/click/index.cpp	2016-04-26 10:56:47 +0000
+++ libclickscope/click/index.cpp	2016-08-24 21:39:08 +0000
@@ -123,6 +123,15 @@
     };
 }
 
+std::map<std::string, std::string> Index::add_snap_headers(const std::map<std::string, std::string>& headers) const
+{
+    std::map<std::string, std::string> new_headers{headers};
+    new_headers["X-Ubuntu-Series"] = "16"; // Need to get from snapd
+    new_headers["X-Ubuntu-Slots"] = "unity8"; // Only want unity8-using snaps
+
+    return new_headers;
+}
+
 std::pair<Packages, Packages> Index::package_lists_from_json(const std::string& json)
 {
     Json::Reader reader;
@@ -147,6 +156,36 @@
     return std::pair<Packages, Packages>(pl, recommends);
 }
 
+click::web::Cancellable Index::search_snaps(const std::string& query,
+                                            std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
+                                            bool force_cache)
+{
+    click::web::CallParams params;
+    auto built_query = build_index_query(query, "" /* No dept for snaps */);
+    params.add(click::QUERY_ARGNAME, built_query.c_str());
+
+    auto headers = add_snap_headers(build_headers());
+    
+    QSharedPointer<click::web::Response> response
+        (client->call(get_base_url() + click::SNAP_SEARCH_PATH,
+                      "GET", true, headers, "", params, force_cache));
+
+    QObject::connect(response.data(), &click::web::Response::finished, [=](QString reply) {
+            std::pair<Packages, Packages> package_lists;
+            package_lists = package_lists_from_json(reply.toUtf8().constData());
+            callback(package_lists.first, package_lists.second);
+    });
+    QObject::connect(response.data(), &click::web::Response::error, [=](QString /*description*/) {
+        qDebug() << "No packages found due to network error";
+        click::Packages pl;
+        click::Packages recommends;
+        qDebug() << "calling callback";
+        callback(pl, recommends);
+        qDebug() << "                ...Done!";
+    });
+    return click::web::Cancellable(response);
+}
+
 click::web::Cancellable Index::search (const std::string& query, const std::string& department,
                                        std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
                                        bool force_cache)
@@ -215,10 +254,21 @@
     return click::web::Cancellable(response);
 }
 
-click::web::Cancellable Index::get_details (const std::string& package_name, std::function<void(PackageDetails, click::Index::Error)> callback, bool force_cache)
+click::web::Cancellable Index::get_details (const std::string& package_name,
+                                            std::function<void(PackageDetails,
+ click::Index::Error)> callback,
+                                            bool is_snap,
+                                            bool force_cache)
 {
+    std::string details_path{click::DETAILS_PATH};
+    auto headers = build_headers();
+    if (is_snap) {
+        details_path = click::SNAP_DETAILS_PATH;
+        headers = add_snap_headers(headers);
+    }
     QSharedPointer<click::web::Response> response = client->call
-        (get_base_url() + click::DETAILS_PATH + package_name,
+        (get_base_url() + details_path + package_name,
+         "GET", true, headers, "",
          click::web::CallParams(),
          force_cache);
     qDebug() << "getting details for" << package_name.c_str();

=== modified file 'libclickscope/click/index.h'
--- libclickscope/click/index.h	2016-04-26 10:56:47 +0000
+++ libclickscope/click/index.h	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -49,11 +49,13 @@
 const std::string SEARCH_BASE_URL_ENVVAR = "U1_SEARCH_BASE_URL";
 const std::string SEARCH_BASE_URL = "https://search.apps.ubuntu.com/";
 const std::string SEARCH_PATH = "api/v1/search";
+const std::string SNAP_SEARCH_PATH = "api/v1/snaps/search";
 const std::string BOOTSTRAP_PATH = "api/v1";
 const std::string SUPPORTED_FRAMEWORKS = "framework:ubuntu-sdk-13.10";
 const std::string QUERY_ARGNAME = "q";
 const std::string ARCHITECTURE = "architecture:";
 const std::string DETAILS_PATH = "api/v1/package/";
+const std::string SNAP_DETAILS_PATH = "api/v1/snaps/details/";
 const std::string CURRENCY_HEADER = "X-Suggested-Currency";
 
 class PackageManager
@@ -72,6 +74,7 @@
     std::string m_suggested_currency;
     virtual std::string build_index_query(const std::string& query, const std::string& department);
     virtual std::map<std::string, std::string> build_headers();
+    virtual std::map<std::string, std::string> add_snap_headers(const std::map<std::string, std::string>& headers) const;
 
 public:
     enum class Error {NoError, CredentialsError, NetworkError};
@@ -79,9 +82,15 @@
     Index(const QSharedPointer<click::web::Client>& client,
           const QSharedPointer<Configuration> configuration=QSharedPointer<Configuration>(new Configuration()));
     virtual std::pair<Packages, Packages> package_lists_from_json(const std::string& json);
+    virtual click::web::Cancellable search_snaps(const std::string& query,
+                                                 std::function<void(click::Packages search_results, click::Packages recommendations)> callback,
+                                                 bool force_cache = false);
     virtual click::web::Cancellable search (const std::string& query, const std::string& department, std::function<void(Packages, Packages)> callback, bool
             force_cache = false);
-    virtual click::web::Cancellable get_details(const std::string& package_name, std::function<void(PackageDetails, Error)> callback, bool force_cache = false);
+    virtual click::web::Cancellable get_details(const std::string& package_name,
+                                                std::function<void(PackageDetails, Error)> callback,
+                                                bool is_snap = false,
+                                                bool force_cache = false);
     virtual click::web::Cancellable bootstrap(std::function<void(const DepartmentList&, const HighlightList&, Error, int)> callback, bool force_cache = false);
     virtual click::web::Cancellable departments(const std::string& department_href, std::function<void(const DepartmentList&, const HighlightList&, Error, int)>
             callback, bool force_cache = false);

=== modified file 'libclickscope/click/interface.cpp'
--- libclickscope/click/interface.cpp	2016-07-14 18:37:27 +0000
+++ libclickscope/click/interface.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -27,6 +27,10 @@
  * files in the program, then also delete it here.
  */
 
+#include <click.h>
+
+#include "interface.h"
+
 #include <QDebug>
 #include <QDir>
 #include <QProcess>
@@ -51,12 +55,15 @@
 #include <unity/UnityExceptions.h>
 #include <unity/util/IniParser.h>
 
-#include "interface.h"
-#include <click/key_file_locator.h>
 #include <click/departments-db.h>
 
+#include <ubuntu-app-launch/registry.h>
+
 #include <click/click-i18n.h>
 
+using namespace ubuntu::app_launch;
+namespace ual = ubuntu::app_launch;
+
 namespace {
 
 /* Thanks to
@@ -122,114 +129,6 @@
 static const std::string DESKTOP_FILE_ONLYSHOWIN("OnlyShowIn");
 static const std::string ONLYSHOWIN_UNITY("Unity");
 
-Interface::Interface(const QSharedPointer<click::KeyFileLocator>& keyFileLocator)
-    : keyFileLocator(keyFileLocator)
-{
-}
-
-Interface::~Interface()
-{
-}
-
-bool Interface::show_desktop_apps()
-{
-    return getenv(ENV_SHOW_DESKTOP_APPS) != nullptr;
-}
-
-bool Interface::is_visible_app(const unity::util::IniParser &keyFile)
-{
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_NODISPLAY)) {
-        auto val = keyFile.get_string(DESKTOP_FILE_GROUP, DESKTOP_FILE_NODISPLAY);
-        if (val == std::string("true")) {
-            return false;
-        }
-    }
-
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_ONLYSHOWIN)) {
-        auto value = keyFile.get_string(DESKTOP_FILE_GROUP, DESKTOP_FILE_ONLYSHOWIN);
-        std::stringstream ss(value);
-        std::string item;
-
-        while (std::getline(ss, item, ';')) {
-            if (item == ONLYSHOWIN_UNITY) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    return true;
-}
-
-std::string Interface::get_translated_string(const unity::util::IniParser& keyFile,
-                                             const std::string& group,
-                                             const std::string& key,
-                                             const std::string& domain)
-{
-    std::string language = Configuration().get_language();
-    if (!domain.empty()) {
-        return dgettext(domain.c_str(),
-                        keyFile.get_string(group, key).c_str());
-    } else {
-        return keyFile.get_locale_string(group, key, language);
-    }
-}
-
-click::Application Interface::load_app_from_desktop(const unity::util::IniParser& keyFile,
-                                                    const std::string& filename)
-{
-    Application app;
-    std::string domain;
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_DOMAIN)) {
-        domain = keyFile.get_string(DESKTOP_FILE_GROUP,
-                                    DESKTOP_FILE_KEY_DOMAIN);
-    }
-    app.title = get_translated_string(keyFile,
-                                      DESKTOP_FILE_GROUP,
-                                      DESKTOP_FILE_KEY_NAME,
-                                      domain);
-
-    app.url = "application:///" + filename;
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_ICON)) {
-        app.icon_url = add_theme_scheme(keyFile.get_string(DESKTOP_FILE_GROUP,
-                                                           DESKTOP_FILE_KEY_ICON));
-    }
-
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_KEYWORDS)) {
-        app.keywords = keyFile.get_string_array(DESKTOP_FILE_GROUP,
-                                                DESKTOP_FILE_KEY_KEYWORDS);
-    }
-
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_DEFAULT_DEPARTMENT)) {
-        app.default_department = keyFile.get_string(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_DEFAULT_DEPARTMENT);
-    }
-
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)) {
-        QString app_id = QString::fromStdString(keyFile.get_string(
-                DESKTOP_FILE_GROUP,
-                DESKTOP_FILE_KEY_APP_ID));
-        QStringList id = app_id.split("_", QString::SkipEmptyParts);
-        if (id.length() == 3) {
-            app.name = id[0].toUtf8().data();
-            app.version = id[2].toUtf8().data();
-            app.url = "appid://" + id[0].toStdString() + "/" + id[1].toStdString() + "/current-user-version";
-        } else {
-            app.name = "unknown";
-            app.version = "unknown";
-        }
-    }
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_COMMENT)) {
-        app.description = get_translated_string(keyFile,
-                                                DESKTOP_FILE_GROUP,
-                                                DESKTOP_FILE_COMMENT,
-                                                domain);
-    }
-    if (keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_SCREENSHOT)) {
-        app.main_screenshot = keyFile.get_string(DESKTOP_FILE_GROUP,
-                                                 DESKTOP_FILE_SCREENSHOT);
-    }
-    return app;
-}
 
 std::vector<click::Application> Interface::sort_apps(const std::vector<click::Application>& apps)
 {
@@ -264,11 +163,16 @@
     return result;
 }
 
-/* find_installed_apps()
+std::list<std::shared_ptr<ual::Application>> Interface::installed_apps()
+{
+    return ual::Registry::installedApps();
+}
+
+/* search()
  *
- * Find all of the installed apps matching @search_query in a timeout.
+ * Find all of the installed apps matching @query in a timeout.
  */
-std::vector<click::Application> Interface::find_installed_apps(const std::string& search_query,
+std::vector<click::Application> Interface::search(const std::string& query,
         const std::vector<std::string>& ignored_apps,
         const std::string& current_department,
         const std::shared_ptr<click::DepartmentsDb>& depts_db)
@@ -292,118 +196,109 @@
         }
     }
 
-    std::vector<Application> result;
-
-    bool include_desktop_results = show_desktop_apps();
-    auto enumerator = [&result, this, search_query, ignored_apps, current_department, packages_in_department, apply_department_filter, include_desktop_results, depts_db]
-            (const unity::util::IniParser& keyFile, const std::string& filename)
-    {
-        if (keyFile.has_group(DESKTOP_FILE_GROUP) == false) {
-            qWarning() << "Broken desktop file:" << QString::fromStdString(filename);
-            return;
-        }
-        if (is_visible_app(keyFile) == false) {
-            return; // from the enumerator lambda
-        }
-
-        if (include_desktop_results || keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_UBUNTU_TOUCH)
-            || keyFile.has_key(DESKTOP_FILE_GROUP, DESKTOP_FILE_KEY_APP_ID)
-            || Interface::is_non_click_app(QString::fromStdString(filename))) {
-            auto app = load_app_from_desktop(keyFile, filename);
-            auto app_id = app.name.empty() ? filename : app.name;
-            if (!ignored_apps.empty() &&
-                std::find(ignored_apps.begin(), ignored_apps.end(),
-                          app_id) != ignored_apps.end())
-            {
-                // The app is ignored. Get out of here.
-                return;
-            }
-
-            // app from click package has non-empty name; for non-click apps use desktop filename
-            const std::string department_key = app.name.empty() ? filename : app.name;
-
-            // check if apps is present in current department
-            if (apply_department_filter)
-            {
-                if (packages_in_department.find(department_key) == packages_in_department.end())
-                {
-                    if (app.default_department.empty())
-                    {
-                        // default department not present in the keyfile, skip this app
-                        return;
-                    }
-                    else
-                    {
-                        // default department not empty: check if this app is in a different
-                        // department in the db (i.e. got moved from the default department);
-                        if (depts_db->has_package(department_key))
-                        {
-                            // app is now in a different department
-                            return;
-                        }
-
-                        if (app.default_department != current_department)
-                        {
-                            return;
-                        }
-                        // else - this package is in current department
-                    }
-                }
-            }
-
-            //
-            // the packages_in_department set contains packages from
-            // all its subdepartments; we need to find actual department now
-            // to update app.real_department.
-            if (depts_db)
-            {
-                if (depts_db->has_package(department_key))
-                {
-                    try
-                    {
-                        app.real_department = depts_db->get_department_for_package(department_key);
-                    }
-                    catch (const std::exception &e)
-                    {
-                        qWarning() << "Failed to get department of package:" << QString::fromStdString(department_key);
-                    }
-                }
-                else
-                {
-                    app.real_department = app.default_department;
-                    if (app.real_department.empty())
-                    {
-                        qWarning() << "No default department set in the .desktop file and no entry in the database for" << QString::fromStdString(department_key);
-                    }
-                }
-            }
-
-            if (search_query.empty()) {
+    std::vector<click::Application> result;
+
+    for (auto ualapp: installed_apps()) {
+        click::Application app;
+
+        // Get the package name and APP_ID info.
+        app.name = ualapp->appId().package.value();
+        if (app.name.empty()) {
+            app.name = std::string{ualapp->appId().appname.value()} + ".desktop";
+            app.url = "application:///" + app.name;
+            if (!is_non_click_app(app.name)) {
+                qDebug() << "Skipping legacy app:" << QString::fromStdString(app.name);
+                continue;
+            }
+        } else {
+            app.url = "appid://" + app.name + "/" + ualapp->appId().appname.value() + "/current-user-version";
+        }
+
+        if (!ignored_apps.empty() &&
+            std::find(ignored_apps.begin(), ignored_apps.end(),
+                      app.name) != ignored_apps.end()) {
+            // The app is ignored. Get out of here.
+            qDebug() << "App is ignored, skipping:" << QString::fromStdString(app.name);
+            continue;
+        }
+
+        // Get the .desktop file info from UAL, since we're not ignoring
+        auto appinfo = ualapp->info();
+        app.title = appinfo->name();
+        app.description = appinfo->description();
+        app.icon_url = appinfo->iconPath();
+        app.default_department = appinfo->defaultDepartment();
+        app.main_screenshot = appinfo->screenshotPath();
+        app.keywords = appinfo->keywords();
+
+        // app from click package has non-empty name; for non-click apps use desktop filename
+        auto department_key = app.name;
+        qDebug() << "Using department key:" << QString::fromStdString(department_key);
+
+        // check if apps is present in current department
+        if (apply_department_filter) {
+            if (packages_in_department.find(department_key) ==
+                packages_in_department.end()) {
+                if (app.default_department.empty()) {
+                    // default department not present in the keyfile, skip this app
+                    continue;
+                } else {
+                    // default department not empty: check if this app is in a different
+                    // department in the db (i.e. got moved from the default department);
+                    if (depts_db->has_package(department_key)) {
+                        // app is now in a different department
+                        continue;
+                    }
+
+                    if (app.default_department != current_department) {
+                        continue;
+                    }
+                    // else - this package is in current department
+                }
+            }
+        }
+
+        // the packages_in_department set contains packages from
+        // all its subdepartments; we need to find actual department now
+        // to update app.real_department.
+        if (depts_db) {
+            if (depts_db->has_package(department_key)) {
+                try {
+                    app.real_department = depts_db->get_department_for_package(department_key);
+                } catch (const std::exception &e) {
+                    qWarning() << "Failed to get department of package:" << QString::fromStdString(department_key);
+                }
+            } else {
+                app.real_department = app.default_department;
+                if (app.real_department.empty()) {
+                    qWarning() << "No default department set in the .desktop file and no entry in the database for" << QString::fromStdString(department_key);
+                }
+            }
+        }
+
+        if (query.empty()) {
+            result.push_back(app);
+        } else {
+            QString lquery = ::unaccent(QString::fromStdString(query));
+
+            // Check keywords for the search query as well.
+            for (auto kwd: app.keywords) {
+                QString keyword = ::unaccent(QString::fromStdString(kwd));
+                if (!keyword.isEmpty()
+                    && keyword.contains(lquery, Qt::CaseInsensitive)) {
+                    result.push_back(app);
+                }
+            }
+
+            QString search_title = ::unaccent(QString::fromStdString(app.title));
+            // check the app title for the search query.
+            if (!search_title.isEmpty()
+                && search_title.contains(lquery, Qt::CaseInsensitive)) {
                 result.push_back(app);
-            } else {
-                QString lquery = ::unaccent(QString::fromStdString(search_query));
-
-                // Check keywords for the search query as well.
-                for (auto kwd: app.keywords) {
-                    QString keyword = ::unaccent(QString::fromStdString(kwd));
-                    if (!keyword.isEmpty()
-                        && keyword.contains(lquery, Qt::CaseInsensitive)) {
-                        result.push_back(app);
-                        return;
-                    }
-                }
-
-                QString search_title = ::unaccent(QString::fromStdString(app.title));
-                // check the app title for the search query.
-                if (!search_title.isEmpty()
-                    && search_title.contains(lquery, Qt::CaseInsensitive)) {
-                    result.push_back(app);
-                }
             }
         }
-    };
+    }
 
-    keyFileLocator->enumerateKeyFilesForInstalledApplications(enumerator);
     return sort_apps(result);
 }
 
@@ -412,9 +307,9 @@
  * Tests that @filename is one of the special-cased filenames for apps
  * which are not packaged as clicks, but required on Ubuntu Touch.
  */
-bool Interface::is_non_click_app(const QString& filename)
+bool Interface::is_non_click_app(const std::string& app_id)
 {
-    return click::nonClickDesktopFiles().count(filename.toUtf8().data()) > 0;
+    return click::nonClickDesktopFiles().count(app_id) > 0;
 }
 
 /*
@@ -440,42 +335,6 @@
     return icon_id;
 }
 
-ManifestList manifest_list_from_json(const std::string& json)
-{
-    using namespace boost::property_tree;
-
-    std::istringstream is(json);
-
-    ptree pt;
-    read_json(is, pt);
-
-    ManifestList manifests;
-
-    BOOST_FOREACH(ptree::value_type &v, pt)
-    {
-        assert(v.first.empty()); // array elements have no names
-        auto node = v.second;
-        Manifest manifest;
-
-        manifest.name = node.get<std::string>("name");
-        manifest.version = node.get<std::string>("version");
-        manifest.removable = node.get<bool>("_removable");
-
-        BOOST_FOREACH(ptree::value_type &sv, node.get_child("hooks"))
-        {
-            // FIXME: "primary app" for a package is not defined, we just
-            // use first one here:
-            manifest.first_app_name = sv.first;
-            break;
-        }
-        qDebug() << "adding manifest: " << manifest.name.c_str() << manifest.version.c_str() << manifest.first_app_name.c_str();
-
-        manifests.push_back(manifest);
-    }
-
-    return manifests;
-}
-
 Manifest manifest_from_json(const std::string& json)
 {
     using namespace boost::property_tree;
@@ -509,124 +368,62 @@
     return manifest;
 }
 
-void Interface::get_manifests(std::function<void(ManifestList, InterfaceError)> callback)
-{
-    std::string command = "click list --manifest";
-    qDebug() << "Running command:" << command.c_str();
-    run_process(command, [callback](int code, const std::string& stdout_data, const std::string& stderr_data) {
-        if (code == 0) {
-            try {
-                ManifestList manifests = manifest_list_from_json(stdout_data);
-                callback(manifests, InterfaceError::NoError);
-            } catch (...) {
-                qWarning() << "Can't parse 'click list --manifest' output: " << QString::fromStdString(stdout_data);
-                callback(ManifestList(), InterfaceError::ParseError);
-            }
-        } else {
-            qWarning() << "Error" << code << "running 'click list --manifest': " << QString::fromStdString(stderr_data);
-            callback(ManifestList(), InterfaceError::CallError);
-        }
-    });
-}
-
-PackageSet package_names_from_stdout(const std::string& stdout_data)
-{
-    const char TAB='\t', NEWLINE='\n';
-    std::istringstream iss(stdout_data);
-    PackageSet installed_packages;
-
-    while (iss.peek() != EOF) {
-        std::string line;
-        std::getline(iss, line, NEWLINE);
-
-        if (!line.empty()) {
-            // Must initialize linestream after line is filled.
-            std::istringstream linestream(line);
-
-            Package p;
-            std::getline(linestream, p.name, TAB);
-            std::getline(linestream, p.version);
-            if (iss.eof() || p.name.empty() || p.version.empty()) {
-                qWarning() << "Error encountered parsing 'click list' output:" << QString::fromStdString(line);
-            } else {
-                installed_packages.insert(p);
-            }
-        }
-    }
-
-    return installed_packages;
-}
-
 void Interface::get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback)
 {
-    std::string command = "click list";
-    qDebug() << "Running command:" << command.c_str();
-    run_process(command, [callback](int code, const std::string& stdout_data, const std::string& stderr_data) {
-        if (code == 0) {
-            try {
-                PackageSet package_names = package_names_from_stdout(stdout_data);
-                callback(package_names, InterfaceError::NoError);
-            } catch (...) {
-                qWarning() << "Can't parse 'click list' output: " << QString::fromStdString(stdout_data);
-                callback(PackageSet(), InterfaceError::ParseError);
-            }
-        } else {
-            qWarning() << "Error" << code << "running 'click list': " << QString::fromStdString(stderr_data);
-            callback(PackageSet(), InterfaceError::CallError);
+    PackageSet packages;
+    for (auto app: installed_apps()) {
+        Package p;
+        p.name = app->appId().package.value();
+        p.version = app->appId().version.value();
+        if (!p.name.empty() && !p.version.empty()) {
+            packages.insert(p);
         }
-    });
+    }
+    callback(packages, InterfaceError::NoError);
+}
+
+std::string Interface::get_manifest_json(const std::string &package)
+{
+    GError* error = NULL;
+
+    auto clickdb = click_db_new();
+    click_db_read(clickdb, NULL, &error);
+    if (error != NULL) {
+        qCritical() << "Error reading click DB:" << error->message;
+        g_error_free(error);
+        return "";
+    }
+
+    auto clickuser = click_user_new_for_user(clickdb, NULL, &error);
+    if (error != NULL) {
+        qCritical() << "Error setting up click user:" << error->message;
+        g_error_free(error);
+        return "";
+    }
+
+    auto result = click_user_get_manifest_as_string(clickuser, package.c_str(),
+                                                    &error);
+    if (error != NULL) {
+        qCritical() << "Error getting manifest:" << error->message;
+        g_error_free(error);
+        return "";
+    }
+
+    std::string retval{result};
+    g_free(result);
+    return retval;
 }
 
 void Interface::get_manifest_for_app(const std::string &app_id,
                                      std::function<void(Manifest, InterfaceError)> callback)
 {
-    std::string command = "click info " + app_id;
-    qDebug() << "Running command:" << command.c_str();
-    run_process(command, [callback, app_id](int code, const std::string& stdout_data, const std::string& stderr_data) {
-        if (code == 0) {
-            try {
-                Manifest manifest = manifest_from_json(stdout_data);
-                callback(manifest, InterfaceError::NoError);
-            } catch (...) {
-                qWarning() << "Can't parse 'click info" << QString::fromStdString(app_id)
-                           << "' output: " << QString::fromStdString(stdout_data);
-                callback(Manifest(), InterfaceError::ParseError);
-            }
-        } else {
-            qWarning() << "Error" << code << "running 'click info" << QString::fromStdString(app_id)
-                       << "': " << QString::fromStdString(stderr_data);
-            callback(Manifest(), InterfaceError::CallError);
-        }
-    });
-}
-
-void Interface::run_process(const std::string& command,
-                            std::function<void(int code,
-                                               const std::string& stdout_data,
-                                               const std::string& stderr_data)> callback)
-{
-    QSharedPointer<QProcess> process(new QProcess());
-    typedef void(QProcess::*QProcessFinished)(int, QProcess::ExitStatus);
-    typedef void(QProcess::*QProcessError)(QProcess::ProcessError);
-    QObject::connect(process.data(),
-                     static_cast<QProcessFinished>(&QProcess::finished),
-                     [callback, process](int code, QProcess::ExitStatus /*status*/) {
-                         qDebug() << "command finished with exit code:" << code;
-                         std::string data{process->readAllStandardOutput().data()};
-                         std::string errors{process->readAllStandardError().data()};
-                         callback(code, data, errors);
-                     } );
-
-    QObject::connect(process.data(),
-                     static_cast<QProcessError>(&QProcess::error),
-                     [callback, process](QProcess::ProcessError error) {
-                         qCritical() << "error running command:" << error;
-                         std::string data{process->readAllStandardOutput().data()};
-                         std::string errors{process->readAllStandardError().data()};
-                         callback(process->exitCode(), data, errors);
-                     } );
-
-    process->start(command.c_str());
+    try {
+        Manifest manifest = manifest_from_json(get_manifest_json(app_id));
+        callback(manifest, InterfaceError::NoError);
+    } catch (...) {
+        qWarning() << "Can't parse manifest for:" << QString::fromStdString(app_id);
+        callback(Manifest(), InterfaceError::ParseError);
+    }
 }
 
 } // namespace click

=== modified file 'libclickscope/click/interface.h'
--- libclickscope/click/interface.h	2016-07-14 18:37:27 +0000
+++ libclickscope/click/interface.h	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -30,15 +30,19 @@
 #ifndef CLICK_INTERFACE_H
 #define CLICK_INTERFACE_H
 
-#include <QObject>
-#include <QStringList>
+#include "application.h"
+#include "package.h"
+
+#include <ubuntu-app-launch/application.h>
+
 #include <unity/util/IniParser.h>
 
+#include <memory>
+#include <unordered_set>
 #include <vector>
-#include <unordered_set>
 
-#include "application.h"
-#include "package.h"
+using namespace ubuntu::app_launch;
+namespace ual = ubuntu::app_launch;
 
 namespace click
 {
@@ -74,46 +78,28 @@
 enum class InterfaceError {NoError, CallError, ParseError};
 typedef std::list<Manifest> ManifestList;
 
-ManifestList manifest_list_from_json(const std::string& json);
 Manifest manifest_from_json(const std::string& json);
-PackageSet package_names_from_stdout(const std::string& stdout_data);
 
 class Interface
 {
 public:
-    Interface(const QSharedPointer<KeyFileLocator>& keyFileLocator);
     Interface() = default;
-    virtual ~Interface();
+    virtual ~Interface() = default;
 
-    virtual std::string get_translated_string(const unity::util::IniParser& keyFile,
-                                              const std::string& group,
-                                              const std::string& key,
-                                              const std::string& domain);
-    virtual Application load_app_from_desktop(const unity::util::IniParser& keyFile,
-                                              const std::string& filename);
     static std::vector<Application> sort_apps(const std::vector<Application>& apps);
-    virtual std::vector<Application> find_installed_apps(const std::string& search_query,
+    virtual std::list<std::shared_ptr<ual::Application>> installed_apps();
+    virtual std::vector<Application> search(const std::string& query,
             const std::vector<std::string>& ignored_apps = std::vector<std::string>{},
             const std::string& current_department = "",
             const std::shared_ptr<click::DepartmentsDb>& depts_db = nullptr);
 
-    static bool is_non_click_app(const QString& filename);
+    static bool is_non_click_app(const std::string& app_id);
 
     static bool is_icon_identifier(const std::string &icon_id);
     static std::string add_theme_scheme(const std::string &filename);
-    virtual void get_manifests(std::function<void(ManifestList, InterfaceError)> callback);
     virtual void get_installed_packages(std::function<void(PackageSet, InterfaceError)> callback);
+    virtual std::string get_manifest_json(const std::string &package);
     virtual void get_manifest_for_app(const std::string &app_id, std::function<void(Manifest, InterfaceError)> callback);
-    constexpr static const char* ENV_SHOW_DESKTOP_APPS {"CLICK_SCOPE_SHOW_DESKTOP_APPS"};
-    virtual bool is_visible_app(const unity::util::IniParser& keyFile);
-    virtual bool show_desktop_apps();
-
-    virtual void run_process(const std::string& command,
-                             std::function<void(int code,
-                                                const std::string& stdout_data,
-                                                const std::string& stderr_data)> callback);
-private:
-    QSharedPointer<KeyFileLocator> keyFileLocator;
 };
 
 } // namespace click

=== removed file 'libclickscope/click/key_file_locator.cpp'
--- libclickscope/click/key_file_locator.cpp	2015-11-24 18:23:23 +0000
+++ libclickscope/click/key_file_locator.cpp	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#include "key_file_locator.h"
-
-#include <unity/Exception.h>
-#include <unity/UnityExceptions.h>
-#include <unity/util/IniParser.h>
-
-#include <QDebug>
-#include <QDir>
-#include <QStandardPaths>
-#include <QString>
-
-namespace
-{
-static const QString NON_CLICK_PATH("/usr/share/applications");
-
-void find_apps_in_dir(const QString& dir_path,
-                                 const click::KeyFileLocator::Enumerator& enumerator)
-{
-    QDir dir(dir_path, "*.desktop",
-             QDir::Unsorted, QDir::Readable | QDir::Files);
-    QStringList entries = dir.entryList();
-    for (int i = 0; i < entries.size(); ++i) {
-        QString filename = entries.at(i);
-        QString full_path = dir.absoluteFilePath(filename);
-        try {
-            enumerator(unity::util::IniParser(full_path.toUtf8().data()),
-                       filename.toUtf8().data());
-        } catch (const unity::FileException& file_exp) {
-            qWarning() << "Error reading file:" << file_exp.to_string().c_str();
-        } catch (const unity::LogicException& logic_exp) {
-            qCritical() << "Error reading file:" << logic_exp.to_string().c_str();
-        }
-    }
-}
-}
-
-const std::string& click::KeyFileLocator::systemApplicationsDirectory()
-{
-    static const std::string s{"/usr/share/applications"};
-    return s;
-}
-
-const std::string& click::KeyFileLocator::userApplicationsDirectory()
-{
-    static const std::string s
-    {
-        qPrintable(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/applications")
-    };
-    return s;
-}
-
-click::KeyFileLocator::KeyFileLocator(
-        const std::string& systemApplicationsDir,
-        const std::string& userApplicationsDir)
-    : systemApplicationsDir(systemApplicationsDir),
-      userApplicationsDir(userApplicationsDir)
-{
-}
-
-void click::KeyFileLocator::enumerateKeyFilesForInstalledApplications(
-        const click::KeyFileLocator::Enumerator& enumerator)
-{
-    find_apps_in_dir(QString::fromStdString(systemApplicationsDir), enumerator);
-    find_apps_in_dir(QString::fromStdString(userApplicationsDir), enumerator);
-}

=== removed file 'libclickscope/click/key_file_locator.h'
--- libclickscope/click/key_file_locator.h	2014-05-13 19:32:29 +0000
+++ libclickscope/click/key_file_locator.h	1970-01-01 00:00:00 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef CLICK_KEY_FILE_LOCATOR_H
-#define CLICK_KEY_FILE_LOCATOR_H
-
-#include <functional>
-#include <string>
-
-namespace unity
-{
-namespace util
-{
-class IniParser;
-}
-}
-
-namespace click
-{
-class KeyFileLocator
-{
-public:
-    static const std::string& systemApplicationsDirectory();
-    static const std::string& userApplicationsDirectory();
-
-    typedef std::function<void(const unity::util::IniParser&, const std::string&)> Enumerator;
-
-    KeyFileLocator(const std::string& systemApplicationsDir = systemApplicationsDirectory(),
-                   const std::string& userApplicationsDir = userApplicationsDirectory());
-    KeyFileLocator(const KeyFileLocator&) = delete;
-    virtual ~KeyFileLocator() = default;
-
-    KeyFileLocator& operator=(const KeyFileLocator&) = delete;
-    bool operator==(const KeyFileLocator&) const = delete;
-
-    virtual void enumerateKeyFilesForInstalledApplications(const Enumerator& enumerator);
-
-private:
-    std::string systemApplicationsDir;
-    std::string userApplicationsDir;
-};
-}
-
-#endif // CLICK_KEY_FILE_LOCATOR_H

=== modified file 'libclickscope/click/package.cpp'
--- libclickscope/click/package.cpp	2015-11-24 18:23:23 +0000
+++ libclickscope/click/package.cpp	2016-08-24 21:39:08 +0000
@@ -95,6 +95,10 @@
     p.publisher = item[Package::JsonKeys::publisher].asString();
     p.rating = item[Package::JsonKeys::rating].asDouble();
     p.version = item[Package::JsonKeys::version].asString();
+
+    p.snap_id = item[Package::JsonKeys::snap_id].asString();
+    p.alias = item[Package::JsonKeys::alias].asString();
+
     return p;
 }
 

=== modified file 'libclickscope/click/package.h'
--- libclickscope/click/package.h	2015-11-24 18:23:23 +0000
+++ libclickscope/click/package.h	2016-08-24 21:39:08 +0000
@@ -64,6 +64,8 @@
         constexpr static const char* publisher{"publisher"};
         constexpr static const char* rating{"ratings_average"};
         constexpr static const char* version{"version"};
+        constexpr static const char* snap_id{"snap_id"};
+        constexpr static const char* alias{"alias"};
 
         // NOTE: The "price" field is deprecated in favor of "prices"
         constexpr static const char* prices{"prices"};
@@ -107,6 +109,8 @@
     void matches (std::string query, std::function<bool> callback);
     std::string content;
     std::map<std::string, double> prices;
+    std::string snap_id;
+    std::string alias;
 
     struct hash_name {
     public :

=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2016-07-18 15:38:22 +0000
+++ libclickscope/click/preview.cpp	2016-08-24 21:39:08 +0000
@@ -413,6 +413,9 @@
     }
 }
 
+// Need to use this in a couple places, so it's a static const.
+static const std::regex desktop_match("^(.*)\\.desktop$");
+
 // TODO: error handling - once get_details provides errors, we can
 // return them from populateDetails and check them in the calling code
 // to decide whether to show error widgets. see bug LP: #1289541
@@ -422,8 +425,9 @@
 {
 
     std::string app_name = get_string_maybe_null(result["name"]);
+    std::string snap_id = get_string_maybe_null(result["snap_id"]);
 
-    if (app_name.empty()) {
+    if (app_name.empty() || std::regex_match(app_name, desktop_match)) {
         click::PackageDetails details;
         qDebug() << "in populateDetails(), app_name is empty";
         details.package.title = result.title();
@@ -437,9 +441,13 @@
         // I think this should not be required when we switch the click::Index over
         // to using the Qt bridge. With that, the qt dependency becomes an implementation detail
         // and code using it does not need to worry about threading/event loop topics.
-        run_under_qt([this, details_callback, reviews_callback, app_name, force_cache]()
+        run_under_qt([this, details_callback, reviews_callback, app_name, snap_id, force_cache]()
             {
-                index_operation = index->get_details(app_name, [this, app_name, details_callback, reviews_callback, force_cache](PackageDetails details, click::Index::Error error){
+                index_operation = index->get_details(app_name,
+                                                     [this, app_name, snap_id,
+                                                      details_callback,
+                                                      reviews_callback,
+                                                      force_cache](PackageDetails details, click::Index::Error error){
                     if(error == click::Index::Error::NoError) {
                         qDebug() << "Got details:" << app_name.c_str();
                         details_callback(details);
@@ -452,10 +460,17 @@
                         details.main_screenshot_url = get_string_maybe_null(result["main_screenshot"]);
                         details_callback(details);
                     }
-                    reviews_operation = reviews->fetch_reviews(app_name,
-                                                               reviews_callback,
-                                                               force_cache);
-                }, force_cache);
+                    // FIXME: No RNR support for v2 snaps yet, so avoid the
+                    // network hit if we're showing a snap preview
+                    if (snap_id.empty()) {
+                        reviews_operation = reviews->fetch_reviews(app_name,
+                                                                   reviews_callback,
+                                                                   force_cache);
+                    } else {
+                        reviews_callback(click::ReviewList{},
+                                         click::Reviews::Error::NoError);
+                    }
+                    }, !snap_id.empty(), force_cache);
             });
     }
 }
@@ -900,7 +915,7 @@
     std::promise<Manifest> manifest_promise;
     std::future<Manifest> manifest_future = manifest_promise.get_future();
     std::string app_name = result["name"].get_string();
-    if (!app_name.empty()) {
+    if (!app_name.empty() && !std::regex_match(app_name, desktop_match)) {
         qt::core::world::enter_with_task([&]() {
             click::Interface().get_manifest_for_app(app_name,
                 [&](Manifest found_manifest, InterfaceError error) {

=== modified file 'libclickscope/click/webclient.cpp'
--- libclickscope/click/webclient.cpp	2016-05-25 16:19:51 +0000
+++ libclickscope/click/webclient.cpp	2016-08-24 21:39:08 +0000
@@ -78,6 +78,26 @@
 {
 }
 
+std::string click::web::Client::signUrl(const std::string& url,
+                                        const std::string& method)
+{
+    QString signature;
+
+    if (impl->sso.isNull()) {
+        qCritical() << "Unable to sign request without SSO object.";
+    } else {
+        auto token = impl->sso->getToken();
+        if (token.isValid()) {
+            signature = token.signUrl(QString::fromStdString(url),
+                                      QString::fromStdString(method));
+            qDebug() << "Signed URL:" << QString::fromStdString(url);
+        } else {
+            qWarning() << "Signing requested but returned token is invalid.";
+        }
+    }
+    return signature.toStdString();
+}
+
 QSharedPointer<click::web::Response> click::web::Client::call(
     const std::string& iri,
     const click::web::CallParams& params,
@@ -137,25 +157,14 @@
     auto deviceId = Configuration().get_device_id();
     request->setRawHeader(DEVICE_ID_HEADER.c_str(), deviceId.data());
 
-    if (sign && !impl->sso.isNull()) {
-        auto token = impl->sso->getToken();
-        if (token.isValid()) {
-            QString auth_header = token.signUrl(url.toString(),
-                                                method.c_str());
-            qDebug() << "Signed URL:" << request->url().toString();
-            request->setRawHeader(AUTHORIZATION_HEADER.c_str(), auth_header.toUtf8());
-        } else {
-            qWarning() << "Signing reuested but returned token is invalid.";
-        }
-
-        doConnect();
-    } else {
-        if (sign && impl->sso.isNull()) {
-            qCritical() << "Unable to sign request without SSO object.";
-        }
-        doConnect();
+    if (sign) {
+        auto auth_header = signUrl(url.toString().toStdString(), method);
+        if (!auth_header.empty())
+            request->setRawHeader(AUTHORIZATION_HEADER.c_str(),
+                                  auth_header.c_str());
     }
 
+    doConnect();
 
     return responsePtr;
 }

=== modified file 'libclickscope/click/webclient.h'
--- libclickscope/click/webclient.h	2016-05-25 16:19:51 +0000
+++ libclickscope/click/webclient.h	2016-08-24 21:39:08 +0000
@@ -115,6 +115,8 @@
     Client(const QSharedPointer<click::network::AccessManager>& networkAccessManager);
     virtual ~Client();
 
+    virtual std::string signUrl(const std::string& url,
+                                const std::string& method);
     virtual QSharedPointer<Response> call(
         const std::string& iri,
         const CallParams& params = CallParams(), bool force_cache = false);

=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2015-07-02 21:56:45 +0000
+++ libclickscope/tests/CMakeLists.txt	2016-08-24 21:39:08 +0000
@@ -15,11 +15,13 @@
   ${GMOCK_INCLUDE_DIR}
 )
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_data.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp)
 add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}")
 
 add_executable (${LIBCLICKSCOPE_TESTS_TARGET}
   mock_network_access_manager.h
+  mock_pay.h
+  mock_ual.h
+  mock_ubuntu_download_manager.h
   mock_ubuntuone_credentials.h
   mock_webclient.h
   fake_json.cpp
@@ -37,8 +39,6 @@
   test_smartconnect.cpp
   test_utils.cpp
   test_webclient.cpp
-
-  ${CMAKE_CURRENT_BINARY_DIR}/test_data.cpp
 )
 
 qt5_use_modules(${LIBCLICKSCOPE_TESTS_TARGET} Core Sql)

=== removed directory 'libclickscope/tests/applications'
=== removed directory 'libclickscope/tests/applications/system'
=== removed file 'libclickscope/tests/applications/system/address-book-app.desktop'
--- libclickscope/tests/applications/system/address-book-app.desktop	2014-07-21 12:41:31 +0000
+++ libclickscope/tests/applications/system/address-book-app.desktop	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Terminal=false
-Type=Application
-Name=Contacts
-GenericName=Contacts
-Exec=/usr/bin/address-book-app %u
-Icon=contacts-app
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=address-book-app
-X-Ubuntu-Single-Instance=true
-X-Ubuntu-Default-Department-ID=accessories
-# this one has no screenshot nor comment, to test how it breaks

=== removed file 'libclickscope/tests/applications/system/messaging-app.desktop'
--- libclickscope/tests/applications/system/messaging-app.desktop	2014-04-02 11:56:49 +0000
+++ libclickscope/tests/applications/system/messaging-app.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Messaging
-GenericName=Messaging
-Comment=Messaging application
-Exec=messaging-app %u
-Terminal=false
-Icon=messages-app
-MimeType=x-scheme-handler/contact;x-scheme-handler/call
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=messaging-app
-X-Ubuntu-Single-Instance=true
-X-Screenshot=/usr/share/messaging-app/assets/messaging-app-screenshot.png

=== removed file 'libclickscope/tests/applications/system/translated.desktop'
--- libclickscope/tests/applications/system/translated.desktop	2014-05-05 20:21:53 +0000
+++ libclickscope/tests/applications/system/translated.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Translated App
-Name[en]=Translated App
-Name[es]=Translated App in Spanish
-Comment=Translated application
-Comment[en]=Translated application
-Comment[es]=Translated application in Spanish
-X-Ubuntu-Touch=true

=== removed directory 'libclickscope/tests/applications/user'
=== removed file 'libclickscope/tests/applications/user/badd-appid.desktop'
--- libclickscope/tests/applications/user/badd-appid.desktop	2016-01-04 20:50:16 +0000
+++ libclickscope/tests/applications/user/badd-appid.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[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

=== removed file 'libclickscope/tests/applications/user/broken.desktop'
Binary files libclickscope/tests/applications/user/broken.desktop	2014-04-28 22:10:15 +0000 and libclickscope/tests/applications/user/broken.desktop	1970-01-01 00:00:00 +0000 differ
=== removed file 'libclickscope/tests/applications/user/com.ubuntu.accented_accented_0.5.29.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.accented_accented_0.5.29.desktop	2016-03-03 14:19:50 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.accented_accented_0.5.29.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.accented_accented_0.5.29 -- qmlscene ./ubuntu-accented-app.qml -I ./plugins
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.accented/./accented64.png
-Name=Cámara
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.accented
-X-Ubuntu-Old-Icon=./accented64.png
-X-Ubuntu-Application-ID=com.ubuntu.accented_accented_0.5.29

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.calculator_calculator_0.1.3.206.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.calculator_calculator_0.1.3.206.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.calculator_calculator_0.1.3.206.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.calculator_calculator_0.1.3.206 -- qmlscene ./ubuntu-calculator-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/./calculator64.png
-Name=Calculator
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.calculator
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator
-X-Ubuntu-Old-Icon=./calculator64.png
-X-Ubuntu-Application-ID=com.ubuntu.calculator_calculator_0.1.3.206

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.calendar_calendar_0.4.182.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.calendar_calendar_0.4.182.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.calendar_calendar_0.4.182.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.calendar_calendar_0.4.182 -- qmlscene %u ./calendar.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calendar/./calendar64.png
-Name=Calendar
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.calendar
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calendar
-X-Ubuntu-Old-Icon=./calendar64.png
-X-Ubuntu-Application-ID=com.ubuntu.calendar_calendar_0.4.182

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.clock_clock_1.0.300.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.clock_clock_1.0.300.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.clock_clock_1.0.300.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.clock_clock_1.0.300 -- qmlscene ./ubuntu-clock-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png
-Name=Clock
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.clock
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock
-X-Ubuntu-Old-Icon=./clock64.png
-X-Ubuntu-Application-ID=com.ubuntu.clock_clock_1.0.300

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6 -- webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://www.amazon.com/*,https?://s.amazon-adsystem.com/* http://www.amazon.com/gp/aw
-Name=Amazon
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-amazon/./amazon.png
-X-Ubuntu-Touch=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-amazon
-X-Ubuntu-Old-Icon=./amazon.png
-X-Ubuntu-Application-ID=com.ubuntu.developer.webapps.webapp-amazon_webapp-amazon_1.0.6

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8.desktop	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8 -- webbrowser-app --enable-back-forward --webappUrlPatterns=https?://*.ebay.com/* --webapp http://m.ebay.com/
-Name=eBay
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ebay/./ebay.png
-X-Ubuntu-Touch=true
-X-Ubuntu-Single-Instance=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-ebay
-X-Ubuntu-Old-Icon=./ebay.png
-X-Ubuntu-Application-ID=com.ubuntu.developer.webapps.webapp-ebay_webapp-ebay_1.0.8

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5.desktop	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5 -- webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://m.facebook.com/* https://m.facebook.com/
-Name=Facebook
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook/./facebook.png
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Single-Instance=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-facebook
-X-Ubuntu-Old-Icon=./facebook.png
-X-Ubuntu-Application-ID=com.ubuntu.developer.webapps.webapp-facebook_webapp-facebook_1.0.5

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8.desktop	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8 -- webbrowser-app --enable-back-forward --webappModelSearchPath=. --webapp='R01haWwNCg==' https://mail.google.com/
-Name=Gmail
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-gmail/./gmail.png
-X-Ubuntu-Touch=true
-X-Ubuntu-Single-Instance=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-gmail
-X-Ubuntu-Old-Icon=./gmail.png
-X-Ubuntu-Application-ID=com.ubuntu.developer.webapps.webapp-gmail_webapp-gmail_1.0.8

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5.desktop	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5 -- webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/session/new?bypass_interstitial=true
-Name=Twitter
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter/./twitter.png
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Single-Instance=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.developer.webapps.webapp-twitter
-X-Ubuntu-Old-Icon=./twitter.png
-X-Ubuntu-Application-ID=com.ubuntu.developer.webapps.webapp-twitter_webapp-twitter_1.0.5

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.dropping-letters/dropping-letters.png
-Terminal=false
-Name=Dropping Letters
-Exec=aa-exec-click -p com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43 -- qmlscene dropping-letters.qml
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.dropping-letters
-X-Ubuntu-Old-Icon=dropping-letters.png
-X-Ubuntu-Application-ID=com.ubuntu.dropping-letters_dropping-letters_0.1.2.2.43

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.filemanager_filemanager_0.1.1.97.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.filemanager_filemanager_0.1.1.97.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.filemanager_filemanager_0.1.1.97.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.filemanager_filemanager_0.1.1.97 -- qmlscene ./ubuntu-filemanager-app.qml -I ./plugins
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.filemanager/./filemanager64.png
-Name=File Manager
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.filemanager
-X-Ubuntu-Old-Icon=./filemanager64.png
-X-Ubuntu-Application-ID=com.ubuntu.filemanager_filemanager_0.1.1.97

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.music_music_1.1.329.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.music_music_1.1.329.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.music_music_1.1.329.desktop	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Music
-Comment=Ubuntu Touch Music Player
-Exec=aa-exec-click -p com.ubuntu.music_music_1.1.329 -- qmlscene ./music-app.qml --file=%f -I ./plugins
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music/images/music.png
-Terminal=false
-Type=Application
-StartupNotify=true
-X-Ubuntu-Single-Instance=true
-X-Ubuntu-Touch=true
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.music
-X-Ubuntu-Old-Icon=images/music.png
-X-Ubuntu-Application-ID=com.ubuntu.music_music_1.1.329

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.notes_notes_1.4.242.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.notes_notes_1.4.242.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.notes_notes_1.4.242.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=aa-exec-click -p com.ubuntu.notes_notes_1.4.242 -- qmlscene $@ -I ./usr/lib/arm-linux-gnueabihf/qt5/qml NotesApp.qml
-Name=Notes
-GenericName=Notes application for Ubuntu
-Icon=notepad
-Terminal=false
-
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.notes
-X-Ubuntu-Single-Instance=true
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.notes
-X-Ubuntu-Application-ID=com.ubuntu.notes_notes_1.4.242

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.shorts_shorts_0.2.162.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.shorts_shorts_0.2.162.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.shorts_shorts_0.2.162.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.shorts_shorts_0.2.162 -- qmlscene ./rssreader-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.shorts/./rssreader64.png
-Name=Shorts
-Keywords=shorts;rss;reader
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.shorts
-X-Ubuntu-Old-Icon=./rssreader64.png
-X-Ubuntu-Application-ID=com.ubuntu.shorts_shorts_0.2.162

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Stock Ticker
-GenericName=Stock Ticker
-Comment=An awesome Stock Ticker application with all the features you could imagine
-Exec=aa-exec-click -p com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66 -- qmlscene Stock_Ticker.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png
-Terminal=false
-Type=Application
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-Categories=Utility;
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile
-X-Ubuntu-Old-Icon=icons/stock_icon_48.png
-X-Ubuntu-Application-ID=com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.sudoku_sudoku_1.0.142.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.sudoku_sudoku_1.0.142.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.sudoku_sudoku_1.0.142.desktop	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Name=Sudoku
-Version=1.0
-Comment=Sudoku Game for Ubuntu Touch
-Exec=aa-exec-click -p com.ubuntu.sudoku_sudoku_1.0.142 -- qmlscene sudoku-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku/SudokuGameIcon.png
-Terminal=false
-Type=Application
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.sudoku
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.sudoku
-X-Ubuntu-Old-Icon=SudokuGameIcon.png
-X-Ubuntu-Application-ID=com.ubuntu.sudoku_sudoku_1.0.142

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.terminal_terminal_0.5.29.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.terminal_terminal_0.5.29.desktop	2014-02-10 12:23:35 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.terminal_terminal_0.5.29.desktop	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.terminal_terminal_0.5.29 -- qmlscene ./ubuntu-terminal-app.qml -I ./plugins
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.terminal/./terminal64.png
-Name=Terminal
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.terminal
-X-Ubuntu-Old-Icon=./terminal64.png
-X-Ubuntu-Application-ID=com.ubuntu.terminal_terminal_0.5.29

=== removed file 'libclickscope/tests/applications/user/com.ubuntu.weather_weather_1.0.168.desktop'
--- libclickscope/tests/applications/user/com.ubuntu.weather_weather_1.0.168.desktop	2014-04-10 17:29:49 +0000
+++ libclickscope/tests/applications/user/com.ubuntu.weather_weather_1.0.168.desktop	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.weather_weather_1.0.168 -- qmlscene ./ubuntu-weather-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather/./weather64.png
-Name=Weather
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.weather
-
-# Fake an app installed from a .deb
-#Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.weather
-#X-Ubuntu-Old-Icon=./weather64.png
-#X-Ubuntu-Application-ID=com.ubuntu.weather_weather_1.0.168

=== removed file 'libclickscope/tests/applications/user/non-click-app-nodisplay.desktop'
--- libclickscope/tests/applications/user/non-click-app-nodisplay.desktop	2014-04-08 20:04:45 +0000
+++ libclickscope/tests/applications/user/non-click-app-nodisplay.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sample Desktop-only non-click app
-GenericName=NonClickAppWithoutException
-Comment=multiline description goes here
-Exec=messaging-app %u
-Terminal=false
-MimeType=x-scheme-handler/contact;x-scheme-handler/call
-NoDisplay=true

=== removed file 'libclickscope/tests/applications/user/non-click-app-onlyshowin-gnome-unity.desktop'
--- libclickscope/tests/applications/user/non-click-app-onlyshowin-gnome-unity.desktop	2014-04-08 20:04:45 +0000
+++ libclickscope/tests/applications/user/non-click-app-onlyshowin-gnome-unity.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sample Desktop-only non-click app
-GenericName=NonClickAppWithoutException
-Comment=multiline description goes here
-Exec=messaging-app %u
-Terminal=false
-MimeType=x-scheme-handler/contact;x-scheme-handler/call
-OnlyShowIn=GNOME;Unity;
-Name[en_US]=non-click-app-onlyshowin-gnome-unity.desktop

=== removed file 'libclickscope/tests/applications/user/non-click-app-onlyshowin-gnome.desktop'
--- libclickscope/tests/applications/user/non-click-app-onlyshowin-gnome.desktop	2014-04-08 20:04:45 +0000
+++ libclickscope/tests/applications/user/non-click-app-onlyshowin-gnome.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sample Desktop-only non-click app
-GenericName=NonClickAppWithoutException
-Comment=multiline description goes here
-Exec=messaging-app %u
-Terminal=false
-MimeType=x-scheme-handler/contact;x-scheme-handler/call
-OnlyShowIn=GNOME;
-Name[en_US]=non-click-app-onlyshowin-gnome.desktop

=== removed file 'libclickscope/tests/applications/user/non-click-app-onlyshowin-unity.desktop'
--- libclickscope/tests/applications/user/non-click-app-onlyshowin-unity.desktop	2014-04-08 20:04:45 +0000
+++ libclickscope/tests/applications/user/non-click-app-onlyshowin-unity.desktop	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sample Desktop-only non-click app
-GenericName=NonClickAppWithoutException
-Comment=multiline description goes here
-Exec=messaging-app %u
-Terminal=false
-MimeType=x-scheme-handler/contact;x-scheme-handler/call
-OnlyShowIn=Unity;
-Name[en_US]=non-click-app-onlyshowin-unity.desktop

=== removed file 'libclickscope/tests/applications/user/non-click-app-without-exception.desktop'
--- libclickscope/tests/applications/user/non-click-app-without-exception.desktop	2014-04-08 21:16:25 +0000
+++ libclickscope/tests/applications/user/non-click-app-without-exception.desktop	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sample Desktop-only non-click app
-GenericName=NonClickAppWithoutException
-Comment=multiline description goes here
-Exec=messaging-app %u
-Terminal=false
-Icon=sample-desktop-app
-MimeType=x-scheme-handler/contact;x-scheme-handler/call

=== removed file 'libclickscope/tests/applications/user/pre-translated.desktop'
--- libclickscope/tests/applications/user/pre-translated.desktop	2015-11-24 18:23:23 +0000
+++ libclickscope/tests/applications/user/pre-translated.desktop	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Exec=aa-exec-click -p com.ubuntu.clock_clock_1.0.300 -- qmlscene ./ubuntu-clock-app.qml
-Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png
-_Name=Untranslated Clock
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=com.ubuntu.clock
-
-Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock
-X-Ubuntu-Old-Icon=./clock64.png
-X-Ubuntu-Application-ID=com.ubuntu.clock_clock_1.0.300

=== removed file 'libclickscope/tests/applications/user/semi-broken.desktop'
--- libclickscope/tests/applications/user/semi-broken.desktop	2014-04-28 22:10:15 +0000
+++ libclickscope/tests/applications/user/semi-broken.desktop	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-semi broken file

=== added file 'libclickscope/tests/mock_ual.h'
--- libclickscope/tests/mock_ual.h	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/mock_ual.h	2016-08-24 21:39:08 +0000
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <ubuntu-app-launch/registry.h>
+
+using namespace ubuntu::app_launch;
+namespace ual = ubuntu::app_launch;
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+using namespace ::testing;
+
+namespace
+{
+
+    class MockUALRegistry : public ual::Registry {
+    public:
+        MockUALRegistry()
+        {
+        }
+
+        MOCK_METHOD1(installedApps, std::list<std::shared_ptr<ual::Application>>(std::shared_ptr<ual::Registry>));
+    };
+
+    class MockUALApplication : public ual::Application {
+    public:
+        class MockInfo;
+        class MockInstance;
+
+        MockUALApplication(const ual::AppID& app_id,
+                           const std::shared_ptr<MockInfo>& info = {})
+            : _app_id(app_id),
+              _info(info)
+        {
+        }
+
+        ual::AppID appId()
+        {
+            return _app_id;
+        }
+
+        std::shared_ptr<ual::Application::Info> info()
+        {
+            return _info;
+        }
+
+        static std::shared_ptr<MockUALApplication> create(ual::AppID app_id,
+                                                          std::shared_ptr<MockInfo> info = {})
+        {
+            std::shared_ptr<MockUALApplication> result{new MockUALApplication(app_id, info)};
+            return result;
+        }
+
+        class MockInfo : public ual::Application::Info
+        {
+        public:
+            MockInfo(const std::string& title,
+                     const std::string& description,
+                     const std::string& iconPath)
+                : _name(ual::Application::Info::Name::from_raw(title)),
+                _description(ual::Application::Info::Description::from_raw(description)),
+                _iconPath(ual::Application::Info::IconPath::from_raw(iconPath)),
+                _defaultDept(ual::Application::Info::DefaultDepartment::from_raw("")),
+                _ssPath(ual::Application::Info::IconPath::from_raw("")),
+                _keywords(ual::Application::Info::Keywords::from_raw(std::vector<std::string>{}))
+            {
+                DefaultValue<const ual::Application::Info::DefaultDepartment&>::Set(_defaultDept);
+                DefaultValue<const ual::Application::Info::IconPath&>::Set(_ssPath);
+                DefaultValue<const ual::Application::Info::Keywords&>::Set(_keywords);
+            }
+
+            const ual::Application::Info::Name& name()
+            {
+                return _name;
+            }
+
+            const ual::Application::Info::Description& description()
+            {
+                return _description;
+            }
+
+            const ual::Application::Info::IconPath& iconPath()
+            {
+                return _iconPath;
+            }
+
+            MOCK_METHOD0(defaultDepartment, const ual::Application::Info::DefaultDepartment&());
+            MOCK_METHOD0(screenshotPath, const ual::Application::Info::IconPath&());
+            MOCK_METHOD0(keywords, const ual::Application::Info::Keywords&());
+
+            MOCK_METHOD0(splash, ual::Application::Info::Splash());
+            MOCK_METHOD0(supportedOrientations, ual::Application::Info::Orientations());
+            MOCK_METHOD0(rotatesWindowContents, ual::Application::Info::RotatesWindow());
+            MOCK_METHOD0(supportsUbuntuLifecycle, ual::Application::Info::UbuntuLifecycle());
+
+        private:
+            ual::Application::Info::Name _name;
+            ual::Application::Info::Description _description;
+            ual::Application::Info::IconPath _iconPath;
+            ual::Application::Info::DefaultDepartment _defaultDept;
+            ual::Application::Info::IconPath _ssPath;
+            ual::Application::Info::Keywords _keywords;
+        };
+
+        class MockInstance : public ual::Application::Instance
+        {
+        public:
+            MOCK_METHOD0(isRunning, bool());
+            MOCK_METHOD0(logPath, std::string());
+            MOCK_METHOD0(primaryPid, pid_t());
+            MOCK_METHOD1(hasPid, bool(pid_t));
+            MOCK_METHOD0(pids, std::vector<pid_t>());
+            MOCK_METHOD0(pause, void());
+            MOCK_METHOD0(resume, void());
+            MOCK_METHOD0(stop, void());
+        };
+
+        MOCK_METHOD0(hasInstances, bool());
+        MOCK_METHOD0(instances, std::vector<std::shared_ptr<ual::Application::Instance>>());
+        MOCK_METHOD1(launch, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));
+        MOCK_METHOD1(launchTest, std::shared_ptr<ual::Application::Instance>(const std::vector<ual::Application::URL>&));
+
+    private:
+        ual::AppID _app_id;
+        std::shared_ptr<MockInfo> _info;
+    };
+
+} // namespace
+

=== modified file 'libclickscope/tests/mock_webclient.h'
--- libclickscope/tests/mock_webclient.h	2016-05-25 16:19:51 +0000
+++ libclickscope/tests/mock_webclient.h	2016-08-24 21:39:08 +0000
@@ -61,13 +61,6 @@
     Mock instance;
 };
 
-QSharedPointer<click::web::Response> responseForReply(const QSharedPointer<click::network::Reply>& reply)
-{
-    auto response = QSharedPointer<click::web::Response>(new click::web::Response(QSharedPointer<QNetworkRequest>(new QNetworkRequest()), QSharedPointer<QBuffer>(new QBuffer())));
-    response->setReply(reply);
-    return response;
-}
-
 class MockClient : public click::web::Client
 {
 public:
@@ -76,6 +69,7 @@
     {
     }
 
+    MOCK_METHOD2(signUrl, std::string(const std::string&, const std::string&));
     // Mocking default arguments: https://groups.google.com/forum/#!topic/googlemock/XrabW20vV7o
     MOCK_METHOD6(callImpl, QSharedPointer<click::web::Response>(
         const std::string& iri,
@@ -102,6 +96,14 @@
 
     MOCK_METHOD1(has_header, bool(const std::string& header));
     MOCK_METHOD1(get_header, std::string(const std::string&header));
+
+    static QSharedPointer<click::web::Response> responseForReply(const QSharedPointer<click::network::Reply>& reply)
+    {
+        auto response = QSharedPointer<click::web::Response>(new click::web::Response(QSharedPointer<QNetworkRequest>(new QNetworkRequest()), QSharedPointer<QBuffer>(new QBuffer())));
+        response->setReply(reply);
+        return response;
+    }
+
 };
 
 }

=== modified file 'libclickscope/tests/test_bootstrap.cpp'
--- libclickscope/tests/test_bootstrap.cpp	2016-06-30 20:42:56 +0000
+++ libclickscope/tests/test_bootstrap.cpp	2016-08-24 21:39:08 +0000
@@ -70,7 +70,7 @@
 TEST_F(BootstrapTest, testBootstrapCallsWebservice)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::BOOTSTRAP_PATH), "GET", _, _, _, _))
             .Times(1)
@@ -81,7 +81,7 @@
 TEST_F(BootstrapTest, testBootstrapJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json(FAKE_JSON_BOOTSTRAP.c_str());
     EXPECT_CALL(reply.instance, readAll())

=== removed file 'libclickscope/tests/test_data.cpp.in'
--- libclickscope/tests/test_data.cpp.in	2014-05-26 14:27:31 +0000
+++ libclickscope/tests/test_data.cpp.in	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-
-#include "test_data.h"
-
-const std::string& testing::systemApplicationsDirectoryForTesting()
-{
-    static const std::string s{"@CMAKE_CURRENT_SOURCE_DIR@/applications/system"};
-    return s;
-}
-
-const std::string& testing::userApplicationsDirectoryForTesting()
-{
-    static const std::string s{"@CMAKE_CURRENT_SOURCE_DIR@/applications/user"};
-    return s;
-}

=== modified file 'libclickscope/tests/test_data.h'
--- libclickscope/tests/test_data.h	2014-05-26 14:27:31 +0000
+++ libclickscope/tests/test_data.h	2016-08-24 21:39:08 +0000
@@ -38,9 +38,6 @@
 const std::string FAKE_PATH = "fake/api/path";
 const std::string FAKE_QUERY = "FAKE_QUERY";
 const std::string FAKE_PACKAGENAME = "com.example.fakepackage";
-
-const std::string& systemApplicationsDirectoryForTesting();
-const std::string& userApplicationsDirectoryForTesting();
 }
 
 #endif // TEST_DATA_H

=== modified file 'libclickscope/tests/test_download_manager.cpp'
--- libclickscope/tests/test_download_manager.cpp	2016-05-10 13:42:12 +0000
+++ libclickscope/tests/test_download_manager.cpp	2016-08-24 21:39:08 +0000
@@ -63,6 +63,7 @@
 
     virtual void SetUp()
     {
+        sdmPtr.reset(new MockSystemDownloadManager());
         ssoPtr.reset(new MockCredentialsService());
         namPtr.reset(new MockNetworkAccessManager());
         clientPtr.reset(new NiceMock<MockClient>(namPtr));
@@ -76,138 +77,165 @@
 
 }
 
-TEST_F(DownloadManagerTest, testStartCallsWebservice)
+TEST_F(DownloadManagerTest, testStartCallsSignUrl)
 {
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
+    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
+    EXPECT_CALL(*sdmPtr, createDownload(_, _, _)).Times(1);
     dmPtr->start("", "", "",
                  [](std::string, click::DownloadManager::Error) {});
 }
 
-TEST_F(DownloadManagerTest, testStartCallbackCalled)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(0)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
-
-    dmPtr->start("", "", "",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->replyFinished();
-}
-
-TEST_F(DownloadManagerTest, testStartHTTPForbidden)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(403)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, start_callback(StartsWith("Unhandled HTTP response code:"),
-                                      click::DownloadManager::Error::DownloadInstallError)).Times(1);
-
-    dmPtr->start("", "", "",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->replyFinished();
-}
-
-TEST_F(DownloadManagerTest, testStartHTTPError)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, errorString())
-        .WillOnce(Return(QString("ERROR")));
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(404)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*this, start_callback("ERROR (203)",
-                                      click::DownloadManager::Error::DownloadInstallError)).Times(1);
-
-    dmPtr->start("", "", "",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->errorHandler(QNetworkReply::ContentNotFoundError);
-}
-
-TEST_F(DownloadManagerTest, testStartCredentialsError)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, errorString())
-        .WillOnce(Return(QString("ERROR")));
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(401)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-    EXPECT_CALL(*ssoPtr, invalidateCredentials());
-    EXPECT_CALL(*this, start_callback("ERROR (201)",
-                                      click::DownloadManager::Error::CredentialsError)).Times(1);
-
-    dmPtr->start("", "", "test.package",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->errorHandler(QNetworkReply::ContentAccessDenied);
-}
-
-// FIXME: createDownload() SEGV under tests
-TEST_F(DownloadManagerTest, DISABLED_testStartDownloadCreated)
-{
-    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
-
-    EXPECT_CALL(reply.instance, rawHeader(QByteArray("X-Click-Token")))
-        .Times(1)
-        .WillOnce(Return(QString("clicktoken")));
-    EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
-    EXPECT_CALL(reply.instance, readAll())
-            .Times(1)
-            .WillOnce(Return(""));
-    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
-            .Times(1)
-            .WillOnce(Return(response));
-
-    EXPECT_CALL(*sdmPtr, createDownload(_, _, _));
-    dmPtr->start("", "", "test.package",
-                 [this](std::string msg, click::DownloadManager::Error err) {
-                     start_callback(msg, err);
-                 });
-    response->replyFinished();
-}
-
-// FIXME: getAllDownloadsWithMetadata() SEGV under tests
-TEST_F(DownloadManagerTest, DISABLED_testGetProgressNoDownloads)
+TEST_F(DownloadManagerTest, testStartDownloadSuccssIsError)
+{
+    auto mockDownload = new MockDownload();
+    auto mockError = new MockError();
+    EXPECT_CALL(*mockDownload, isError())
+        .Times(1)
+        .WillOnce(Return(true));
+    EXPECT_CALL(*mockDownload, error())
+        .Times(1)
+        .WillOnce(Return(mockError));
+    EXPECT_CALL(*mockError, errorString())
+        .Times(1)
+        .WillOnce(Return(QStringLiteral("")));
+
+    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
+    EXPECT_CALL(*sdmPtr, createDownload(_, _, _))
+        .Times(1)
+        .WillOnce(InvokeArgument<1>(mockDownload));
+    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
+
+    dmPtr->start("", "", "",
+                 [this](std::string msg, click::DownloadManager::Error err) {
+                     start_callback(msg, err);
+                 });
+
+    delete mockError;
+    delete mockDownload;
+}
+
+TEST_F(DownloadManagerTest, testStartDownloadSuccssCallsStart)
+{
+    auto mockDownload = new MockDownload();
+    EXPECT_CALL(*mockDownload, isError())
+        .Times(1)
+        .WillOnce(Return(false));
+    EXPECT_CALL(*mockDownload, start()).Times(1);
+    EXPECT_CALL(*mockDownload, id())
+        .Times(1)
+        .WillOnce(Return(QStringLiteral("download")));
+
+    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
+    EXPECT_CALL(*sdmPtr, createDownload(_, _, _))
+        .Times(1)
+        .WillOnce(InvokeArgument<1>(mockDownload));
+    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
+
+    dmPtr->start("", "", "",
+                 [this](std::string msg, click::DownloadManager::Error err) {
+                     start_callback(msg, err);
+                 });
+
+    delete mockDownload;
+}
+
+TEST_F(DownloadManagerTest, testStartErrorCallback)
+{
+    auto mockDownload = new MockDownload();
+    auto mockError = new MockError();
+    EXPECT_CALL(*mockDownload, error())
+        .Times(1)
+        .WillOnce(Return(mockError));
+    EXPECT_CALL(*mockError, errorString())
+        .Times(1)
+        .WillOnce(Return(QStringLiteral("")));
+
+    EXPECT_CALL(*clientPtr, signUrl(_, "GET")).Times(1);
+    EXPECT_CALL(*sdmPtr, createDownload(_, _, _))
+        .Times(1)
+        .WillOnce(InvokeArgument<2>(mockDownload));
+    EXPECT_CALL(*this, start_callback(_, _)).Times(1);
+
+    dmPtr->start("", "", "",
+                 [this](std::string msg, click::DownloadManager::Error err) {
+                     start_callback(msg, err);
+                 });
+
+    delete mockError;
+    delete mockDownload;
+}
+
+TEST_F(DownloadManagerTest, testGetProgressDownloadFound)
+{
+    auto mockDownloadsList = new MockDownloadsList();
+    auto mockDownload = QSharedPointer<MockDownload>(new MockDownload());
+
+    QList<QSharedPointer<Ubuntu::DownloadManager::Download>> downloads{mockDownload};
+
+    EXPECT_CALL(*mockDownload, id())
+        .Times(1)
+        .WillOnce(Return("download"));
+    EXPECT_CALL(*mockDownloadsList, downloads())
+        .Times(1)
+        .WillOnce(Return(downloads));
+    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
+        .Times(1)
+        .WillOnce(InvokeArgument<2>(QStringLiteral(""), QStringLiteral(""),
+                                    mockDownloadsList));
+    dmPtr->get_progress("com.example.test",
+                        [this](std::string object_path) {
+                            progress_callback(object_path);
+                        });
+
+    delete mockDownloadsList;
+}
+
+TEST_F(DownloadManagerTest, testGetProgressMultipleDownloadsFound)
+{
+    auto mockDownloadsList = new MockDownloadsList();
+    auto mockDownload = QSharedPointer<MockDownload>(new MockDownload());
+    auto mockDownload2 = QSharedPointer<MockDownload>(new MockDownload());
+
+    QList<QSharedPointer<Ubuntu::DownloadManager::Download>> downloads{mockDownload, mockDownload2};
+
+    EXPECT_CALL(*mockDownload, id())
+        .Times(1)
+        .WillOnce(Return("download"));
+    EXPECT_CALL(*mockDownloadsList, downloads())
+        .Times(1)
+        .WillOnce(Return(downloads));
+    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
+        .Times(1)
+        .WillOnce(InvokeArgument<2>(QStringLiteral(""), QStringLiteral(""),
+                                    mockDownloadsList));
+    dmPtr->get_progress("com.example.test",
+                        [this](std::string object_path) {
+                            progress_callback(object_path);
+                        });
+
+    delete mockDownloadsList;
+}
+
+TEST_F(DownloadManagerTest, testGetProgressNoDownloadsFound)
+{
+    auto mockDownloadsList = new MockDownloadsList();
+    QList<QSharedPointer<Ubuntu::DownloadManager::Download>> emptyDownloads{};
+    EXPECT_CALL(*mockDownloadsList, downloads())
+        .Times(1)
+        .WillOnce(Return(emptyDownloads));
+    EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
+        .Times(1)
+        .WillOnce(InvokeArgument<2>(QStringLiteral(""), QStringLiteral(""),
+                                    mockDownloadsList));
+    dmPtr->get_progress("com.example.test",
+                        [this](std::string object_path) {
+                            progress_callback(object_path);
+                        });
+
+    delete mockDownloadsList;
+}
+
+TEST_F(DownloadManagerTest, testGetProgressErrorCallback)
 {
     EXPECT_CALL(*sdmPtr, getAllDownloadsWithMetadata(_, _, _, _))
         .Times(1)

=== modified file 'libclickscope/tests/test_index.cpp'
--- libclickscope/tests/test_index.cpp	2016-05-10 13:42:12 +0000
+++ libclickscope/tests/test_index.cpp	2016-08-24 21:39:08 +0000
@@ -97,7 +97,7 @@
 TEST_F(IndexTest, testSearchCallsWebservice)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -120,7 +120,7 @@
 TEST_F(IndexTest, testSearchQueryIsLowercase)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -139,7 +139,7 @@
 TEST_F(IndexTest, testSearchSignsCall)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -154,10 +154,160 @@
     indexPtr->search("", "", [](click::Packages, click::Packages) {});
 }
 
+TEST_F(IndexTest, testSearchSnapsCallsWebservice)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    indexPtr->search_snaps("", [](click::Packages, click::Packages) {});
+}
+
+TEST_F(IndexTest, testSearchSnapsSendsRightPath)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::SNAP_SEARCH_PATH),
+                                     _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    indexPtr->search_snaps("", [](click::Packages, click::Packages) {});
+}
+
+TEST_F(IndexTest, testSearchSnapsQueryIsLowercase)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, QueryContains("foobar")))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    indexPtr->search_snaps("FooBar", [](click::Packages, click::Packages) {});
+}
+
+
+TEST_F(IndexTest, testSearcSnapshSignsCall)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    indexPtr->search_snaps("", [](click::Packages, click::Packages) {});
+}
+
+TEST_F(IndexTest, testSearchSnapsIsCancellable)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+
+    auto search_operation = indexPtr->search_snaps("", [](click::Packages,
+                                                          click::Packages) {});
+    EXPECT_CALL(reply.instance, abort()).Times(1);
+    search_operation.cancel();
+}
+
+TEST_F(IndexTest, testSearchSnapsEmptyJsonIsParsed)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    QByteArray fake_json("[]");
+    EXPECT_CALL(reply.instance, readAll())
+            .Times(1)
+            .WillOnce(Return(fake_json));
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+    click::Packages empty_package_list;
+    EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
+
+    indexPtr->search_snaps("", [this](click::Packages packages,
+                                      click::Packages recommends){
+                               search_callback(packages, recommends);
+                           });
+    response->replyFinished();
+}
+
+TEST_F(IndexTest, testSearchSnapsNetworkErrorIgnored)
+{
+    LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
+    EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
+            .Times(1)
+            .WillOnce(Return(response));
+    EXPECT_CALL(reply.instance, errorString()).Times(1)
+        .WillOnce(Return("fake error"));
+    indexPtr->search_snaps("", [this](click::Packages packages,
+                                      click::Packages recommends){
+                               search_callback(packages, recommends);
+                           });
+
+    click::Packages empty_package_list;
+    EXPECT_CALL(*this, search_callback(empty_package_list, _)).Times(1);
+
+    emit reply.instance.error(QNetworkReply::UnknownNetworkError);
+}
+
 TEST_F(IndexTest, testBootstrapSignsCall)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -175,7 +325,7 @@
 TEST_F(IndexTest, testDepartmentsSignsCall)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -193,8 +343,14 @@
 TEST_F(IndexTest, testDetailsSignsCall)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     EXPECT_CALL(*clientPtr, callImpl(_, _, true, _, _, _))
             .Times(1)
             .WillOnce(Return(response));
@@ -205,7 +361,7 @@
 TEST_F(IndexTest, testSearchSendsRightPath)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -224,7 +380,7 @@
 TEST_F(IndexTest, testSearchCallbackIsCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json("[]");
     EXPECT_CALL(reply.instance, readAll())
@@ -251,7 +407,7 @@
 TEST_F(IndexTest, testSearchEmptyJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json("[]");
     EXPECT_CALL(reply.instance, readAll())
@@ -279,7 +435,7 @@
 TEST_F(IndexTest, testSearchSingleJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json(FAKE_JSON_SEARCH_RESULT_ONE.c_str());
     EXPECT_CALL(reply.instance, readAll())
@@ -315,7 +471,7 @@
 TEST_F(IndexTest, testSearchIsCancellable)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -341,7 +497,7 @@
 TEST_F(IndexTest, testSearchNetworkErrorIgnored)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*configPtr, get_architecture())
         .Times(1)
@@ -367,8 +523,14 @@
 TEST_F(IndexTest, testGetDetailsCallsWebservice)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
             .WillOnce(Return(response));
@@ -379,8 +541,14 @@
 TEST_F(IndexTest, testGetDetailsSendsPackagename)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     EXPECT_CALL(*clientPtr, callImpl(EndsWith(FAKE_PACKAGENAME),
                                      _, _, _, _, _))
             .Times(1)
@@ -392,8 +560,14 @@
 TEST_F(IndexTest, testGetDetailsSendsRightPath)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     EXPECT_CALL(*clientPtr, callImpl(StartsWith(click::SEARCH_BASE_URL +
                                                 click::DETAILS_PATH),
                                      _, _, _, _, _))
@@ -406,8 +580,14 @@
 TEST_F(IndexTest, testGetDetailsCallbackIsCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     QByteArray fake_json(FAKE_JSON_PACKAGE_DETAILS.c_str());
     EXPECT_CALL(reply.instance, readAll())
             .Times(1)
@@ -425,8 +605,14 @@
 TEST_F(IndexTest, testGetDetailsJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     QByteArray fake_json(FAKE_JSON_PACKAGE_DETAILS.c_str());
     EXPECT_CALL(reply.instance, readAll())
             .Times(1)
@@ -486,7 +672,14 @@
 TEST_F(IndexTest, testGetDetailsJsonUtf8)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
+
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
 
     QByteArray appname_utf8("\xe5\xb0\x8f\xe6\xb5\xb7");
     QByteArray appname_json("\\u5c0f\\u6d77");
@@ -554,8 +747,14 @@
 TEST_F(IndexTest, testGetDetailsNetworkErrorReported)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
             .WillOnce(Return(response));
@@ -571,8 +770,14 @@
 TEST_F(IndexTest, testGetDetailsIsCancellable)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
+    EXPECT_CALL(*configPtr, get_architecture())
+        .Times(1)
+        .WillOnce(Return(fake_arch));
+    EXPECT_CALL(*configPtr, get_available_frameworks())
+        .Times(1)
+        .WillOnce(Return(fake_frameworks));
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
             .WillOnce(Return(response));

=== modified file 'libclickscope/tests/test_interface.cpp'
--- libclickscope/tests/test_interface.cpp	2016-07-11 19:12:17 +0000
+++ libclickscope/tests/test_interface.cpp	2016-08-24 21:39:08 +0000
@@ -28,6 +28,7 @@
  */
 
 #include "fake_json.h"
+#include "mock_ual.h"
 #include "test_data.h"
 
 #include <QCoreApplication>
@@ -41,7 +42,6 @@
 #include <gtest/gtest.h>
 
 #include <click/interface.h>
-#include <click/key_file_locator.h>
 #include <click/departments-db.h>
 
 using namespace click;
@@ -99,30 +99,6 @@
 {
 const std::string emptyQuery{};
 
-struct MockKeyFileLocator : public click::KeyFileLocator
-{
-    typedef click::KeyFileLocator Super;
-
-    MockKeyFileLocator()
-    {
-        using namespace ::testing;
-
-        ON_CALL(*this, enumerateKeyFilesForInstalledApplications(_))
-                .WillByDefault(
-                    Invoke(
-                        this,
-                        &MockKeyFileLocator::doEnumerateKeyFilesForInstalledApplications));
-    }
-
-    MOCK_METHOD1(enumerateKeyFilesForInstalledApplications,
-                 void(const Super::Enumerator&));
-
-    void doEnumerateKeyFilesForInstalledApplications(const Super::Enumerator& enumerator)
-    {
-        Super::enumerateKeyFilesForInstalledApplications(enumerator);
-    }
-};
-
 class ClickInterfaceTest : public ::testing::Test {
 public:
     MOCK_METHOD2(manifest_callback, void(Manifest, InterfaceError));
@@ -136,11 +112,10 @@
 
 class FakeClickInterface : public click::Interface {
 public:
-    FakeClickInterface(const QSharedPointer<KeyFileLocator>& keyFileLocator) : Interface(keyFileLocator) {}
     FakeClickInterface() {}
 
-    MOCK_METHOD0(show_desktop_apps, bool());
-    MOCK_METHOD2(run_process, void(const std::string&, std::function<void(int, const std::string&, const std::string&)>));
+    MOCK_METHOD1(get_manifest_json, std::string(const std::string&));
+    MOCK_METHOD0(installed_apps, std::list<std::shared_ptr<ual::Application>>());
 };
 
 TEST(ClickInterface, testIsNonClickAppFalse)
@@ -154,114 +129,104 @@
     // If this ever breaks, something is very very wrong.
     for (const auto& element : nonClickDesktopFiles())
     {
-        QString filename = element.c_str();
-        EXPECT_TRUE(Interface::is_non_click_app(filename));
+        EXPECT_TRUE(Interface::is_non_click_app(element));
     }
 }
 
-TEST(ClickInterface, testCallsIntoKeyFileLocatorForFindingInstalledApps)
-{
-    using namespace ::testing;
-    MockKeyFileLocator mockKeyFileLocator;
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                &mockKeyFileLocator,
-                [](click::KeyFileLocator*){});
-
-
-    FakeClickInterface iface(keyFileLocator);
-    EXPECT_CALL(iface, show_desktop_apps())
-            .Times(1)
-            .WillOnce(Return(false));
-
-    EXPECT_CALL(mockKeyFileLocator, enumerateKeyFilesForInstalledApplications(_)).Times(1);
-
-    iface.find_installed_apps(emptyQuery);
-}
-
 TEST(ClickInterface, testFindAppsInDirEmpty)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("xyzzygy");
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{}));
+    auto results = iface.search("xyzzygy");
 
     EXPECT_TRUE(results.empty());
 }
 
 TEST_F(ClickInterfaceTest, testFindAppsInDirIgnoredApps)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
+    FakeClickInterface iface;
+    std::list<std::shared_ptr<ual::Application>> applist{
+        MockUALApplication::create(ual::AppID::parse("com.ubuntu.calculator_calculator_0.1"),
+                                   std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Calculator", "The calculator", "/opt/click.ubuntu.com/foo/bar/calculator.png")}),
+        MockUALApplication::create(ual::AppID::find("webbrowser-app"),
+                                   std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Browser", "The browser", "webbrowser-app")}),
+        MockUALApplication::create(ual::AppID::find("messaging-app"),
+                                   std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Messaging", "Your messages", "messaging-app")}),
+    };
 
-    click::Interface iface(keyFileLocator);
     ignoredApps.push_back("messaging-app.desktop");
     ignoredApps.push_back("com.ubuntu.calculator");
 
-    auto results = iface.find_installed_apps("", ignoredApps);
-    EXPECT_EQ(20, results.size());
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(applist));
+    auto results = iface.search("", ignoredApps);
+    ASSERT_EQ(1, results.size());
 }
 
 TEST_F(ClickInterfaceTest, testFindClockUsesShortAppid)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("Clock");
-    EXPECT_EQ(1u, results.size());
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::parse("com.ubuntu.clock_clock_0.1"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Clock", "The clock", "/opt/click.ubuntu.com/foo/bar/clock.png")}),
+                        }));
+    auto results = iface.search("Clock");
+    ASSERT_EQ(1u, results.size());
     EXPECT_EQ("appid://com.ubuntu.clock/clock/current-user-version", results.begin()->url);
 }
 
 TEST_F(ClickInterfaceTest, testFindLegacyAppUsesDeskopId)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("Messaging");
-    EXPECT_EQ(1u, results.size());
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::find("messaging-app"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Messaging", "Your messages", "messaging-app")})
+                        }));
+    auto results = iface.search("Messaging");
+    ASSERT_EQ(1u, results.size());
     EXPECT_EQ("application:///messaging-app.desktop", results.begin()->url);
 }
 
-//
 // test that application with a default department id key in the desktop
 // file is returned when department matches
 TEST_F(ClickInterfaceTest, testFindAppsWithAppWithDefaultDepartmentId)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
+    FakeClickInterface iface;
+
+    auto mockapp = MockUALApplication::create(ual::AppID::find("address-book-app"),
+                                              std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Contacts", "Address book", "address-book-app")});
+
+    auto dept = ual::Application::Info::DefaultDepartment::from_raw("accessories");
+    DefaultValue<const ual::Application::Info::DefaultDepartment&>::Set(dept);
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{mockapp}));
 
     auto depts_db = std::make_shared<click::DepartmentsDb>(":memory:");
-    auto results = iface.find_installed_apps("", ignoredApps, "accessories", depts_db);
+    auto results = iface.search("", ignoredApps, "accessories", depts_db);
 
-    EXPECT_EQ(1u, results.size());
+    ASSERT_EQ(1u, results.size());
     EXPECT_EQ("Contacts", results.begin()->title);
 }
 
 TEST_F(ClickInterfaceTest, testFindAppsWithAppWithDefaultDepartmentIdOverriden)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
+    FakeClickInterface iface;
+
+    auto mockapp = MockUALApplication::create(ual::AppID::find("address-book-app"),
+                                              std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Contacts", "Address book", "address-book-app")});
+
+    auto dept = ual::Application::Info::DefaultDepartment::from_raw("accessories");
+    DefaultValue<const ual::Application::Info::DefaultDepartment&>::Set(dept);
+
+    EXPECT_CALL(iface, installed_apps()).
+        WillRepeatedly(Return(std::list<std::shared_ptr<ual::Application>>{mockapp}));
 
     auto depts_db = std::make_shared<click::DepartmentsDb>(":memory:");
 
@@ -270,32 +235,42 @@
     depts_db->store_department_mapping("utilities", "");
     depts_db->store_department_mapping("accessories", "");
 
-    auto results = iface.find_installed_apps("", ignoredApps, "utilies", depts_db);
-    EXPECT_EQ(0, results.size());
+    auto results = iface.search("", ignoredApps, "utilies", depts_db);
+    ASSERT_EQ(0, results.size());
 
     // address book applicaton moved to utilities
     depts_db->store_package_mapping("address-book-app.desktop", "utilities");
-    results = iface.find_installed_apps("", ignoredApps, "utilities", depts_db);
+    results = iface.search("", ignoredApps, "utilities", depts_db);
 
-    EXPECT_EQ(1u, results.size());
+    ASSERT_EQ(1u, results.size());
     EXPECT_EQ("Contacts", results.begin()->title);
 }
 
 TEST(ClickInterface, testFindAppsInDirSorted)
 {
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("ock");
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::parse("com.ubuntu.clock_clock_0.1"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Clock", "The clock", "/opt/click.ubuntu.com/foo/bar/clock.png")}),
+                    MockUALApplication::create(ual::AppID::find("address-book-app"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Contacts", "Address book", "address-book-app")}),
+                     MockUALApplication::create(ual::AppID::parse("com.ubuntu.stock-ticker-mobile_stockticker_0.1"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Stock Ticker", "A stock ticker.", "/opt/click.ubuntu.com/foo/bar/stock_icon_48.png")}),
+                       }));
+
+    auto results = iface.search("ock");
 
     const std::vector<click::Application> expected_results = {
-        {"com.ubuntu.clock", "Clock", 0.0, "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.clock/./clock64.png", "application:///com.ubuntu.clock_clock_1.0.300.desktop", "", "", ""},
+        {"com.ubuntu.clock", "Clock", 0.0,
+         "/opt/click.ubuntu.com/foo/bar/clock.png",
+         "appid://com.ubuntu.clock/clock/current-user-version",
+         "The clock", "", ""},
         {"com.ubuntu.stock-ticker-mobile", "Stock Ticker", 0.0,
-            "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.stock-ticker-mobile/icons/stock_icon_48.png", "application:///com.ubuntu.stock-ticker-mobile_stock-ticker-mobile_0.3.7.66.desktop", "An awesome Stock Ticker application with all the features you could imagine", "", ""},
+         "/opt/click.ubuntu.com/foo/bar/stock_icon_48.png",
+         "appid://com.ubuntu.stock-ticker-mobile/stockticker/current-user-version",
+         "A stock ticker.", "", ""},
     };
     EXPECT_EQ(expected_results, results);
 }
@@ -382,58 +357,70 @@
     ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
 }
 
-TEST(ClickInterface, testFindAppByKeyword)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("rss");
-
-    EXPECT_EQ(1, results.size());
-}
-
-TEST(ClickInterface, testFindAppByKeywordCaseInsensitive)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("RsS");
-
-    EXPECT_EQ(1, results.size());
-}
-
-TEST(ClickInterface, testFindAppAccented)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("Cámara");
-
-    EXPECT_EQ(1, results.size());
-}
-
-TEST(ClickInterface, testFindAppAccented2)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    click::Interface iface(keyFileLocator);
-
-    auto results = iface.find_installed_apps("Camara");
+TEST_F(ClickInterfaceTest, testFindAppByKeyword)
+{
+    FakeClickInterface iface;
+
+    auto mockapp = MockUALApplication::create(ual::AppID::parse("com.ubuntu.camera_camera_5"),
+                                              std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Cámara", "La cámara", "/opt/click.ubuntu.com/foo/bar/camera.png")});
+
+    std::vector<std::string>keys{"foo", "bar", "rss", "baz"};
+    auto mockkw = ual::Application::Info::Keywords::from_raw(keys);
+    DefaultValue<const ual::Application::Info::Keywords&>::Set(mockkw);
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{mockapp}));
+
+    auto results = iface.search("rss");
+
+    EXPECT_EQ(1, results.size());
+}
+
+TEST_F(ClickInterfaceTest, testFindAppByKeywordCaseInsensitive)
+{
+    FakeClickInterface iface;
+
+    auto mockapp = MockUALApplication::create(ual::AppID::parse("com.ubuntu.camera_camera_5"),
+                                              std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Cámara", "La cámara", "/opt/click.ubuntu.com/foo/bar/camera.png")});
+
+    std::vector<std::string>keys{"foo", "bar", "rss", "baz"};
+    auto mockkw = ual::Application::Info::Keywords::from_raw(keys);
+    DefaultValue<const ual::Application::Info::Keywords&>::Set(mockkw);
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{mockapp}));
+
+    auto results = iface.search("RsS");
+
+    EXPECT_EQ(1, results.size());
+}
+
+TEST_F(ClickInterfaceTest, testFindAppAccented)
+{
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::parse("com.ubuntu.camera_camera_5"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Cámara", "La cámara", "/opt/click.ubuntu.com/foo/bar/camera.png")}),
+                        }));
+
+    auto results = iface.search("Cámara");
+
+    EXPECT_EQ(1, results.size());
+}
+
+TEST_F(ClickInterfaceTest, testFindAppAccented2)
+{
+    FakeClickInterface iface;
+
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::parse("com.ubuntu.camera_camera_5"),
+                                               std::shared_ptr<MockUALApplication::MockInfo>{new MockUALApplication::MockInfo("Cámara", "La cámara", "/opt/click.ubuntu.com/foo/bar/camera.png")}),
+                        }));
+
+    auto results = iface.search("Camara");
 
     EXPECT_EQ(1, results.size());
 }
@@ -453,130 +440,6 @@
               Interface::add_theme_scheme("/usr/share/unity8/graphics/applicationIcons/[e-mail]"));
 }
 
-std::vector<click::Application> find_installed_apps(const std::string& query, bool include_desktop_results)
-{
-    using namespace ::testing;
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(
-                new click::KeyFileLocator(
-                    testing::systemApplicationsDirectoryForTesting(),
-                    testing::userApplicationsDirectoryForTesting()));
-
-    FakeClickInterface iface(keyFileLocator);
-    EXPECT_CALL(iface, show_desktop_apps())
-            .Times(1)
-            .WillOnce(Return(include_desktop_results));
-
-    return iface.find_installed_apps(query);
-}
-
-TEST(ClickInterface, testFindInstalledAppsOnPhone)
-{
-    auto result = find_installed_apps(emptyQuery, false);
-
-    EXPECT_TRUE(result.size() > 0);
-
-    for (const auto& app : non_desktop_applications)
-    {
-        qDebug() << "comparing" << QString::fromStdString(app.title);
-        EXPECT_NE(result.end(), std::find(result.begin(), result.end(), app));
-    }
-
-    EXPECT_EQ(result.end(), std::find(result.begin(), result.end(), desktop_application));
-}
-
-TEST(ClickInterface, testFindInstalledAppsOnDesktop)
-{
-    auto result = find_installed_apps(emptyQuery, true);
-
-    std::vector<click::Application> expected_apps(non_desktop_applications);
-    expected_apps.push_back(desktop_application);
-
-    EXPECT_TRUE(result.size() > 0);
-
-    for (const auto& app : expected_apps)
-    {
-        qDebug() << "comparing" << QString::fromStdString(app.title);
-        EXPECT_NE(result.end(), std::find(result.begin(), result.end(), app));
-    }
-}
-
-TEST(ClickInterface, testInlineTranslationsLoaded)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    auto nodisplay = testing::systemApplicationsDirectoryForTesting() + "/translated.desktop";
-    unity::util::IniParser parser(nodisplay.data());
-
-    ASSERT_EQ(setenv(Configuration::LANGUAGE_ENVVAR, "es_ES.UTF-8", 1), 0);
-    auto app = iface.load_app_from_desktop(parser, nodisplay);
-    EXPECT_EQ("Translated App in Spanish", app.title);
-    EXPECT_EQ("Translated application in Spanish", app.description);
-    ASSERT_EQ(unsetenv(Configuration::LANGUAGE_ENVVAR), 0);
-}
-
-TEST(ClickInterface, testIncludeInResultsNoDisplayTrue)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    auto nodisplay = testing::userApplicationsDirectoryForTesting() + "/non-click-app-nodisplay.desktop";
-    unity::util::IniParser parser(nodisplay.data());
-
-    EXPECT_FALSE(iface.is_visible_app(parser));
-}
-
-TEST(ClickInterface, testIncludeInResultsOnlyShowInGnome)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    auto nodisplay = testing::userApplicationsDirectoryForTesting() + "/non-click-app-onlyshowin-gnome.desktop";
-    unity::util::IniParser parser(nodisplay.data());
-
-    EXPECT_FALSE(iface.is_visible_app(parser));
-}
-
-TEST(ClickInterface, testIncludeInResultsOnlyShowInGnomeUnity)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    auto nodisplay = testing::userApplicationsDirectoryForTesting() + "/non-click-app-onlyshowin-gnome-unity.desktop";
-    unity::util::IniParser parser(nodisplay.data());
-
-    EXPECT_TRUE(iface.is_visible_app(parser));
-}
-
-TEST(ClickInterface, testIncludeInResultsOnlyShowInUnity)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    auto nodisplay = testing::userApplicationsDirectoryForTesting() + "/non-click-app-onlyshowin-unity.desktop";
-    unity::util::IniParser parser(nodisplay.data());
-
-    EXPECT_TRUE(iface.is_visible_app(parser));
-}
-
-TEST(ClickInterface, testEnableDesktopApps)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    setenv(Interface::ENV_SHOW_DESKTOP_APPS, "YesPlease", true);
-    EXPECT_TRUE(iface.show_desktop_apps());
-}
-
-TEST(ClickInterface, testDisableDesktopApps)
-{
-    QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    click::Interface iface(keyFileLocator);
-
-    unsetenv(Interface::ENV_SHOW_DESKTOP_APPS);
-    EXPECT_FALSE(iface.show_desktop_apps());
-}
-
 TEST(ClickInterface, testManifestFromJsonOneApp)
 {
     Manifest m = manifest_from_json(FAKE_JSON_MANIFEST_ONE_APP);
@@ -611,25 +474,12 @@
     ASSERT_TRUE(m.has_any_scopes());
 }
 
-TEST(ClickInterface, testGetManifestForAppCorrectCommand)
-{
-    FakeClickInterface iface;
-    std::string command = "click info " + FAKE_PACKAGENAME;
-    EXPECT_CALL(iface, run_process(command, _)).
-        Times(1);
-    iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest, InterfaceError){});
-}
-
 TEST_F(ClickInterfaceTest, testGetManifestForAppParseError)
 {
     FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
+    EXPECT_CALL(iface, get_manifest_json(_)).
         Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, "INVALID JSON", "");
-                        }));
+        WillOnce(Return("INVALID JSON"));
     EXPECT_CALL(*this, manifest_callback(_, InterfaceError::ParseError));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [this](Manifest manifest,
                                                         InterfaceError error){
@@ -637,33 +487,12 @@
                                });
 }
 
-TEST_F(ClickInterfaceTest, testGetManifestForAppCommandFailed)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(-1, "", "CRITICAL: FAIL");
-                        }));
-    EXPECT_CALL(*this, manifest_callback(_, InterfaceError::CallError));
-    iface.get_manifest_for_app(FAKE_PACKAGENAME, [this](Manifest manifest,
-                                                        InterfaceError error){
-                                   manifest_callback(manifest, error);
-                               });
-}
-
 TEST_F(ClickInterfaceTest, testGetManifestForAppIsRemovable)
 {
     FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
+    EXPECT_CALL(iface, get_manifest_json(_)).
         Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, FAKE_JSON_MANIFEST_REMOVABLE, "");
-                        }));
+        WillOnce(Return(FAKE_JSON_MANIFEST_REMOVABLE));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest manifest,
                                                     InterfaceError error){
                                    ASSERT_TRUE(error == InterfaceError::NoError);
@@ -674,13 +503,9 @@
 TEST_F(ClickInterfaceTest, testGetManifestForAppIsNotRemovable)
 {
     FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
+    EXPECT_CALL(iface, get_manifest_json(_)).
         Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, FAKE_JSON_MANIFEST_NONREMOVABLE, "");
-                        }));
+        WillOnce(Return(FAKE_JSON_MANIFEST_NONREMOVABLE));
     iface.get_manifest_for_app(FAKE_PACKAGENAME, [](Manifest manifest,
                                                     InterfaceError error){
                                    ASSERT_TRUE(error == InterfaceError::NoError);
@@ -688,125 +513,16 @@
                                });
 }
 
-TEST(ClickInterface, testGetManifestsCorrectCommand)
-{
-    FakeClickInterface iface;
-    std::string command = "click list --manifest";
-    EXPECT_CALL(iface, run_process(command, _)).
-        Times(1);
-    iface.get_manifests([](ManifestList, InterfaceError){});
-}
-
-TEST_F(ClickInterfaceTest, testGetManifestsParseError)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, "INVALID JSON", "");
-                        }));
-    EXPECT_CALL(*this, manifests_callback(_, InterfaceError::ParseError));
-    iface.get_manifests([this](ManifestList manifests, InterfaceError error){
-            manifests_callback(manifests, error);
-        });
-}
-
-TEST_F(ClickInterfaceTest, testGetManifestsCommandFailed)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(-1, "", "CRITICAL: FAIL");
-                        }));
-    EXPECT_CALL(*this, manifests_callback(_, InterfaceError::CallError));
-    iface.get_manifests([this](ManifestList manifests, InterfaceError error){
-            manifests_callback(manifests, error);
-        });
-}
-
-TEST_F(ClickInterfaceTest, testGetManifestsParsed)
-{
-    FakeClickInterface iface;
-    std::string expected_str = "[" + FAKE_JSON_MANIFEST_NONREMOVABLE + "," +
-        FAKE_JSON_MANIFEST_REMOVABLE + "]";
-    ManifestList expected = manifest_list_from_json(expected_str);
-
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, expected_str, "");
-                        }));
-    iface.get_manifests([expected](ManifestList manifests, InterfaceError error){
-            ASSERT_TRUE(error == InterfaceError::NoError);
-            ASSERT_TRUE(manifests.size() == expected.size());
-        });
-}
-
-TEST(ClickInterface, testGetInstalledPackagesCorrectCommand)
-{
-    FakeClickInterface iface;
-    std::string command = "click list";
-    EXPECT_CALL(iface, run_process(command, _)).
-        Times(1);
-    iface.get_installed_packages([](PackageSet, InterfaceError){});
-}
-
-TEST_F(ClickInterfaceTest, testGetInstalledPackagesParseError)
-{
-    FakeClickInterface iface;
-    std::string bad_stdout = "INVALID: err\nvalid.package\t1.0\n";
-    PackageSet expected{{"valid.package", "1.0"}};
-
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, bad_stdout, "");
-                        }));
-    EXPECT_CALL(*this, installed_callback(_, InterfaceError::NoError));
-    iface.get_installed_packages([this, expected](PackageSet package_names, InterfaceError error){
-            installed_callback(package_names, error);
-            ASSERT_EQ(package_names, expected);
-        });
-}
-
-TEST_F(ClickInterfaceTest, testGetInstalledPackagesCommandFailed)
-{
-    FakeClickInterface iface;
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(-1, "", "CRITICAL: FAIL");
-                        }));
-    EXPECT_CALL(*this, installed_callback(_, InterfaceError::CallError));
-    iface.get_installed_packages([this](PackageSet package_names, InterfaceError error){
-            installed_callback(package_names, error);
-        });
-}
-
 TEST_F(ClickInterfaceTest, testGetInstalledPackagesParsed)
 {
     FakeClickInterface iface;
-    std::string sample_stdout = "ABC\t0.1\nDEF\t0.2\n";
-    PackageSet expected{{"ABC", "0.1"}, {"DEF", "0.2"}};
+    PackageSet expected{{"foo.bar", "0.1"}, {"baz.foo", "0.2"}};
 
-    EXPECT_CALL(iface, run_process(_, _)).
-        Times(1).
-        WillOnce(Invoke([&](const std::string&,
-                            std::function<void(int, const std::string&,
-                                               const std::string&)> callback){
-                            callback(0, sample_stdout, "");
-                        }));
+    EXPECT_CALL(iface, installed_apps()).Times(1).
+        WillOnce(Return(std::list<std::shared_ptr<ual::Application>>{
+                    MockUALApplication::create(ual::AppID::parse("foo.bar_foo_0.1")),
+                    MockUALApplication::create(ual::AppID::parse("baz.foo_foo_0.2"))
+                 }));
     iface.get_installed_packages([expected](PackageSet package_names, InterfaceError error){
             ASSERT_EQ(error, InterfaceError::NoError);
             ASSERT_EQ(package_names, expected);

=== modified file 'libclickscope/tests/test_pay.cpp'
--- libclickscope/tests/test_pay.cpp	2016-06-30 20:42:56 +0000
+++ libclickscope/tests/test_pay.cpp	2016-08-24 21:39:08 +0000
@@ -68,7 +68,7 @@
 TEST_F(PayTest, testPayPackageRefundCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
     EXPECT_FALSE(package->refund("foo"));
@@ -77,7 +77,7 @@
 TEST_F(PayTest, testPayPackageRefundNotCalledIfCallbackExists)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     std::string callback_id = std::string{"foo"} + pay::APPENDAGE_REFUND;
     package->callbacks[callback_id] = [](const std::string&, bool) {};
@@ -88,7 +88,7 @@
 TEST_F(PayTest, testRefundReturnsTrueForPurchasedItem)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     package->success = true;
     EXPECT_CALL(*package, do_pay_package_refund("foo")).Times(1);
@@ -98,7 +98,7 @@
 TEST_F(PayTest, testPayPackageVerifyCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
     EXPECT_FALSE(package->verify("foo"));
@@ -107,7 +107,7 @@
 TEST_F(PayTest, testPayPackageVerifyNotCalledIfCallbackExists)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     std::string callback_id = std::string{"foo"} + pay::APPENDAGE_VERIFY;
     package->callbacks[callback_id] = [](const std::string&, bool) {};
@@ -118,7 +118,7 @@
 TEST_F(PayTest, testVerifyReturnsTrueForPurchasedItem)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     package->success = true;
     EXPECT_CALL(*package, do_pay_package_verify("foo")).Times(1);
@@ -128,7 +128,7 @@
 TEST_F(PayTest, testGetPurchasesCallsWebservice)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
@@ -140,7 +140,7 @@
 TEST_F(PayTest, testGetPurchasesSendsCorrectPath)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(EndsWith(pay::PURCHASES_API_PATH),
                                      _, _, _, _, _))
@@ -153,7 +153,7 @@
 TEST_F(PayTest, testGetPurchasesCallbackCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json("[]");
     EXPECT_CALL(reply.instance, readAll())
@@ -173,7 +173,7 @@
 TEST_F(PayTest, testGetPurchasesEmptyJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json("[]");
     EXPECT_CALL(reply.instance, readAll())
@@ -194,7 +194,7 @@
 TEST_F(PayTest, testGetPurchasesSingleJsonIsParsedNullTimestamp)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json(FAKE_PURCHASES_LIST_JSON_NULL_TIMESTAMP);
     EXPECT_CALL(reply.instance, readAll())
@@ -215,7 +215,7 @@
 TEST_F(PayTest, testGetPurchasesTimestampIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json(FAKE_PURCHASES_LIST_JSON);
     EXPECT_CALL(reply.instance, readAll())
@@ -237,7 +237,7 @@
 TEST_F(PayTest, testGetPurchasesIsCancellable)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)

=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2016-07-13 20:30:09 +0000
+++ libclickscope/tests/test_preview.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -64,7 +64,7 @@
     FakeIndex() {
 
     }
-    click::web::Cancellable get_details(const std::string& /*package_name*/, std::function<void(click::PackageDetails, Error)> callback, bool) override {
+    click::web::Cancellable get_details(const std::string& /*package_name*/, std::function<void(click::PackageDetails, Error)> callback, bool, bool) override {
         callback(click::PackageDetails(), Error::NetworkError);
         return click::web::Cancellable();
     }

=== modified file 'libclickscope/tests/test_reviews.cpp'
--- libclickscope/tests/test_reviews.cpp	2016-05-10 13:42:12 +0000
+++ libclickscope/tests/test_reviews.cpp	2016-08-24 21:39:08 +0000
@@ -140,7 +140,7 @@
 TEST_F(ReviewsTest, testFetchReviewsCallsWebservice)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
@@ -153,7 +153,7 @@
 TEST_F(ReviewsTest, testFetchReviewsDoesNotSignCall)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(_, _, false, _, _, _))
             .Times(1)
@@ -166,7 +166,7 @@
 TEST_F(ReviewsTest, testFetchReviewsSendsQueryAsParam)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::web::CallParams params;
     params.add(click::REVIEWS_QUERY_ARGNAME, FAKE_PACKAGENAME);
@@ -181,7 +181,7 @@
 TEST_F(ReviewsTest, testFetchReviewsSendsCorrectPath)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(EndsWith(click::REVIEWS_API_PATH),
                                      _, _, _, _, _))
@@ -195,7 +195,7 @@
 TEST_F(ReviewsTest, testFetchReviewsCallbackCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json("[]");
     EXPECT_CALL(reply.instance, readAll())
@@ -216,7 +216,7 @@
 TEST_F(ReviewsTest, testFetchReviewsNot200)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(301)));
     EXPECT_CALL(reply.instance, readAll())
@@ -238,7 +238,7 @@
 TEST_F(ReviewsTest, testFetchReviewsEmptyJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json("[]");
     EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
@@ -261,7 +261,7 @@
 TEST_F(ReviewsTest, testFetchReviewsSingleJsonIsParsed)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     QByteArray fake_json(FAKE_JSON_REVIEWS_RESULT_ONE.c_str());
     EXPECT_CALL(reply.instance, attribute(_)).WillOnce(Return(QVariant(200)));
@@ -295,7 +295,7 @@
 TEST_F(ReviewsTest, testFetchReviewsNetworkErrorReported)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
@@ -318,7 +318,7 @@
 TEST_F(ReviewsTest, testFetchReviewsIsCancellable)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     EXPECT_CALL(*clientPtr, callImpl(_, _, _, _, _, _))
             .Times(1)
@@ -333,7 +333,7 @@
 TEST_F(ReviewsTest, testSubmitReviewIsCancellable)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::Review review;
     review.rating = 3;
@@ -354,7 +354,7 @@
 TEST_F(ReviewsTest, testSubmitReviewUtf8)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::Review review;
     review.rating = 3;
@@ -378,7 +378,7 @@
 TEST_F(ReviewsTest, testSubmitReviewLanguageCorrect)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::Review review;
     review.rating = 3;
@@ -402,7 +402,7 @@
 TEST_F(ReviewsTest, testSubmitReviewLanguageCorrectForFullLangCodes)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::Review review;
     review.rating = 3;
@@ -428,7 +428,7 @@
 TEST_F(ReviewsTest, testEditReviewUrlHasReviewId)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::Review review;
     review.id = 1234;
@@ -448,7 +448,7 @@
 TEST_F(ReviewsTest, testEditReviewIsCancellable)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
-    auto response = responseForReply(reply.asSharedPtr());
+    auto response = MockClient::responseForReply(reply.asSharedPtr());
 
     click::Review review;
     review.id = 1234;

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2016-06-22 20:46:28 +0000
+++ scope/clickapps/apps-query.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -27,10 +27,12 @@
  * files in the program, then also delete it here.
  */
 
+#include "apps-query.h"
+
 #include <click/application.h>
 #include <click/departments-db.h>
 
-#include <click/key_file_locator.h>
+#include <QDebug>
 
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/CategorisedResult.h>
@@ -39,12 +41,11 @@
 #include <unity/scopes/SearchMetadata.h>
 #include <unity/scopes/Department.h>
 
+#include <locale>
+#include <memory>
 #include <vector>
-#include <locale>
 
 #include <click/click-i18n.h>
-#include "apps-query.h"
-#include <QDebug>
 
 namespace
 {
@@ -259,8 +260,7 @@
 
 click::Interface& click::apps::Query::clickInterfaceInstance()
 {
-    static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    static click::Interface iface(keyFileLocator);
+    static click::Interface iface;
 
     return iface;
 }
@@ -420,7 +420,7 @@
     const bool show_top_apps = querystr.empty() && current_dept.empty();
     ResultPusher pusher(searchReply, show_top_apps ? impl->configuration.get_core_apps() : std::vector<std::string>());
     auto const ignoredApps = impl->configuration.get_ignored_apps();
-    auto const localResults = clickInterfaceInstance().find_installed_apps(querystr, ignoredApps, current_dept, impl->depts_db);
+    auto const localResults = clickInterfaceInstance().search(querystr, ignoredApps, current_dept, impl->depts_db);
 
     if (impl->depts_db)
     {

=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2016-05-18 12:35:56 +0000
+++ scope/clickapps/apps-scope.cpp	2016-08-24 21:39:08 +0000
@@ -38,7 +38,6 @@
 
 #include <QSharedPointer>
 
-#include <click/key_file_locator.h>
 #include <click/network_access_manager.h>
 #include <click/click-i18n.h>
 #include <click/utils.h>

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2016-07-13 19:46:17 +0000
+++ scope/clickstore/store-query.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -32,7 +32,6 @@
 
 #include <click/application.h>
 #include <click/interface.h>
-#include <click/key_file_locator.h>
 #include <click/qtbridge.h>
 #include <click/departments-db.h>
 #include <click/utils.h>
@@ -47,12 +46,13 @@
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/VariantBuilder.h>
 
+#include <cassert>
 #include <iomanip>
-#include<vector>
-#include<set>
-#include<sstream>
-#include <cassert>
 #include <locale>
+#include <memory>
+#include <set>
+#include <sstream>
+#include <vector>
 
 #include <QLocale>
 
@@ -169,6 +169,7 @@
     click::HighlightList& highlights;
     scopes::SearchMetadata meta;
     click::web::Cancellable search_operation;
+    click::web::Cancellable search_snaps_operation;
     click::web::Cancellable purchases_operation;
     pay::Package& pay_package;
     std::shared_future<void> qt_ready_;
@@ -196,12 +197,12 @@
 {
     qDebug() << "cancelling search of" << QString::fromStdString(query().query_string());
     impl->search_operation.cancel();
+    impl->search_snaps_operation.cancel();
 }
 
 click::Interface& click::Query::clickInterfaceInstance()
 {
-    static QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-    static click::Interface iface(keyFileLocator);
+    static click::Interface iface;
 
     return iface;
 }
@@ -291,7 +292,12 @@
         res.set_title(pkg.title);
         res.set_art(pkg.icon_url);
         res.set_uri(pkg.url);
-        res[click::Query::ResultKeys::NAME] = pkg.name;
+        res["snap_id"] = pkg.snap_id;
+        if (pkg.snap_id.empty()) {
+            res[click::Query::ResultKeys::NAME] = pkg.name;
+        } else {
+            res[click::Query::ResultKeys::NAME] = pkg.alias;
+        }
         res["subtitle"] = pkg.publisher;
         auto installed = installedPackages.find(pkg);
 
@@ -534,6 +540,7 @@
                     push_package(searchReply, recommendsCategory,
                                  installedPackages, r);
                 }
+
                 qDebug() << "search completed";
                 this->finished(searchReply); //FIXME: this shouldn't be needed
             };
@@ -597,7 +604,37 @@
             {
                 qDebug() << "starting search of" << QString::fromStdString(query().query_string());
                 push_departments(searchReply);
-                impl->search_operation = impl->index.search(query().query_string(), query().department_id(), search_cb, force_cache);
+                impl->search_operation = impl->index.search
+                    (query().query_string(), query().department_id(),
+                     [this, search_cb, force_cache](Packages packages,
+                                                    Packages recommends) {
+                        if (Configuration().is_snapd_running()) {
+                            qDebug() << "Searching for snaps too.";
+                            impl->search_snaps_operation = impl->index.search_snaps
+                            (query().query_string(),
+                             [this, packages, recommends, search_cb](Packages snap_packages,
+                                                                     Packages snap_recommends) {
+                                qDebug() << "In the callback.";
+                                Packages new_packages, new_recommends;
+                                for (auto p: packages) {
+                                    new_packages.push_back(p);
+                                }
+                                for (auto p: snap_packages) {
+                                    new_packages.push_back(p);
+                                }
+                                for (auto r: recommends) {
+                                    new_recommends.push_back(r);
+                                }
+                                for (auto r: snap_recommends) {
+                                    new_recommends.push_back(r);
+                                }
+                                qDebug() << "Snaps appended.";
+                                search_cb(new_packages, new_recommends);
+                            }, force_cache);
+                        } else {
+                            search_cb(packages, recommends);
+                        }
+                    }, force_cache);
             }
         }
     });

=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2016-05-25 16:19:58 +0000
+++ scope/clickstore/store-scope.cpp	2016-08-24 21:39:08 +0000
@@ -38,7 +38,6 @@
 
 #include <QSharedPointer>
 
-#include <click/key_file_locator.h>
 #include <click/network_access_manager.h>
 #include <click/click-i18n.h>
 

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2016-03-09 13:08:13 +0000
+++ scope/tests/test_apps_query.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -61,7 +61,7 @@
 {
 public:
     MockClickInterface() = default;
-    MOCK_METHOD4(find_installed_apps, std::vector<click::Application>(const std::string&, const std::vector<std::string>&, const std::string&, const std::shared_ptr<click::DepartmentsDb>&));
+    MOCK_METHOD4(search, std::vector<click::Application>(const std::string&, const std::vector<std::string>&, const std::string&, const std::shared_ptr<click::DepartmentsDb>&));
 };
 
 class MockAppsQuery : public click::apps::Query
@@ -215,7 +215,7 @@
         // no apps in 'books' department, thus excluded
         std::list<std::string> expected_departments({{"", "games", "video"}});
 
-        EXPECT_CALL(*clickif, find_installed_apps(_, _, _, _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(*clickif, search(_, _, _, _)).WillOnce(Return(installed_apps));
         EXPECT_CALL(mock_reply, register_category("predefined", _, _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_category("local", StrNe(""), _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
@@ -264,7 +264,7 @@
 
         std::list<std::string> expected_departments({"", "games"});
 
-        EXPECT_CALL(*clickif, find_installed_apps(_, _, _, _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(*clickif, search(_, _, _, _)).WillOnce(Return(installed_apps));
         EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_departments(MatchesDepartments(expected_departments)));
@@ -296,7 +296,7 @@
         scopes::testing::MockSearchReply mock_reply;
         scopes::SearchReplyProxy reply(&mock_reply, [](unity::scopes::SearchReply*){});
 
-        EXPECT_CALL(*clickif, find_installed_apps(_, _, _, _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(*clickif, search(_, _, _, _)).WillOnce(Return(installed_apps));
         EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
 
@@ -323,7 +323,7 @@
 
         std::list<std::string> expected_departments({"", "games"});
 
-        EXPECT_CALL(*clickif, find_installed_apps("Fooo", _, "games", _)).WillOnce(Return(installed_apps));
+        EXPECT_CALL(*clickif, search("Fooo", _, "games", _)).WillOnce(Return(installed_apps));
         EXPECT_CALL(mock_reply, register_category("local", StrEq(""), _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(mock_reply, register_category("store", _, _, _)).WillOnce(Return(ptrCat));
         EXPECT_CALL(*depts_db, get_department_name("games", expected_locales)).WillOnce(Return("Games"));

=== modified file 'tools/init-departments/init-departments.cpp'
--- tools/init-departments/init-departments.cpp	2014-07-15 13:30:05 +0000
+++ tools/init-departments/init-departments.cpp	2016-08-24 21:39:08 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Canonical Ltd.
+ * Copyright (C) 2014-2016 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -28,14 +28,16 @@
  */
 
 #include <click/interface.h>
-#include <click/key_file_locator.h>
 #include <click/index.h>
 #include <click/webclient.h>
 #include <click/network_access_manager.h>
 #include <click/qtbridge.h>
 #include <click/departments-db.h>
+
 #include <future>
 #include <iostream>
+#include <memory>
+
 #include <QDebug>
 #include <QtGlobal>
 
@@ -65,8 +67,7 @@
     {"webbrowser-app.desktop", "web-browsers"}
 };
 
-QSharedPointer<click::KeyFileLocator> keyFileLocator(new click::KeyFileLocator());
-click::Interface iface(keyFileLocator);
+click::Interface iface;
 
 void noDebug(QtMsgType, const QMessageLogContext&, const QString&) {}