Merge lp:~sergiusens/account-polld/click_poll_check into lp:~phablet-team/account-polld/trunk

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 18
Merged at revision: 17
Proposed branch: lp:~sergiusens/account-polld/click_poll_check
Merge into: lp:~phablet-team/account-polld/trunk
Prerequisite: lp:~sergiusens/account-polld/oa_fixes
Diff against target: 59 lines (+26/-0)
2 files modified
cmd/account-polld/account_manager.go (+24/-0)
debian/control (+2/-0)
To merge this branch: bzr merge lp:~sergiusens/account-polld/click_poll_check
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+228196@code.launchpad.net

Commit message

Click installation check before poll

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
18. By Sergio Schvezov

Adding libclick

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmd/account-polld/account_manager.go'
2--- cmd/account-polld/account_manager.go 2014-07-17 18:35:36 +0000
3+++ cmd/account-polld/account_manager.go 2014-07-24 21:16:14 +0000
4@@ -24,6 +24,7 @@
5
6 "launchpad.net/account-polld/accounts"
7 "launchpad.net/account-polld/plugins"
8+ "launchpad.net/ubuntu-push/click"
9 )
10
11 type AccountManager struct {
12@@ -71,6 +72,13 @@
13 a.authMutex.Lock()
14 defer a.authMutex.Unlock()
15
16+ if !isClickInstalled(a.plugin.ApplicationId()) {
17+ log.Println(
18+ "Skipping account", a.authData.AccountId, "as target click",
19+ a.plugin.ApplicationId(), "is not installed")
20+ return
21+ }
22+
23 if !a.authData.Enabled {
24 log.Println("Account", a.authData.AccountId, "no longer enabled")
25 return
26@@ -92,3 +100,19 @@
27 defer a.authMutex.Unlock()
28 a.authData = authData
29 }
30+
31+func isClickInstalled(appId plugins.ApplicationId) bool {
32+ user, err := click.User()
33+ if err != nil {
34+ log.Println("User instance for click cannot be created to determine if click application", appId, "was installed")
35+ return false
36+ }
37+
38+ app, err := click.ParseAppId(string(appId))
39+ if err != nil {
40+ log.Println("Could not parse APP_ID for", appId)
41+ return false
42+ }
43+
44+ return user.Installed(app, false)
45+}
46
47=== modified file 'debian/control'
48--- debian/control 2014-07-23 18:31:38 +0000
49+++ debian/control 2014-07-24 21:16:14 +0000
50@@ -8,7 +8,9 @@
51 golang-go-dbus-dev,
52 golang-go-xdg-dev,
53 golang-gocheck-dev,
54+ golang-ubuntu-push-dev,
55 libaccounts-glib-dev,
56+ libclick-0.4-dev,
57 libsignon-glib-dev,
58 Standards-Version: 3.9.5
59 Homepage: https://launchpad.net/account-polld

Subscribers

People subscribed via source and target branches