Merge lp:~dobey/unity-scope-click/fix-the-flow into lp:unity-scope-click

[dobey]

Ensure 'Cancel Purchase' button is shown immediately after a purchase.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/641/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/51/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:345
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dobey/unity-scope-click/fix-the-flow/+merge/263387/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/642/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/52/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:346
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dobey/unity-scope-click/fix-the-flow/+merge/263387/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/643/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/57/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/53/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:347
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dobey/unity-scope-click/fix-the-flow/+merge/263387/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/644/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/58/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/54/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:348
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dobey/unity-scope-click/fix-the-flow/+merge/263387/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/645/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/55/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/646/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/60/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/56/console

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

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

r351 is an abomination, we must revisit this after the deadline and fix the libpay internals so that this isn't needed. :-)

Still, I agree with this as a short-term workaround to ensure that is_refundable() hits a fresh cache so that it uses the right state to determine if things are refundable or not.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:350
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/647/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-wily-armhf-ci/57/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'libclickscope/click/pay.cpp'
--- libclickscope/click/pay.cpp	2015-06-17 16:32:08 +0000
+++ libclickscope/click/pay.cpp	2015-07-02 22:21:56 +0000
@@ -36,6 +36,7 @@
 
 #include <glib.h>
 #include <libpay/pay-package.h>
+#include <unistd.h>
 
 #include <QDebug>
 
@@ -110,11 +111,6 @@
     return lhs.name == rhs.name;
 }
 
-Package& Package::instance() {
-    static Package the_instance;
-    return the_instance;
-}
-
 Package::Package() : impl(new Private())
 {
 }
@@ -201,6 +197,23 @@
     return false;
 }
 
+bool Package::is_refundable(const std::string& pkg_name)
+{
+    if (!running) {
+        setup_pay_service();
+    }
+
+    if (verify(pkg_name)) {
+        // No Hondas, why racing? Wait for it…
+        usleep(10000);
+
+        return pay_package_item_is_refundable(impl->pay_package,
+                                              pkg_name.c_str()) == 0 ? false : true;
+    }
+    // If verify() returned false, then it's not purchased.
+    return false;
+}
+
 time_t parse_timestamp(json::Value v)
 {
     if (v.isNull()) {
@@ -213,7 +226,6 @@
     return when.toTime_t();
 }
 
-
 click::web::Cancellable Package::get_purchases(std::function<void(const PurchaseSet&)> callback)
 {
     QSharedPointer<click::CredentialsService> sso(new click::CredentialsService());
 
=== modified file 'libclickscope/click/pay.h'
--- libclickscope/click/pay.h	2015-06-17 16:27:26 +0000
+++ libclickscope/click/pay.h	2015-07-02 22:21:56 +0000
@@ -102,9 +102,9 @@
 
         virtual bool refund(const std::string& pkg_name);
         virtual bool verify(const std::string& pkg_name);
+        virtual bool is_refundable(const std::string& pkg_name);
         virtual click::web::Cancellable get_purchases(std::function<void(const PurchaseSet& purchased_apps)> callback);
         static std::string get_base_url();
-        static Package& instance();
 
     protected:
         virtual void setup_pay_service();
 
=== modified file 'libclickscope/click/preview.cpp'
--- libclickscope/click/preview.cpp	2015-06-17 16:59:14 +0000
+++ libclickscope/click/preview.cpp	2015-07-02 22:21:56 +0000
@@ -103,9 +103,10 @@
 
 void Preview::choose_strategy(const QSharedPointer<web::Client> &client,
                               const QSharedPointer<click::network::AccessManager>& nam,
+                              const QSharedPointer<pay::Package>& ppackage,
                               std::shared_ptr<click::DepartmentsDb> depts)
 {
-    strategy.reset(build_strategy(result, metadata, client, nam, depts));
+    strategy.reset(build_strategy(result, metadata, client, nam, ppackage, depts));
 }
 
 PreviewStrategy* Preview::build_installing(const std::string& download_url,
@@ -120,9 +121,10 @@
 
 
 PreviewStrategy* Preview::build_strategy(const unity::scopes::Result &result,
-                                          const unity::scopes::ActionMetadata &metadata,
-                                          const QSharedPointer<web::Client> &client,
-                                          const QSharedPointer<click::network::AccessManager>& nam,
+                                         const unity::scopes::ActionMetadata &metadata,
+                                         const QSharedPointer<web::Client> &client,
+                                         const QSharedPointer<click::network::AccessManager>& nam,
+                                         const QSharedPointer<pay::Package>& ppackage,
                                           std::shared_ptr<click::DepartmentsDb> depts)
 {
     if (metadata.scope_data().which() != scopes::Variant::Type::Null) {
@@ -137,7 +139,7 @@
                      << " and close_preview="
                      << metadict.count(click::Preview::Actions::SHOW_INSTALLED);
 
-            return new InstalledPreview(result, metadata, client, depts);
+            return new InstalledPreview(result, metadata, client, ppackage, depts);
         } else if (metadict.count("action_id") != 0  && metadict.count("download_url") != 0) {
             std::string action_id = metadict["action_id"].get_string();
             std::string download_url = metadict["download_url"].get_string();
@@ -147,7 +149,7 @@
             } else {
                 qWarning() << "unexpected action id " << QString::fromStdString(action_id)
                            << " given with download_url" << QString::fromStdString(download_url);
-                return new UninstalledPreview(result, client, depts, nam);
+                return new UninstalledPreview(result, client, depts, nam, ppackage);
             }
         } else if (metadict.count(click::Preview::Actions::CANCEL_PURCHASE_UNINSTALLED) != 0) {
             return new CancelPurchasePreview(result, false);
@@ -156,16 +158,16 @@
         } else if (metadict.count(click::Preview::Actions::UNINSTALL_CLICK) != 0) {
             return new UninstallConfirmationPreview(result);
         } else if (metadict.count(click::Preview::Actions::CONFIRM_UNINSTALL) != 0) {
-            return new UninstallingPreview(result, client, nam);
+            return new UninstallingPreview(result, client, nam, ppackage);
         } else if (metadict.count(click::Preview::Actions::CONFIRM_CANCEL_PURCHASE) != 0) {
-            return new CancellingPurchasePreview(result, client, nam);
+            return new CancellingPurchasePreview(result, client, nam, ppackage);
         } else if (metadict.count(click::Preview::Actions::RATED) != 0) {
-            return new InstalledPreview(result, metadata, client, depts);
+            return new InstalledPreview(result, metadata, client, ppackage, depts);
         } else if (metadict.count(click::Preview::Actions::SHOW_UNINSTALLED) != 0) {
-            return new UninstalledPreview(result, client, depts, nam);
+            return new UninstalledPreview(result, client, depts, nam, ppackage);
         } else {
             qWarning() << "preview() called with unexpected metadata. returning uninstalled preview";
-            return new UninstalledPreview(result, client, depts, nam);
+            return new UninstalledPreview(result, client, depts, nam, ppackage);
         }
     } else {
         // metadata.scope_data() is Null, so we return an appropriate "default" preview:
@@ -174,9 +176,9 @@
             return new InstalledScopePreview(result);
         }
         if (result["installed"].get_bool() == true) {
-            return new InstalledPreview(result, metadata, client, depts);
+            return new InstalledPreview(result, metadata, client, ppackage, depts);
         } else {
-            return new UninstalledPreview(result, client, depts, nam);
+            return new UninstalledPreview(result, client, depts, nam, ppackage);
         }
     }
 
@@ -210,6 +212,19 @@
 {
 }
 
+PreviewStrategy::PreviewStrategy(const unity::scopes::Result& result,
+                                 const QSharedPointer<click::web::Client>& client,
+                                 const QSharedPointer<pay::Package>& ppackage)
+    : result(result),
+      client(client),
+      index(new click::Index(client)),
+      reviews(new click::Reviews(client)),
+      oa_client("ubuntuone", "ubuntuone", "ubuntuone",
+                scopes::OnlineAccountClient::MainLoopSelect::CreateInternalMainLoop),
+      pay_package(ppackage)
+{
+}
+
 void PreviewStrategy::pushPackagePreviewWidgets(const unity::scopes::PreviewReplyProxy &reply,
                                                 const PackageDetails &details,
                                                 const scopes::PreviewWidgetList& button_area_widgets)
@@ -229,6 +244,7 @@
     index_operation.cancel();
     reviews_operation.cancel();
     submit_operation.cancel();
+    purchase_operation.cancel();
 }
 
 scopes::PreviewWidget PreviewStrategy::build_other_metadata(const PackageDetails &details)
@@ -529,15 +545,20 @@
     return widgets;
 }
 
-bool PreviewStrategy::isRefundable() const
+bool PreviewStrategy::isRefundable()
 {
-    time_t refundable_until = 0;
-    if (result.contains("refundable_until")) {
-        refundable_until = result["refundable_until"].get_int64_t();
-    }
-    time_t now = time(NULL);
-    // refund button is not shown if less than ten seconds left
-    return refundable_until >= (now + 10);
+    if (pay_package.isNull())
+    {
+        return false;
+    }
+
+    std::string pkg_name = get_string_maybe_null(result["name"]);
+    if (pkg_name.empty())
+    {
+        return false;
+    }
+
+    return pay_package->is_refundable(pkg_name);
 }
 
 void PreviewStrategy::invalidateScope(const std::string& scope_id)
@@ -657,8 +678,9 @@
 InstalledPreview::InstalledPreview(const unity::scopes::Result& result,
                                    const unity::scopes::ActionMetadata& metadata,
                                    const QSharedPointer<click::web::Client>& client,
+                                   const QSharedPointer<pay::Package>& ppackage,
                                    const std::shared_ptr<click::DepartmentsDb>& depts)
-    : PreviewStrategy(result, client),
+    : PreviewStrategy(result, client, ppackage),
       DepartmentUpdater(depts),
       metadata(metadata)
 {
@@ -1065,8 +1087,9 @@
 UninstalledPreview::UninstalledPreview(const unity::scopes::Result& result,
                                        const QSharedPointer<click::web::Client>& client,
                                        const std::shared_ptr<click::DepartmentsDb>& depts,
-                                       const QSharedPointer<click::network::AccessManager>& nam)
-    : PreviewStrategy(result, client),
+                                       const QSharedPointer<click::network::AccessManager>& nam,
+                                       const QSharedPointer<pay::Package>& ppackage)
+    : PreviewStrategy(result, client, ppackage),
       DepartmentUpdater(depts), nam(nam)
 {
     qDebug() << "Creating new UninstalledPreview for result" << QString::fromStdString(result["name"].get_string());
@@ -1160,8 +1183,9 @@
 // TODO: this class should be removed once uninstall() is handled elsewhere.
 UninstallingPreview::UninstallingPreview(const unity::scopes::Result& result,
                                          const QSharedPointer<click::web::Client>& client,
-                                         const QSharedPointer<click::network::AccessManager>& nam)
-      : UninstalledPreview(result, client, nullptr, nam)
+                                         const QSharedPointer<click::network::AccessManager>& nam,
+                                         const QSharedPointer<pay::Package>& ppackage)
+    : UninstalledPreview(result, client, nullptr, nam, ppackage)
 {
 }
 
@@ -1201,9 +1225,10 @@
 // class CancellingPurchasePreview : public UninstallingPreview
 
 CancellingPurchasePreview::CancellingPurchasePreview(const unity::scopes::Result& result,
-                                         const QSharedPointer<click::web::Client>& client,
-                                         const QSharedPointer<click::network::AccessManager>& nam)
-      : UninstallingPreview(result, client, nam)
+                                                     const QSharedPointer<click::web::Client>& client,
+                                                     const QSharedPointer<click::network::AccessManager>& nam,
+                                                     const QSharedPointer<pay::Package>& ppackage)
+    : UninstallingPreview(result, client, nam, ppackage)
 {
 }
 
@@ -1231,9 +1256,9 @@
     std::promise<bool> refund_promise;
     std::future<bool> refund_future = refund_promise.get_future();
 
-    run_under_qt([&refund_promise, package_name]() {
+    run_under_qt([this, &refund_promise, package_name]() {
         qDebug() << "Calling refund for:" << package_name.c_str();
-        auto ret = pay::Package::instance().refund(package_name);
+        auto ret = pay_package->refund(package_name);
         qDebug() << "Refund returned:" << ret;
         refund_promise.set_value(ret);
     });
 
=== modified file 'libclickscope/click/preview.h'
--- libclickscope/click/preview.h	2015-06-17 16:59:14 +0000
+++ libclickscope/click/preview.h	2015-07-02 22:21:56 +0000
@@ -32,6 +32,7 @@
 
 #include <click/index.h>
 #include <click/download-manager.h>
+#include <click/pay.h>
 #include <click/qtbridge.h>
 #include "reviews.h"
 
@@ -75,6 +76,7 @@
                                     const unity::scopes::ActionMetadata& metadata,
                                     const QSharedPointer<web::Client> &client,
                                     const QSharedPointer<click::network::AccessManager>& nam,
+                                    const QSharedPointer<pay::Package>& ppackage,
                                     std::shared_ptr<click::DepartmentsDb> depts);
     virtual PreviewStrategy* build_installing(const std::string& download_url,
                                               const std::string& download_sha512,
@@ -113,6 +115,7 @@
     virtual ~Preview();
     void choose_strategy(const QSharedPointer<web::Client> &client,
                          const QSharedPointer<click::network::AccessManager>& nam,
+                         const QSharedPointer<pay::Package>& ppackage,
                          std::shared_ptr<click::DepartmentsDb> depts);
     // From unity::scopes::PreviewQuery
     void cancelled() override;
@@ -125,8 +128,10 @@
 
     PreviewStrategy(const unity::scopes::Result& result);
     PreviewStrategy(const unity::scopes::Result& result,
-            const QSharedPointer<click::web::Client>& client);
-
+                    const QSharedPointer<click::web::Client>& client);
+    PreviewStrategy(const unity::scopes::Result& result,
+                    const QSharedPointer<click::web::Client>& client,
+                    const QSharedPointer<pay::Package>& pay_package);
     virtual ~PreviewStrategy();
 
     virtual void cancelled();
@@ -154,7 +159,7 @@
     virtual scopes::PreviewWidget build_updates_table(const PackageDetails& details);
     virtual std::string build_whats_new(const PackageDetails& details);
     virtual void run_under_qt(const std::function<void ()> &task);
-    virtual bool isRefundable() const;
+    virtual bool isRefundable();
     virtual void invalidateScope(const std::string& scope_id);
 
     scopes::Result result;
@@ -165,6 +170,8 @@
     click::web::Cancellable reviews_operation;
     click::web::Cancellable submit_operation;
     scopes::OnlineAccountClient oa_client;
+    QSharedPointer<pay::Package> pay_package;
+    click::web::Cancellable purchase_operation;
 };
 
 class DownloadErrorPreview : public PreviewStrategy
@@ -206,6 +213,7 @@
     InstalledPreview(const unity::scopes::Result& result,
                      const unity::scopes::ActionMetadata& metadata,
                      const QSharedPointer<click::web::Client>& client,
+                     const QSharedPointer<pay::Package>& ppackage,
                      const std::shared_ptr<click::DepartmentsDb>& depts);
 
     virtual ~InstalledPreview();
@@ -273,7 +281,8 @@
     UninstalledPreview(const unity::scopes::Result& result,
                        const QSharedPointer<click::web::Client>& client,
                        const std::shared_ptr<click::DepartmentsDb>& depts,
-                       const QSharedPointer<click::network::AccessManager>& nam);
+                       const QSharedPointer<click::network::AccessManager>& nam,
+                       const QSharedPointer<pay::Package>& ppackage);
 
     virtual ~UninstalledPreview();
 
@@ -292,7 +301,8 @@
 public:
     UninstallingPreview(const unity::scopes::Result& result,
                         const QSharedPointer<click::web::Client>& client,
-                        const QSharedPointer<click::network::AccessManager>& nam);
+                        const QSharedPointer<click::network::AccessManager>& nam,
+                        const QSharedPointer<pay::Package>& ppackage);
 
     virtual ~UninstallingPreview();
 
@@ -308,7 +318,8 @@
 public:
     CancellingPurchasePreview(const unity::scopes::Result& result,
                               const QSharedPointer<click::web::Client>& client,
-                              const QSharedPointer<click::network::AccessManager>& nam);
+                              const QSharedPointer<click::network::AccessManager>& nam,
+                              const QSharedPointer<pay::Package>& ppackage);
 
     virtual ~CancellingPurchasePreview();
 
 
=== modified file 'libclickscope/tests/mock_pay.h'
--- libclickscope/tests/mock_pay.h	2015-06-11 19:24:18 +0000
+++ libclickscope/tests/mock_pay.h	2015-07-02 22:21:56 +0000
@@ -87,10 +87,18 @@
             do_pay_package_verify(pkg_name);
         }
 
+        bool is_refundable(const std::string& pkg_name)
+        {
+            do_is_refundable(pkg_name);
+            return refundable;
+        }
+
         MOCK_METHOD0(setup_pay_service, void());
         MOCK_METHOD1(do_pay_package_refund, void(const std::string&));
         MOCK_METHOD1(do_pay_package_verify, void(const std::string&));
+        MOCK_METHOD1(do_is_refundable, void(const std::string&));
 
+        bool refundable = false;
         bool success = false;
         pay::PurchaseSet purchases;
 };
 
=== modified file 'libclickscope/tests/test_pay.cpp'
--- libclickscope/tests/test_pay.cpp	2015-06-11 19:24:18 +0000
+++ libclickscope/tests/test_pay.cpp	2015-07-02 22:21:56 +0000
@@ -59,14 +59,12 @@
         clientPtr.reset(new NiceMock<MockClient>(namPtr));
         package.reset(new MockPayPackage(clientPtr));
     }
-
 public:
     MOCK_METHOD1(purchases_callback, void(pay::PurchaseSet));
 };
 
 }
 
-
 TEST_F(PayTest, testPayPackageRefundCalled)
 {
     LifetimeHelper<click::network::Reply, MockNetworkReply> reply;
 
=== modified file 'libclickscope/tests/test_preview.cpp'
--- libclickscope/tests/test_preview.cpp	2015-05-15 19:51:22 +0000
+++ libclickscope/tests/test_preview.cpp	2015-07-02 22:21:56 +0000
@@ -35,6 +35,7 @@
 #include <gtest/gtest.h>
 #include <click/preview.h>
 #include <fake_json.h>
+#include <mock_pay.h>
 #include <click/index.h>
 #include <click/interface.h>
 #include <click/reviews.h>
@@ -270,6 +271,7 @@
     unity::scopes::VariantMap metadict;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::network::AccessManager> nam;
+    QSharedPointer<MockPayPackage> pay_package;
     std::shared_ptr<click::DepartmentsDb> depts;
     const std::string FAKE_SHA512 = "FAKE_SHA512";
 
@@ -298,7 +300,7 @@
     metadata.set_scope_data(unity::scopes::Variant(metadict));
     MockablePreview preview(result, metadata);
     EXPECT_CALL(preview, build_installing(_, FAKE_SHA512, _, _, _, _));
-    preview.choose_strategy(client, nam, depts);
+    preview.choose_strategy(client, nam, pay_package, depts);
 }
 
 
@@ -309,6 +311,7 @@
     unity::scopes::PreviewWidgetList widgets;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::network::AccessManager> nam;
+    QSharedPointer<MockPayPackage> pay_package;
     std::shared_ptr<click::DepartmentsDb> depts;
     unity::scopes::testing::MockPreviewReply reply;
     std::shared_ptr<unity::scopes::testing::MockPreviewReply> replyptr{&reply, [](unity::scopes::testing::MockPreviewReply*){}};
@@ -342,8 +345,10 @@
                                const unity::scopes::Result& result,
                                const QSharedPointer<click::web::Client>& client,
                                const std::shared_ptr<click::DepartmentsDb>& depts,
-                               const QSharedPointer<click::network::AccessManager>& nam)
-        : click::UninstalledPreview(result, client, depts, nam), object_path(object_path),
+                               const QSharedPointer<click::network::AccessManager>& nam,
+                               const QSharedPointer<pay::Package> pay_package)
+        : click::UninstalledPreview(result, client, depts, nam, pay_package),
+          object_path(object_path),
           fake_downloader(new FakeDownloader(object_path, nam))
     {
 
@@ -370,8 +375,9 @@
                            const unity::scopes::Result& result,
                            const QSharedPointer<click::web::Client>& client,
                            const std::shared_ptr<click::DepartmentsDb>& depts,
-                           const QSharedPointer<click::network::AccessManager>& nam)
-        : FakeBaseUninstalledPreview(object_path, result, client, depts, nam) {
+                           const QSharedPointer<click::network::AccessManager>& nam,
+                           const QSharedPointer<pay::Package> pay_package)
+        : FakeBaseUninstalledPreview(object_path, result, client, depts, nam, pay_package) {
     }
 };
 
@@ -381,7 +387,7 @@
 
     result["name"] = "fake_app_name";
     scopes::PreviewWidgetList response;
-    FakeUninstalledPreview preview(fake_object_path, result, client, depts, nam);
+    FakeUninstalledPreview preview(fake_object_path, result, client, depts, nam, pay_package);
     EXPECT_CALL(preview, progressBarWidget(_))
             .Times(1)
             .WillOnce(Return(response));
@@ -394,7 +400,7 @@
 
     result["name"] = "fake_app_name";
     scopes::PreviewWidgetList response;
-    FakeUninstalledPreview preview(fake_object_path, result, client, depts, nam);
+    FakeUninstalledPreview preview(fake_object_path, result, client, depts, nam, pay_package);
     EXPECT_CALL(preview, uninstalledActionButtonWidgets(_))
             .Times(1)
             .WillOnce(Return(response));
@@ -405,13 +411,14 @@
 class FakeUninstalledRefundablePreview : FakeBaseUninstalledPreview {
 public:
     FakeUninstalledRefundablePreview(const unity::scopes::Result& result,
-                          const QSharedPointer<click::web::Client>& client,
-                          const std::shared_ptr<click::DepartmentsDb>& depts,
-                          const QSharedPointer<click::network::AccessManager>& nam)
-        : FakeBaseUninstalledPreview(std::string{""}, result, client, depts, nam){
+                                     const QSharedPointer<click::web::Client>& client,
+                                     const std::shared_ptr<click::DepartmentsDb>& depts,
+                                     const QSharedPointer<click::network::AccessManager>& nam,
+                                     const QSharedPointer<pay::Package> pay_package)
+        : FakeBaseUninstalledPreview(std::string{""}, result, client, depts, nam, pay_package){
     }
     using click::UninstalledPreview::uninstalledActionButtonWidgets;
-    MOCK_CONST_METHOD0(isRefundable, bool());
+    MOCK_METHOD0(isRefundable, bool());
 };
 
 unity::scopes::VariantArray get_actions_from_widgets(const unity::scopes::PreviewWidgetList& widgets, int widget_number) {
@@ -429,7 +436,7 @@
     result["name"] = "fake_app_name";
     result["price"] = 2.99;
     result["purchased"] = true;
-    FakeUninstalledRefundablePreview preview(result, client, depts, nam);
+    FakeUninstalledRefundablePreview preview(result, client, depts, nam, pay_package);
 
     click::PackageDetails pkgdetails;
     EXPECT_CALL(preview, isRefundable()).Times(1)
@@ -442,7 +449,7 @@
     result["name"] = "fake_app_name";
     result["price"] = 2.99;
     result["purchased"] = true;
-    FakeUninstalledRefundablePreview preview(result, client, depts, nam);
+    FakeUninstalledRefundablePreview preview(result, client, depts, nam, pay_package);
 
     click::PackageDetails pkgdetails;
     EXPECT_CALL(preview, isRefundable()).Times(1)
@@ -458,6 +465,7 @@
     unity::scopes::VariantMap metadict;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::network::AccessManager> nam;
+    QSharedPointer<MockPayPackage> pay_package;
     std::shared_ptr<click::DepartmentsDb> depts;
 
 public:
@@ -470,16 +478,17 @@
     FakeInstalledRefundablePreview(const unity::scopes::Result& result,
                                    const unity::scopes::ActionMetadata& metadata,
                                    const QSharedPointer<click::web::Client> client,
+                                   const QSharedPointer<pay::Package> pay_package,
                                    const std::shared_ptr<click::DepartmentsDb> depts)
-        : click::InstalledPreview(result, metadata, client, depts) {
+        : click::InstalledPreview(result, metadata, client, pay_package, depts) {
 
     }
     using click::InstalledPreview::createButtons;
-    MOCK_CONST_METHOD0(isRefundable, bool());
+    MOCK_METHOD0(isRefundable, bool());
 };
 
 TEST_F(InstalledPreviewTest, testIsRefundableButtonShown) {
-    FakeInstalledRefundablePreview preview(result, metadata, client, depts);
+    FakeInstalledRefundablePreview preview(result, metadata, client, pay_package, depts);
     EXPECT_CALL(preview, isRefundable()).Times(1)
             .WillOnce(Return(true));
     click::Manifest manifest;
@@ -490,7 +499,7 @@
 }
 
 TEST_F(InstalledPreviewTest, testIsRefundableButtonNotShown) {
-    FakeInstalledRefundablePreview preview(result, metadata, client, depts);
+    FakeInstalledRefundablePreview preview(result, metadata, client, pay_package, depts);
     EXPECT_CALL(preview, isRefundable()).Times(1)
             .WillOnce(Return(false));
     click::Manifest manifest;
@@ -501,41 +510,6 @@
 }
 
 
-class RefundableTest : public PreviewStrategyTest {
-
-};
-
-TEST_F(RefundableTest, testIsNotRefundableWhenFieldMissing) {
-    FakeResult result{vm};
-    FakePreview preview{result};
-    ASSERT_FALSE(preview.isRefundable());
-}
-
-TEST_F(RefundableTest, testIsNotRefundableWhenExpired) {
-    FakeResult result{vm};
-    time_t now = time(NULL);
-    result["refundable_until"] = (int64_t) (now - 300);
-    FakePreview preview{result};
-    ASSERT_FALSE(preview.isRefundable());
-}
-
-TEST_F(RefundableTest, testIsRefundable) {
-    FakeResult result{vm};
-    time_t now = time(NULL);
-    result["refundable_until"] = (int64_t) (now + 300);
-    FakePreview preview{result};
-    ASSERT_TRUE(preview.isRefundable());
-}
-
-TEST_F(RefundableTest, testIsNotRefundableWhenExpiringRealSoon) {
-    FakeResult result{vm};
-    time_t now = time(NULL);
-    result["refundable_until"] = (int64_t) (now + 8);
-    FakePreview preview{result};
-    ASSERT_FALSE(preview.isRefundable());
-}
-
-
 class FakeCancelPurchasePreview : public click::CancelPurchasePreview  {
 public:
     FakeCancelPurchasePreview(const unity::scopes::Result& result, bool installed)
 
=== modified file 'scope/clickapps/apps-scope.cpp'
--- scope/clickapps/apps-scope.cpp	2015-05-29 08:59:56 +0000
+++ scope/clickapps/apps-scope.cpp	2015-07-02 22:21:56 +0000
@@ -52,6 +52,8 @@
     nam.reset(new click::network::AccessManager());
     client.reset(new click::web::Client(nam));
     index.reset(new click::Index(client));
+    pay_package.reset(new pay::Package(client));
+
     try
     {
         depts_db = click::DepartmentsDb::open(false);
@@ -99,7 +101,7 @@
         const unity::scopes::ActionMetadata& metadata) {
     qDebug() << "Scope::preview() called.";
     auto preview = new click::Preview(result, metadata);
-    preview->choose_strategy(client, nam, depts_db);
+    preview->choose_strategy(client, nam, pay_package, depts_db);
     return unity::scopes::PreviewQueryBase::UPtr{preview};
 }
 
 
=== modified file 'scope/clickapps/apps-scope.h'
--- scope/clickapps/apps-scope.h	2014-08-01 15:04:19 +0000
+++ scope/clickapps/apps-scope.h	2015-07-02 22:21:56 +0000
@@ -30,14 +30,15 @@
 #ifndef APPS_SCOPE_H
 #define APPS_SCOPE_H
 
+#include <click/index.h>
 #include <click/network_access_manager.h>
+#include <click/pay.h>
 #include <click/webclient.h>
 
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/ActivationQueryBase.h>
 
-#include <click/index.h>
 
 namespace scopes = unity::scopes;
 
@@ -67,6 +68,7 @@
     QSharedPointer<click::network::AccessManager> nam;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;
+    QSharedPointer<pay::Package> pay_package;
     std::shared_ptr<click::DepartmentsDb> depts_db;
 
     std::string installApplication(unity::scopes::Result const& result);
 
=== modified file 'scope/clickstore/store-scope.cpp'
--- scope/clickstore/store-scope.cpp	2015-04-24 21:30:39 +0000
+++ scope/clickstore/store-scope.cpp	2015-07-02 22:21:56 +0000
@@ -103,7 +103,7 @@
         const unity::scopes::ActionMetadata& metadata) {
     qDebug() << "Scope::preview() called.";
     auto preview = new click::Preview(result, metadata);
-    preview->choose_strategy(client, nam, depts_db);
+    preview->choose_strategy(client, nam, pay_package, depts_db);
     return unity::scopes::PreviewQueryBase::UPtr{preview};
 }
 
@@ -124,6 +124,7 @@
         std::string download_sha512 = metadata.scope_data().get_dict()["download_sha512"].get_string();
         activation->setHint("download_sha512", unity::scopes::Variant(download_sha512));
         activation->setHint("action_id", unity::scopes::Variant(click::Preview::Actions::INSTALL_CLICK));
+        activation->setHint("purchased", unity::scopes::Variant(true));
         qDebug() << "returning ShowPreview";
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     } else if (action_id == "purchaseError") {
@@ -144,6 +145,7 @@
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     } else if (action_id == click::Preview::Actions::DOWNLOAD_COMPLETED) {
         activation->setHint(click::Preview::Actions::DOWNLOAD_COMPLETED, unity::scopes::Variant(true));
+        activation->setHint("installed", unity::scopes::Variant(true));
         activation->setStatus(unity::scopes::ActivationResponse::Status::ShowPreview);
     } else if (action_id == click::Preview::Actions::CANCEL_PURCHASE_INSTALLED) {
         activation->setHint(click::Preview::Actions::CANCEL_PURCHASE_INSTALLED, unity::scopes::Variant(true));
 
=== modified file 'scope/clickstore/store-scope.h'
--- scope/clickstore/store-scope.h	2015-04-14 21:19:21 +0000
+++ scope/clickstore/store-scope.h	2015-07-02 22:21:56 +0000
@@ -71,10 +71,10 @@
     QSharedPointer<click::network::AccessManager> nam;
     QSharedPointer<click::web::Client> client;
     QSharedPointer<click::Index> index;
+    QSharedPointer<pay::Package> pay_package;
     std::shared_ptr<click::DepartmentLookup> depts;
     std::shared_ptr<click::HighlightList> highlights;
     std::shared_ptr<click::DepartmentsDb> depts_db;
-    std::shared_ptr<pay::Package> pay_package;
 
     std::string installApplication(unity::scopes::Result const& result);
 };