Merge lp:~jonas-drange/account-polld/lp1570415 into lp:~ubuntu-push-hackers/account-polld/trunk

[Jonas G. Drange]

Emit haptic and audible feedback only on the first notification in a batch of notifications.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:159
http://jenkins.qa.ubuntu.com/job/account-polld-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/98/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works for case if # rec messages < batch limit. But think there is a related condition that is not covered. If we recv > batchlimit # of messages, the notification shows "20 new messages" but seems we get two sets of vibrations. Guessing first one is for the message 0 and the next one is for the batch notification? In this case we should only vibrate once on the batch notification

review: Needs Fixing

[lp:~jonas-drange/account-polld/lp1570415]

160. By Jonas G. Drange on 2016-04-20

fix case #2 and lower notf limit

161. By Jonas G. Drange on 2016-04-20

tweak params for vibrate

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:160
http://jenkins.qa.ubuntu.com/job/account-polld-ci/99/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/99/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/account-polld-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/100/rebuild

review: Approve (continuous-integration)

[lp:~jonas-drange/account-polld/lp1570415]

162. By Jonas G. Drange on 2016-04-20

revert limit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/account-polld-ci/101/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-vivid-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/101/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

tested, works in both cases now.

review: Approve

=== modified file 'cmd/account-polld/main.go'
--- cmd/account-polld/main.go	2015-12-19 19:54:01 +0000
+++ cmd/account-polld/main.go	2016-04-20 11:10:28 +0000
@@ -175,7 +175,13 @@
 			notifs := batch.Messages
 			overflowing := len(notifs) > batch.Limit
 
-			for _, n := range notifs {
+			for i, n := range notifs {
+				// Play sound and vibrate on first notif only.
+				if i > 0 {
+					n.Notification.Vibrate = false
+					n.Notification.Sound = ""
+				}
+
 				// We're overflowing, so no popups.
 				// See LP: #1527171
 				if overflowing {
@@ -186,6 +192,7 @@
 			if overflowing {
 				n := batch.OverflowHandler(notifs)
 				n.Notification.Card.Persist = false
+				n.Notification.Vibrate = false
 				notifs = append(notifs, n)
 			}