Merge lp:~osomon/webapps-core/gmaps-intent-hook into lp:webapps-core

[Olivier Tilloy]

Add a URL dispatcher hook to the google maps app to handle intent:// URLs targetted at com.google.android.apps.maps.

WARNING: this shouldn’t be published until support for intent URIs in the container has landed in both vivid and RTM!

[David Barth (dbarth)]

review: Approve

[lp:~osomon/webapps-core/gmaps-intent-hook]

107. By Alexandre Abreu on 2015-01-26

Fix the gmaps URL pattern.

108. By Olivier Tilloy on 2015-02-02

Add an intent filter function.

[Alexandre Abreu (abreu-alexandre)]

You dont need the specific local-intent-filter.js file, when an intent uri is met, a default 'identity' filter is applied which basically is the same the one below,

[lp:~osomon/webapps-core/gmaps-intent-hook]

109. By Olivier Tilloy on 2015-02-02

Remove the custom intent filter as it’s basically the identity function, which the container defaults to already.

[Olivier Tilloy (osomon)]

> You dont need the specific local-intent-filter.js file, when an intent uri is
> met, a default 'identity' filter is applied which basically is the same the
> one below,

D’oh… Removed, thanks.

Unmerged revisions

109. By Olivier Tilloy on 2015-02-02

Remove the custom intent filter as it’s basically the identity function, which the container defaults to already.

108. By Olivier Tilloy on 2015-02-02

Add an intent filter function.

=== modified file 'webapp-googlemaps/manifest.json'
--- webapp-googlemaps/manifest.json	2014-09-26 10:42:03 +0000
+++ webapp-googlemaps/manifest.json	2015-02-02 14:22:59 +0000
@@ -5,7 +5,8 @@
     "hooks": {
         "webapp-googlemaps": {
             "apparmor": "webapp-googlemaps.json",
-            "desktop": "webapp-googlemaps.desktop"
+            "desktop": "webapp-googlemaps.desktop",
+            "urls": "webapp-googlemaps.url-dispatcher"
         }
     },
     "maintainer": "Webapps Team <[e-mail]>",

=== modified file 'webapp-googlemaps/webapp-googlemaps.desktop'
--- webapp-googlemaps/webapp-googlemaps.desktop	2014-08-11 12:34:54 +0000
+++ webapp-googlemaps/webapp-googlemaps.desktop	2015-02-02 14:22:59 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webapp-container --store-session-cookies --webappUrlPatterns=https?://maps.google.*,https://accounts.google.*/*,https://www.google.*/a/*,https://www.google.*/accounts/* https://maps.google.com/ %u
+Exec=webapp-container --store-session-cookies --webappUrlPatterns=https?://maps.google.*/*,https://accounts.google.*/*,https://www.google.*/a/*,https://www.google.*/accounts/* https://maps.google.com/ %u
 Name=Google Maps
 Comment=Google Maps Webapp
 Icon=./webapp-googlemaps.png

=== added file 'webapp-googlemaps/webapp-googlemaps.url-dispatcher'
--- webapp-googlemaps/webapp-googlemaps.url-dispatcher	1970-01-01 00:00:00 +0000
+++ webapp-googlemaps/webapp-googlemaps.url-dispatcher	2015-02-02 14:22:59 +0000
@@ -0,0 +1,6 @@
+[
+    {
+        "protocol": "intent",
+        "domain-suffix": "com.google.android.apps.maps"
+    }
+]