Merge lp:~3v1n0/ubuntu-push-qml/register-wait-for-network into lp:ubuntu-push-qml
Proposed by
Marco Trevisan (Treviño)
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Roberto Alsina | ||||
Approved revision: | 19 | ||||
Merged at revision: | 21 | ||||
Proposed branch: | lp:~3v1n0/ubuntu-push-qml/register-wait-for-network | ||||
Merge into: | lp:ubuntu-push-qml | ||||
Diff against target: |
138 lines (+45/-6) 5 files modified
CMakeLists.txt (+3/-0) debian/control (+2/-0) src/Ubuntu/PushNotifications/CMakeLists.txt (+3/-0) src/Ubuntu/PushNotifications/pushclient.cpp (+30/-4) src/Ubuntu/PushNotifications/pushclient.h (+7/-2) |
||||
To merge this branch: | bzr merge lp:~3v1n0/ubuntu-push-qml/register-wait-for-network | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Roberto Alsina (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+252603@code.launchpad.net |
Commit message
PushClient: only try to register if we're currently connected, or wait for connection
Description of the change
Without this, just including a push client inside an app fails all the times, and it's not easily possible to get a token as soon as we get online. See attached bug for more info and qml possible solutions.
To post a comment you must log in.
FAILED: Continuous integration, rev:18 jenkins. qa.ubuntu. com/job/ ubuntu- push-qml- ci/37/ jenkins. qa.ubuntu. com/job/ ubuntu- push-qml- vivid-amd64- ci/11/console jenkins. qa.ubuntu. com/job/ ubuntu- push-qml- vivid-armhf- ci/11/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- push-qml- ci/37/rebuild
http://