The Webapps-core project

Merge lp:~ralsina/webapps-core/push-helpers into lp:webapps-core

  1. push-helpers
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Merged at revision: 61
Proposed branch: lp:~ralsina/webapps-core/push-helpers
Merge into: lp:webapps-core
Diff against target: 212 lines (+73/-8)
16 files modified
webapp-facebook/facebook-helper (+4/-0)
webapp-facebook/facebook-helper-apparmor.json (+6/-0)
webapp-facebook/facebook-helper.json (+3/-0)
webapp-facebook/manifest.json (+4/-0)
webapp-facebook/webapp-facebook.json (+3/-2)
webapp-gmail/gmail-helper (+4/-0)
webapp-gmail/gmail-helper-apparmor.json (+6/-0)
webapp-gmail/gmail-helper.json (+3/-0)
webapp-gmail/gmail.url-dispatcher (+10/-0)
webapp-gmail/manifest.json (+6/-1)
webapp-gmail/webapp-gmail.json (+3/-2)
webapp-twitter/manifest.json (+5/-1)
webapp-twitter/twitter-helper (+4/-0)
webapp-twitter/twitter-helper-apparmor.json (+6/-0)
webapp-twitter/twitter-helper.json (+3/-0)
webapp-twitter/webapp-twitter.json (+3/-2)
To merge this branch: bzr merge lp:~ralsina/webapps-core/push-helpers

Commit message

Adds push notification helpers to webapps

Description of the change

Add push helpers to the push-supporting apps.

Known Issue: The helper itself is hacky

To post a comment you must log in.
lp:~ralsina/webapps-core/push-helpers updated
64. By Roberto Alsina

helper names fixed

65. By Roberto Alsina

added url dispatcher for gmail

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file 'webapp-facebook/facebook-helper'
--- webapp-facebook/facebook-helper 1970-01-01 00:00:00 +0000
+++ webapp-facebook/facebook-helper 2014-08-01 15:06:35 +0000
@@ -0,0 +1,4 @@
1#!/usr/lib/initramfs-tools/bin/busybox static-sh
2cp $1 $2
3
4# This is just a temporary hack!
0\ No newline at end of file5\ No newline at end of file
16
=== added file 'webapp-facebook/facebook-helper-apparmor.json'
--- webapp-facebook/facebook-helper-apparmor.json 1970-01-01 00:00:00 +0000
+++ webapp-facebook/facebook-helper-apparmor.json 2014-08-01 15:06:35 +0000
@@ -0,0 +1,6 @@
1{
2 "policy_groups": [
3 "push-notification-client"
4 ],
5 "policy_version": 1.2
6}
07
=== added file 'webapp-facebook/facebook-helper.json'
--- webapp-facebook/facebook-helper.json 1970-01-01 00:00:00 +0000
+++ webapp-facebook/facebook-helper.json 2014-08-01 15:06:35 +0000
@@ -0,0 +1,3 @@
1{
2 "exec": "facebook-helper"
3}
04
=== modified file 'webapp-facebook/manifest.json'
--- webapp-facebook/manifest.json 2014-08-01 01:07:59 +0000
+++ webapp-facebook/manifest.json 2014-08-01 15:06:35 +0000
@@ -9,6 +9,10 @@
9 "account-service": "webapp-facebook.service",9 "account-service": "webapp-facebook.service",
10 "apparmor": "webapp-facebook.json",10 "apparmor": "webapp-facebook.json",
11 "desktop": "webapp-facebook.desktop"11 "desktop": "webapp-facebook.desktop"
12 },
13 "webapp-facebook-helper": {
14 "apparmor": "facebook-helper-apparmor.json",
15 "push-helper": "facebook-helper.json"
12 }16 }
13 },17 },
14 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",18 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
1519
=== modified file 'webapp-facebook/webapp-facebook.json'
--- webapp-facebook/webapp-facebook.json 2014-06-19 17:20:53 +0000
+++ webapp-facebook/webapp-facebook.json 2014-08-01 15:06:35 +0000
@@ -1,13 +1,14 @@
1{1{
2 "template": "ubuntu-webapp",2 "template": "ubuntu-webapp",
3 "policy_groups": [ 3 "policy_groups": [
4 "networking",4 "networking",
5 "accounts",5 "accounts",
6 "audio",6 "audio",
7 "video",7 "video",
8 "webview",8 "webview",
9 "location",9 "location",
10 "content_exchange"10 "content_exchange",
11 "push-notification-client"
11 ],12 ],
12 "policy_version": 1.213 "policy_version": 1.2
13}14}
1415
=== added file 'webapp-gmail/gmail-helper'
--- webapp-gmail/gmail-helper 1970-01-01 00:00:00 +0000
+++ webapp-gmail/gmail-helper 2014-08-01 15:06:35 +0000
@@ -0,0 +1,4 @@
1#!/usr/lib/initramfs-tools/bin/busybox static-sh
2cp $1 $2
3
4# This is just a temporary hack!
0\ No newline at end of file5\ No newline at end of file
16
=== added file 'webapp-gmail/gmail-helper-apparmor.json'
--- webapp-gmail/gmail-helper-apparmor.json 1970-01-01 00:00:00 +0000
+++ webapp-gmail/gmail-helper-apparmor.json 2014-08-01 15:06:35 +0000
@@ -0,0 +1,6 @@
1{
2 "policy_groups": [
3 "push-notification-client"
4 ],
5 "policy_version": 1.2
6}
07
=== added file 'webapp-gmail/gmail-helper.json'
--- webapp-gmail/gmail-helper.json 1970-01-01 00:00:00 +0000
+++ webapp-gmail/gmail-helper.json 2014-08-01 15:06:35 +0000
@@ -0,0 +1,3 @@
1{
2 "exec": "gmail-helper"
3}
04
=== added file 'webapp-gmail/gmail.url-dispatcher'
--- webapp-gmail/gmail.url-dispatcher 1970-01-01 00:00:00 +0000
+++ webapp-gmail/gmail.url-dispatcher 2014-08-01 15:06:35 +0000
@@ -0,0 +1,10 @@
1[
2 {
3 "protocol": "http",
4 "domain-suffix": "mail.google.com"
5 },
6 {
7 "protocol": "https",
8 "domain-suffix": "mail.google.com"
9 }
10]
011
=== modified file 'webapp-gmail/manifest.json'
--- webapp-gmail/manifest.json 2014-07-02 14:56:16 +0000
+++ webapp-gmail/manifest.json 2014-08-01 15:06:35 +0000
@@ -1,11 +1,16 @@
1{1{
2 "description": "Gmail (webapp version)",2 "description": "Gmail (webapp version)",
3 "framework": "ubuntu-sdk-14.04-dev1",3 "framework": "ubuntu-sdk-14.10-dev2",
4 "architecture": "all",4 "architecture": "all",
5 "hooks": {5 "hooks": {
6 "webapp-gmail": {6 "webapp-gmail": {
7 "apparmor": "webapp-gmail.json",7 "apparmor": "webapp-gmail.json",
8 "urls": "gmail.url-dispatcher",
8 "desktop": "webapp-gmail.desktop"9 "desktop": "webapp-gmail.desktop"
10 },
11 "webapp-gmail-helper": {
12 "apparmor": "gmail-helper-apparmor.json",
13 "push-helper": "gmail-helper.json"
9 }14 }
10 },15 },
11 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",16 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
1217
=== modified file 'webapp-gmail/webapp-gmail.json'
--- webapp-gmail/webapp-gmail.json 2014-07-02 14:56:16 +0000
+++ webapp-gmail/webapp-gmail.json 2014-08-01 15:06:35 +0000
@@ -6,7 +6,8 @@
6 "video",6 "video",
7 "webview",7 "webview",
8 "content_exchange",8 "content_exchange",
9 "content_exchange_source"9 "content_exchange_source",
10 "push-notification-client"
10 ],11 ],
11 "policy_version": 1.112 "policy_version": 1.2
12}13}
1314
=== modified file 'webapp-twitter/manifest.json'
--- webapp-twitter/manifest.json 2014-07-26 13:20:16 +0000
+++ webapp-twitter/manifest.json 2014-08-01 15:06:35 +0000
@@ -1,6 +1,6 @@
1{1{
2 "description": "Twitter (webapp version)",2 "description": "Twitter (webapp version)",
3 "framework": "ubuntu-sdk-14.04-dev1",3 "framework": "ubuntu-sdk-14.10-dev2",
4 "architecture": "all",4 "architecture": "all",
5 "hooks": {5 "hooks": {
6 "webapp-twitter": {6 "webapp-twitter": {
@@ -9,6 +9,10 @@
9 "apparmor": "webapp-twitter.json",9 "apparmor": "webapp-twitter.json",
10 "urls": "twitter.url-dispatcher",10 "urls": "twitter.url-dispatcher",
11 "desktop": "webapp-twitter.desktop"11 "desktop": "webapp-twitter.desktop"
12 },
13 "webapp-twitter-helper": {
14 "apparmor": "twitter-helper-apparmor.json",
15 "push-helper": "twitter-helper.json"
12 }16 }
13 },17 },
14 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",18 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
1519
=== added file 'webapp-twitter/twitter-helper'
--- webapp-twitter/twitter-helper 1970-01-01 00:00:00 +0000
+++ webapp-twitter/twitter-helper 2014-08-01 15:06:35 +0000
@@ -0,0 +1,4 @@
1#!/usr/lib/initramfs-tools/bin/busybox static-sh
2cp $1 $2
3
4# This is just a temporary hack!
0\ No newline at end of file5\ No newline at end of file
16
=== added file 'webapp-twitter/twitter-helper-apparmor.json'
--- webapp-twitter/twitter-helper-apparmor.json 1970-01-01 00:00:00 +0000
+++ webapp-twitter/twitter-helper-apparmor.json 2014-08-01 15:06:35 +0000
@@ -0,0 +1,6 @@
1{
2 "policy_groups": [
3 "push-notification-client"
4 ],
5 "policy_version": 1.2
6}
07
=== added file 'webapp-twitter/twitter-helper.json'
--- webapp-twitter/twitter-helper.json 1970-01-01 00:00:00 +0000
+++ webapp-twitter/twitter-helper.json 2014-08-01 15:06:35 +0000
@@ -0,0 +1,3 @@
1{
2 "exec": "twitter-helper"
3}
04
=== modified file 'webapp-twitter/webapp-twitter.json'
--- webapp-twitter/webapp-twitter.json 2014-04-10 21:52:56 +0000
+++ webapp-twitter/webapp-twitter.json 2014-08-01 15:06:35 +0000
@@ -7,7 +7,8 @@
7 "location",7 "location",
8 "camera",8 "camera",
9 "webview",9 "webview",
10 "content_exchange"10 "content_exchange",
11 "push-notification-client"
11 ],12 ],
12 "policy_version": 1.113 "policy_version": 1.2
13}14}

Subscribers

People subscribed via source and target branches

to all changes: