Merge lp:ubuntu-push/automatic into lp:ubuntu-push/vivid-overlay

[Jonas G. Drange]

[postal] make sure we don't gobble notifications when screen is locked, even if the app getting notified is focused.

[postal] make sure we don't gobble notifications when screen is locked, even if the app getting notified is focused.

=== modified file 'client/service/postal.go'
--- client/service/postal.go	2015-07-14 19:00:39 +0000
+++ client/service/postal.go	2015-11-02 13:11:11 +0000
@@ -428,27 +428,30 @@
 		return false
 	}
 
+	locked := svc.unityGreeter.IsActive()
+	focused := svc.windowStack.IsAppFocused(app)
+
 	if output.Notification.Card != nil && output.Notification.Card.Popup {
-		if svc.unityGreeter.IsActive() {
+		if locked {
 			// Screen is locked, ensure popup is false
 			output.Notification.Card.Popup = false
 		}
 	}
 
-	if !svc.windowStack.IsAppFocused(app) {
-		if isBlacklisted(app) {
-			svc.Log.Debugf("notification skipped (except emblem counter) because app is blacklisted")
-			return svc.emblemCounter.Present(app, nid, output.Notification)
-		}
-
-		b := false
-		for _, p := range svc.Presenters {
-			// we don't want this to shortcut :)
-			b = p.Present(app, nid, output.Notification) || b
-		}
-		return b
-	} else {
+	if !locked && focused {
 		svc.Log.Debugf("notification skipped because app is focused.")
 		return false
 	}
+
+	if isBlacklisted(app) {
+		svc.Log.Debugf("notification skipped (except emblem counter) because app is blacklisted")
+		return svc.emblemCounter.Present(app, nid, output.Notification)
+	}
+
+	b := false
+	for _, p := range svc.Presenters {
+		// we don't want this to shortcut :)
+		b = p.Present(app, nid, output.Notification) || b
+	}
+	return b
 }
 
=== modified file 'client/service/postal_test.go'
--- client/service/postal_test.go	2015-04-16 15:46:46 +0000
+++ client/service/postal_test.go	2015-11-02 13:11:11 +0000
@@ -857,6 +857,7 @@
 		[]windowstack.WindowsInfo{},
 		[]windowstack.WindowsInfo{},
 		[]windowstack.WindowsInfo{})
+	ps.unityGreeterBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), false, false, false, false)
 	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.Start()
 	ps.blacklisted = false
@@ -871,7 +872,22 @@
 	c.Check(svc.messageHandler(app, "0", output), Equals, true)
 	c.Check(svc.messageHandler(app, "1", embOut), Equals, true)
 	ps.blacklisted = true
-	// and regular notifications (but not emblem counters) are supprsessed if blacklisted.
+	// and regular notifications (but not emblem counters) are suppressed if blacklisted.
 	c.Check(svc.messageHandler(app, "2", output), Equals, false)
 	c.Check(svc.messageHandler(app, "3", embOut), Equals, true)
 }
+
+func (ps *postalSuite) TestFocusedAppButLockedScreenNotification(c *C) {
+	appId := "com.example.test_test-app"
+	ps.winStackBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), []windowstack.WindowsInfo{{0, appId, true, 0}})
+	ps.unityGreeterBus = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), true)
+	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
+	// svc.WindowStackEndp = ps.winStackBus
+	svc.Start()
+
+	card := &launch_helper.Card{Icon: "icon-value", Summary: "summary-value", Persist: true}
+	output := &launch_helper.HelperOutput{Notification: &launch_helper.Notification{Card: card}}
+	app := clickhelp.MustParseAppId(fmt.Sprintf("%v_0", appId))
+
+	c.Check(svc.messageHandler(app, "0", output), Equals, true)
+}