Merge lp:~stolowski/libunity/pass-activation-hints into lp:libunity

[Paweł Stołowski]

Pass hints to AggregatorScope activation handler so that it can access action id if it's a preview action activation. Properly set uri in the activation reply if goto_uri is set.

Pass hints to AggregatorScope activation handler so that it can access action id if it's a preview action activation. Properly set uri in the activation reply if goto_uri is set.

[lp:~stolowski/libunity/pass-activation-hints]

310. By Paweł Stołowski on 2013-10-24

Fixed symbols file.

[Michal Hruby (mhr3)]

Looks great, and since it's less than 1000 lines I don't need to nitpick on anything :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:310
http://jenkins.qa.ubuntu.com/job/libunity-ci/130/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libunity-ci/130/rebuild

review: Approve (continuous-integration)

=== modified file 'configure.ac'
--- configure.ac	2013-09-27 14:37:41 +0000
+++ configure.ac	2013-10-24 15:19:18 +0000
@@ -1,5 +1,5 @@
 # When releasing also remember to update the soname as instructed below
-AC_INIT(libunity, 7.1.2)
+AC_INIT(libunity, 7.1.3)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-22 17:36:19 +0000
+++ debian/changelog	2013-10-24 15:19:18 +0000
@@ -1,3 +1,10 @@
+libunity (7.1.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * Pass hints to activation handler and properly handle goto_uri in AggregatorScope. (LP:
+    #1243623)
+
+ -- Pawel Stolowski <[e-mail]>  Thu, 24 Oct 2013 13:33:18 +0200
+
 libunity (7.1.2+13.10.20131010-0ubuntu2) saucy; urgency=low
 
   * Declare a Breaks: against unity-common (<< 7.1.2) to help apt calculate

=== modified file 'debian/libunity9.symbols'
--- debian/libunity9.symbols	2013-10-01 03:48:37 +0000
+++ debian/libunity9.symbols	2013-10-24 15:19:18 +0000
@@ -89,12 +89,14 @@
  unity_aggregator_activation_construct@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_get_action_type@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_get_channel_id@Base 7.0.0daily13.05.31ubuntu.unity.next
+ unity_aggregator_activation_get_hints@Base 0replaceme
  unity_aggregator_activation_get_scope_id@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_get_scope_result@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_get_type@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_new@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_set_action_type@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_set_channel_id@Base 7.0.0daily13.05.31ubuntu.unity.next
+ unity_aggregator_activation_set_hints@Base 0replaceme
  unity_aggregator_activation_set_scope_id@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_activation_set_scope_result@Base 7.0.0daily13.05.31ubuntu.unity.next
  unity_aggregator_scope_activate@Base 7.0.0daily13.05.31ubuntu.unity.next

=== modified file 'src/unity-aggregator-scope-private.vala'
--- src/unity-aggregator-scope-private.vala	2013-09-24 08:57:39 +0000
+++ src/unity-aggregator-scope-private.vala	2013-10-24 15:19:18 +0000
@@ -964,12 +964,18 @@
     var result_arr_cpy = result_arr;
     var activation_obj = new AggregatorActivation (channel_id, scope_id,
                                                    action_type, scope_result);
+    activation_obj.hints = hints;
 
     var response = yield owner.activate (activation_obj);
     if (response != null)
     {
       var raw = ActivationReplyRaw ();
       raw.uri = scope_result.uri;
+      if (response.goto_uri != null)
+      {
+          var stripped = response.goto_uri.strip ();
+          if (stripped != "") raw.uri = stripped;
+      }
       raw.handled = response.handled;
       raw.hints = response.get_hints ();
 

=== modified file 'src/unity-result-activation.vala'
--- src/unity-result-activation.vala	2013-08-26 08:30:16 +0000
+++ src/unity-result-activation.vala	2013-10-24 15:19:18 +0000
@@ -98,6 +98,7 @@
   public string scope_id { get; set; }
   public uint action_type { get; set; }
   public ScopeResult? scope_result { get; set; }
+  public HashTable<string, Variant> hints { get; internal set; }
 
   public AggregatorActivation (string channel_id, string scope_id,
                                uint action_type, ScopeResult? result)

=== modified file 'test/vala/test-scope.vala'
--- test/vala/test-scope.vala	2013-08-19 12:00:49 +0000
+++ test/vala/test-scope.vala	2013-10-24 15:19:18 +0000
@@ -144,6 +144,8 @@
         Fixture.create<MasterScopeTester> (MasterScopeTester.test_progress_source_property));
     Test.add_data_func ("/Unit/AggregatorScope/CategoryOrderSignal",
         Fixture.create<AggregatorScopeTester> (AggregatorScopeTester.test_scope_category_order_signal));
+    Test.add_data_func ("/Unit/AggregatorScope/Activation",
+        Fixture.create<AggregatorScopeTester> (AggregatorScopeTester.test_scope_activation_handler));
     Test.add_data_func ("/Unity/ScopeLoader/LoadScope",
         Fixture.create<ScopeLoaderTester> (ScopeLoaderTester.test_load_scope));
     Test.add_data_func ("/Unity/ScopeLoader/LoadGroup",
@@ -637,29 +639,40 @@
       return reply_dict;
     }
 
+    public static ActivationReplyRaw? activate (
+        ScopeProxy proxy, string channel_id,
+        Unity.Protocol.ActionType action_type,
+        Unity.ScopeResult result,
+        HashTable<string, Variant> hints)
+    {
+      var ml = new MainLoop ();
+      var result_arr = scope_result_to_variant (result);
+      Unity.Protocol.ActivationReplyRaw? activation_reply = null;
+      proxy.activate.begin (channel_id, result_arr,
+                            action_type,
+                            hints,
+                            null,
+                            (obj, res) =>
+      {
+        try
+        {
+          activation_reply = proxy.activate.end (res);
+        }
+        catch (Error err) { warning ("%s", err.message); }
+        ml.quit ();
+      });
+
+      assert (run_with_timeout (ml));
+      return activation_reply;
+    }
+
     public static ActivationReplyRaw? activate_result (
         ScopeProxy proxy, string channel_id, Unity.ScopeResult result,
         TestScope? target_scope = null)
     {
-      var ml = new MainLoop ();
-      var result_arr = scope_result_to_variant (result);
-      Unity.Protocol.ActivationReplyRaw? activation_reply = null;
-      proxy.activate.begin (channel_id, result_arr,
-                            Unity.Protocol.ActionType.ACTIVATE_RESULT,
-                            new HashTable<string, Variant> (null, null),
-                            null,
-                            (obj, res) =>
-      {
-        try
-        {
-          activation_reply = proxy.activate.end (res);
-        }
-        catch (Error err) { warning ("%s", err.message); }
-        ml.quit ();
-      });
-
-      assert (run_with_timeout (ml));
-      return activation_reply;
+      return activate (proxy, channel_id, Unity.Protocol.ActionType.ACTIVATE_RESULT,
+                       result,
+                       new HashTable<string, Variant> (null, null));
     }
 
     public static HashTable<string, Variant> preview_result (
@@ -2215,6 +2228,8 @@
   {
     class AggScope: Unity.AggregatorScope
     {
+      public signal Unity.ActivationResponse? activation_response_hook (Unity.AggregatorActivation activation);
+
       public AggScope (string dbus_path, string id)
       {
         Object (dbus_path: dbus_path, id: id, is_master: true, merge_mode: Unity.AggregatorScope.MergeMode.OWNER_SCOPE);   
@@ -2241,6 +2256,11 @@
         return 0;
       }
 
+      public override async Unity.ActivationResponse? activate (Unity.AggregatorActivation activation)
+      {
+        return activation_response_hook (activation);
+      }
+
       public override async void search (Unity.AggregatedScopeSearch scope_search)
       {
         var order = new uint32[] {1,0};
@@ -2297,6 +2317,49 @@
       assert (reply_dict != null);
       assert (got_order_changed == true);
     }
+
+    public void test_scope_activation_handler ()
+    {
+      Unity.AggregatorActivation? got_activate = null;
+  
+      assert (proxy != null);
+
+      var channel_id = ScopeTester.open_channel (proxy, ChannelType.DEFAULT, null);
+      assert (channel_id != null);
+
+      Unity.ScopeResult result = Unity.ScopeResult ();
+      result.uri = "file:///foo";
+      result.icon_hint = "";
+      result.category = 0;
+      result.result_type = Unity.ResultType.DEFAULT;
+      result.mimetype = "inode/folder";
+      result.title = "Title";
+      result.comment = "";
+      result.dnd_uri = "file:///";
+      result.metadata = new HashTable<string, Variant> (str_hash, str_equal);
+      result.metadata["scope-id"] = new Variant.string ("foo.scope");
+      result.metadata["content"] = new HashTable<string, Variant> (str_hash, str_equal);
+
+      var hints = new HashTable<string, Variant>(str_hash, str_equal);
+      hints[Unity.Internal.ACTIVATE_PREVIEW_ACTION_HINT] = new Variant.string ("id1");
+      hints["foo"] = new Variant.string ("bar");
+
+      agg_scope.activation_response_hook.connect ((aggactivation) => {
+          got_activate = aggactivation;
+          return new Unity.ActivationResponse (Unity.HandledType.NOT_HANDLED, "http://ubuntu.com");
+      });
+
+      ActivationReplyRaw? activation_reply = ScopeTester.activate (proxy, channel_id, Unity.Protocol.ActionType.PREVIEW_ACTION, result, hints);
+
+      assert (got_activate != null);
+      assert (activation_reply != null);
+      assert (activation_reply.handled == Unity.HandledType.NOT_HANDLED);
+      assert (activation_reply.uri == "http://ubuntu.com");
+      assert (got_activate.channel_id == channel_id);
+      assert (got_activate.hints != null);
+      assert (got_activate.hints[Unity.Internal.ACTIVATE_PREVIEW_ACTION_HINT].get_string () == "id1");
+      assert (got_activate.hints["foo"].get_string () == "bar");
+    }
   }
 
   class TestScopeLoader: Unity.ScopeLoader