Merge lp:~marcustomlinson/unity-scope-click/lp-1378186 into lp:unity-scope-click

[Marcus Tomlinson]

Return apps scope to root department if current department becomes empty after an uninstall

[Marcus Tomlinson (marcustomlinson)]

I have tested this on the phone. If you'd like to confirm, here's a build: https://code.launchpad.net/~unity-api-team/+archive/ubuntu/dev-build-3

[Marcus Tomlinson (marcustomlinson)]

This is now in silo 47

[dobey (dobey)]

review: Needs Fixing

[lp:~marcustomlinson/unity-scope-click/lp-1378186]

453. By Marcus Tomlinson on 2016-05-19

uninstall_sucess_f -> uninstall_success_f

[dobey (dobey)]

review: Approve

=== modified file 'libclickscope/click/scope_activation.cpp'
--- libclickscope/click/scope_activation.cpp	2014-06-16 12:40:06 +0000
+++ libclickscope/click/scope_activation.cpp	2016-05-19 18:06:18 +0000
@@ -28,6 +28,7 @@
  */
 
 #include "scope_activation.h"
+#include <click/download-manager.h>
 #include <click/package.h>
 #include <click/interface.h>
 #include <click/qtbridge.h>
@@ -55,31 +56,41 @@
     hints_[key] = value;
 }
 
-click::PerformUninstallAction::PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata, const unity::scopes::ActivationResponse& response)
-    : unity::scopes::ActivationQueryBase(result, metadata),
-      response(response)
+click::PerformUninstallAction::PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata)
+    : unity::scopes::ActivationQueryBase(result, metadata)
 {
 }
 
 unity::scopes::ActivationResponse click::PerformUninstallAction::activate()
 {
+    std::promise<bool> uninstall_success_p;
+    std::future<bool> uninstall_success_f = uninstall_success_p.get_future();
+
     auto const res = result();
     click::Package package;
     package.title = res.title();
     package.name = res["name"].get_string();
     package.version = res["version"].get_string();
-    qt::core::world::enter_with_task([this, package] ()
+    qt::core::world::enter_with_task([this, package, &uninstall_success_p] ()
     {
         click::PackageManager manager;
         manager.uninstall(package, [&](int code, std::string stderr_content) {
                 if (code != 0) {
                     qDebug() << "Error removing package:" << stderr_content.c_str();
+                    uninstall_success_p.set_value(false);
                 } else {
                     qDebug() << "successfully removed package";
-
+                    uninstall_success_p.set_value(true);
                 }
             } );
     });
 
-    return response;
+    if (uninstall_success_f.get())
+    {
+        if (res.contains("lonely_result") && res.value("lonely_result").get_bool())
+        {
+            return unity::scopes::ActivationResponse(unity::scopes::CannedQuery(APPS_SCOPE_ID.toUtf8().data()));
+        }
+    }
+    return unity::scopes::ActivationResponse(unity::scopes::ActivationResponse::ShowDash);
 }
 
=== modified file 'libclickscope/click/scope_activation.h'
--- libclickscope/click/scope_activation.h	2014-06-16 12:40:06 +0000
+++ libclickscope/click/scope_activation.h	2016-05-19 18:06:18 +0000
@@ -40,11 +40,8 @@
 class PerformUninstallAction: public unity::scopes::ActivationQueryBase
 {
 public:
-    PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata, const unity::scopes::ActivationResponse& response);
+    PerformUninstallAction(const unity::scopes::Result& result, const unity::scopes::ActionMetadata& metadata);
     unity::scopes::ActivationResponse activate() override;
-
-private:
-    unity::scopes::ActivationResponse response;
 };
 
 class ScopeActivation : public unity::scopes::ActivationQueryBase
 
=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2016-05-10 14:56:11 +0000
+++ scope/clickapps/apps-query.cpp	2016-05-19 18:06:18 +0000
@@ -116,7 +116,7 @@
     }
 }
 
-void click::apps::ResultPusher::push_result(scopes::Category::SCPtr& cat, const click::Application& a)
+void click::apps::ResultPusher::push_result(scopes::Category::SCPtr& cat, const click::Application& a, bool lonely_result)
 {
     scopes::CategorisedResult res(cat);
     res.set_title(a.title);
@@ -127,6 +127,7 @@
     res[click::apps::Query::ResultKeys::MAIN_SCREENSHOT] = a.main_screenshot;
     res[click::apps::Query::ResultKeys::INSTALLED] = true;
     res[click::apps::Query::ResultKeys::VERSION] = a.version;
+    res["lonely_result"] = lonely_result;
     replyProxy->push(res);
 }
 
@@ -166,7 +167,7 @@
         {
             if (top_apps_lookup.size() == 0 || top_apps_lookup.find(get_app_identifier(a)) == top_apps_lookup.end())
             {
-                push_result(cat, a);
+                push_result(cat, a, apps.size() == 1);
             }
         }
         catch (const std::runtime_error &e)
 
=== modified file 'scope/clickapps/apps-query.h'
--- scope/clickapps/apps-query.h	2016-05-10 14:56:11 +0000
+++ scope/clickapps/apps-query.h	2016-05-19 18:06:18 +0000
@@ -106,7 +106,7 @@
             const std::vector<click::Application>& apps,
             const std::string& categoryTemplate);
 protected:
-    virtual void push_result(scopes::Category::SCPtr& cat, const click::Application& a);
+    virtual void push_result(scopes::Category::SCPtr& cat, const click::Application& a, bool lonely_result = false);
     static std::string get_app_identifier(const click::Application& app);
 };
 } // namespace apps
 
=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2016-05-10 14:56:11 +0000
+++ scope/clickapps/apps-scope.cpp	2016-05-19 18:06:18 +0000
@@ -118,8 +118,7 @@
         std::string const& widget_id, std::string const& action_id)
 {
     if (action_id == click::Preview::Actions::CONFIRM_UNINSTALL) {
-        auto response = unity::scopes::ActivationResponse(unity::scopes::ActivationResponse::ShowDash);
-        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata, response));
+        return scopes::ActivationQueryBase::UPtr(new PerformUninstallAction(result, metadata));
     }
 
     auto activation = new ScopeActivation(result, metadata);