Merge lp:~didrocks/unity-lens-shopping/add-conditional-activation into lp:unity-lens-shopping

[Didier Roche-Tolomelli]

add conditional search activation to the shopping lens (LP: #1054746).

add conditional search activation to the shopping lens (LP: #1054746).

Manual test (like the rest of the lens) added

[lp:~didrocks/unity-lens-shopping/add-conditional-activation]

23. By Didier Roche-Tolomelli on 2012-09-26

just invoke the singleton once

24. By Didier Roche-Tolomelli on 2012-09-26

bump the libunity build-dep

25. By Didier Roche-Tolomelli on 2012-09-26

fix typo

26. By Didier Roche-Tolomelli on 2012-09-26

comply to latest API

27. By Didier Roche-Tolomelli on 2012-09-26

listen to property change to retrigger a search and remove a message

28. By Didier Roche-Tolomelli on 2012-09-26

simplify the flow

[Michal Hruby (mhr3)]

Great! +1

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-09-25 18:34:26 +0000
+++ configure.ac	2012-09-26 15:26:32 +0000
@@ -64,7 +64,7 @@
                   gee-1.0
                   libsoup-gnome-2.4
                   json-glib-1.0
-                  unity >= 5.93.0)
+                  unity >= 6.7)
 
 AC_SUBST(LENS_DAEMON_CFLAGS)
 AC_SUBST(LENS_DAEMON_LIBS)

=== modified file 'src/scope.vala'
--- src/scope.vala	2012-09-26 11:10:59 +0000
+++ src/scope.vala	2012-09-26 15:26:32 +0000
@@ -30,6 +30,8 @@
     private Soup.Session session;
     private PreviewPlayerHandler player;
 
+    private PreferencesManager preferences = PreferencesManager.get_default ();
+
     public ShoppingScope ()
     {
       Object (dbus_path: "/com/canonical/unity/scope/shopping");
@@ -73,12 +75,26 @@
       global_results_details_map = new HashTable<string, string> (str_hash,
                                                                   str_equal);
       global_results_model.set_data ("details-map", global_results_details_map);
+
+      preferences.notify["remote-content-search"].connect ((obj, pspec) => { queue_search_changed (SearchType.GLOBAL); });
     }
     
     private async void update_search_async (LensSearch search,
                                             SearchType search_type,
                                             Cancellable cancellable)
     {
+
+      /**
+       * only perform the request if the user has not disabled
+       * online/commercial suggestions. That will hide the category as well.
+       */
+      if (preferences.remote_content_search != Unity.PreferencesManager.RemoteContent.ALL)
+      {
+        search.results_model.clear ();
+        search.finished ();
+        return;
+      }
+
       if (search_type == SearchType.GLOBAL)
         yield perform_global_search (search, cancellable);
       else

=== modified file 'tests/manual-tests/shopping-lens-tests.txt'
--- tests/manual-tests/shopping-lens-tests.txt	2012-09-18 12:22:25 +0000
+++ tests/manual-tests/shopping-lens-tests.txt	2012-09-26 15:26:32 +0000
@@ -69,3 +69,19 @@
 
 Expected Results:
 Web site for selected item is opened in web browser, with an option to complete purchase.
+
+'Disable' Shopping Lens Search
+----------------------------------------------------
+Disabling the shopping lens should not show any result.
+
+Setup:
+Internet connectivity.
+
+Actions:
+Disable the online/commercial search in gnome-control-center or directly in gsettings
+(com.canonical.Unity.Lenses "remote-content-search" to none)
+Perfom a search in the home dash
+
+Expected Results:
+No "More suggestions" category should appear. If the lens is run manually,
+a "Unity shopping lens online search disabled." message should appear.