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
1=== added file 'webapp-facebook/facebook-helper'
2--- webapp-facebook/facebook-helper 1970-01-01 00:00:00 +0000
3+++ webapp-facebook/facebook-helper 2014-08-01 15:06:35 +0000
4@@ -0,0 +1,4 @@
5+#!/usr/lib/initramfs-tools/bin/busybox static-sh
6+cp $1 $2
7+
8+# This is just a temporary hack!
9\ No newline at end of file
10
11=== added file 'webapp-facebook/facebook-helper-apparmor.json'
12--- webapp-facebook/facebook-helper-apparmor.json 1970-01-01 00:00:00 +0000
13+++ webapp-facebook/facebook-helper-apparmor.json 2014-08-01 15:06:35 +0000
14@@ -0,0 +1,6 @@
15+{
16+ "policy_groups": [
17+ "push-notification-client"
18+ ],
19+ "policy_version": 1.2
20+}
21
22=== added file 'webapp-facebook/facebook-helper.json'
23--- webapp-facebook/facebook-helper.json 1970-01-01 00:00:00 +0000
24+++ webapp-facebook/facebook-helper.json 2014-08-01 15:06:35 +0000
25@@ -0,0 +1,3 @@
26+{
27+ "exec": "facebook-helper"
28+}
29
30=== modified file 'webapp-facebook/manifest.json'
31--- webapp-facebook/manifest.json 2014-08-01 01:07:59 +0000
32+++ webapp-facebook/manifest.json 2014-08-01 15:06:35 +0000
33@@ -9,6 +9,10 @@
34 "account-service": "webapp-facebook.service",
35 "apparmor": "webapp-facebook.json",
36 "desktop": "webapp-facebook.desktop"
37+ },
38+ "webapp-facebook-helper": {
39+ "apparmor": "facebook-helper-apparmor.json",
40+ "push-helper": "facebook-helper.json"
41 }
42 },
43 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
44
45=== modified file 'webapp-facebook/webapp-facebook.json'
46--- webapp-facebook/webapp-facebook.json 2014-06-19 17:20:53 +0000
47+++ webapp-facebook/webapp-facebook.json 2014-08-01 15:06:35 +0000
48@@ -1,13 +1,14 @@
49 {
50 "template": "ubuntu-webapp",
51- "policy_groups": [
52+ "policy_groups": [
53 "networking",
54 "accounts",
55 "audio",
56 "video",
57 "webview",
58 "location",
59- "content_exchange"
60+ "content_exchange",
61+ "push-notification-client"
62 ],
63 "policy_version": 1.2
64 }
65
66=== added file 'webapp-gmail/gmail-helper'
67--- webapp-gmail/gmail-helper 1970-01-01 00:00:00 +0000
68+++ webapp-gmail/gmail-helper 2014-08-01 15:06:35 +0000
69@@ -0,0 +1,4 @@
70+#!/usr/lib/initramfs-tools/bin/busybox static-sh
71+cp $1 $2
72+
73+# This is just a temporary hack!
74\ No newline at end of file
75
76=== added file 'webapp-gmail/gmail-helper-apparmor.json'
77--- webapp-gmail/gmail-helper-apparmor.json 1970-01-01 00:00:00 +0000
78+++ webapp-gmail/gmail-helper-apparmor.json 2014-08-01 15:06:35 +0000
79@@ -0,0 +1,6 @@
80+{
81+ "policy_groups": [
82+ "push-notification-client"
83+ ],
84+ "policy_version": 1.2
85+}
86
87=== added file 'webapp-gmail/gmail-helper.json'
88--- webapp-gmail/gmail-helper.json 1970-01-01 00:00:00 +0000
89+++ webapp-gmail/gmail-helper.json 2014-08-01 15:06:35 +0000
90@@ -0,0 +1,3 @@
91+{
92+ "exec": "gmail-helper"
93+}
94
95=== added file 'webapp-gmail/gmail.url-dispatcher'
96--- webapp-gmail/gmail.url-dispatcher 1970-01-01 00:00:00 +0000
97+++ webapp-gmail/gmail.url-dispatcher 2014-08-01 15:06:35 +0000
98@@ -0,0 +1,10 @@
99+[
100+ {
101+ "protocol": "http",
102+ "domain-suffix": "mail.google.com"
103+ },
104+ {
105+ "protocol": "https",
106+ "domain-suffix": "mail.google.com"
107+ }
108+]
109
110=== modified file 'webapp-gmail/manifest.json'
111--- webapp-gmail/manifest.json 2014-07-02 14:56:16 +0000
112+++ webapp-gmail/manifest.json 2014-08-01 15:06:35 +0000
113@@ -1,11 +1,16 @@
114 {
115 "description": "Gmail (webapp version)",
116- "framework": "ubuntu-sdk-14.04-dev1",
117+ "framework": "ubuntu-sdk-14.10-dev2",
118 "architecture": "all",
119 "hooks": {
120 "webapp-gmail": {
121 "apparmor": "webapp-gmail.json",
122+ "urls": "gmail.url-dispatcher",
123 "desktop": "webapp-gmail.desktop"
124+ },
125+ "webapp-gmail-helper": {
126+ "apparmor": "gmail-helper-apparmor.json",
127+ "push-helper": "gmail-helper.json"
128 }
129 },
130 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
131
132=== modified file 'webapp-gmail/webapp-gmail.json'
133--- webapp-gmail/webapp-gmail.json 2014-07-02 14:56:16 +0000
134+++ webapp-gmail/webapp-gmail.json 2014-08-01 15:06:35 +0000
135@@ -6,7 +6,8 @@
136 "video",
137 "webview",
138 "content_exchange",
139- "content_exchange_source"
140+ "content_exchange_source",
141+ "push-notification-client"
142 ],
143- "policy_version": 1.1
144+ "policy_version": 1.2
145 }
146
147=== modified file 'webapp-twitter/manifest.json'
148--- webapp-twitter/manifest.json 2014-07-26 13:20:16 +0000
149+++ webapp-twitter/manifest.json 2014-08-01 15:06:35 +0000
150@@ -1,6 +1,6 @@
151 {
152 "description": "Twitter (webapp version)",
153- "framework": "ubuntu-sdk-14.04-dev1",
154+ "framework": "ubuntu-sdk-14.10-dev2",
155 "architecture": "all",
156 "hooks": {
157 "webapp-twitter": {
158@@ -9,6 +9,10 @@
159 "apparmor": "webapp-twitter.json",
160 "urls": "twitter.url-dispatcher",
161 "desktop": "webapp-twitter.desktop"
162+ },
163+ "webapp-twitter-helper": {
164+ "apparmor": "twitter-helper-apparmor.json",
165+ "push-helper": "twitter-helper.json"
166 }
167 },
168 "maintainer": "Webapps Team <webapps@lists.launchpad.net>",
169
170=== added file 'webapp-twitter/twitter-helper'
171--- webapp-twitter/twitter-helper 1970-01-01 00:00:00 +0000
172+++ webapp-twitter/twitter-helper 2014-08-01 15:06:35 +0000
173@@ -0,0 +1,4 @@
174+#!/usr/lib/initramfs-tools/bin/busybox static-sh
175+cp $1 $2
176+
177+# This is just a temporary hack!
178\ No newline at end of file
179
180=== added file 'webapp-twitter/twitter-helper-apparmor.json'
181--- webapp-twitter/twitter-helper-apparmor.json 1970-01-01 00:00:00 +0000
182+++ webapp-twitter/twitter-helper-apparmor.json 2014-08-01 15:06:35 +0000
183@@ -0,0 +1,6 @@
184+{
185+ "policy_groups": [
186+ "push-notification-client"
187+ ],
188+ "policy_version": 1.2
189+}
190
191=== added file 'webapp-twitter/twitter-helper.json'
192--- webapp-twitter/twitter-helper.json 1970-01-01 00:00:00 +0000
193+++ webapp-twitter/twitter-helper.json 2014-08-01 15:06:35 +0000
194@@ -0,0 +1,3 @@
195+{
196+ "exec": "twitter-helper"
197+}
198
199=== modified file 'webapp-twitter/webapp-twitter.json'
200--- webapp-twitter/webapp-twitter.json 2014-04-10 21:52:56 +0000
201+++ webapp-twitter/webapp-twitter.json 2014-08-01 15:06:35 +0000
202@@ -7,7 +7,8 @@
203 "location",
204 "camera",
205 "webview",
206- "content_exchange"
207+ "content_exchange",
208+ "push-notification-client"
209 ],
210- "policy_version": 1.1
211+ "policy_version": 1.2
212 }

Subscribers

People subscribed via source and target branches

to all changes: