status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

All notifiers remaned into notification

This commit is contained in:
Evgeny Danienko 2017-10-18 23:56:39 +03:00
parent d22cdc5cbb
commit c823acfd04
No known key found for this signature in database
GPG Key ID: BC8C34D8B45BECBF
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
geth/api/backend.go
View File

@ -40,7 +40,7 @@ func NewStatusBackend() *StatusBackend {
accountManager := account.NewManager(nodeManager) accountManager := account.NewManager(nodeManager)
txQueueManager := txqueue.NewManager(nodeManager, accountManager) txQueueManager := txqueue.NewManager(nodeManager, accountManager)
jailManager := jail.New(nodeManager) jailManager := jail.New(nodeManager)
notificationManager := fcm.NewNotifier(fcmServerKey) notificationManager := fcm.NewNotification(fcmServerKey)
return &StatusBackend{ return &StatusBackend{
nodeManager: nodeManager, nodeManager: nodeManager,

18
geth/notification/fcm/notifier.go → geth/notification/fcm/notification.go
View File

@ -6,20 +6,20 @@ import (
"github.com/status-im/status-go/geth/notification" "github.com/status-im/status-go/geth/notification"
) )
// Notifier represents messaging provider for notifications. // Notification represents messaging provider for notifications.
type Notifier struct { type Notification struct {
client firebaseClient client firebaseClient
} }
// NewNotifier Firebase Cloud Messaging client constructor. // NewNotification Firebase Cloud Messaging client constructor.
func NewNotifier(key string) common.NotificationConstructor { func NewNotification(key string) common.NotificationConstructor {
return func() common.Notifier { return func() common.Notifier {
return &Notifier{fcm.NewFcmClient(key)} return &Notification{fcm.NewFcmClient(key)}
} }
} }
// Send send to the tokens list. // Send send to the tokens list.
func (n *Notifier) Send(body interface{}, tokens ...string) error { func (n *Notification) Send(body interface{}, tokens ...string) error {
n.setPayload(&notification.Payload{ n.setPayload(&notification.Payload{
Title: "Status - new message", Title: "Status - new message",
Body: "ping", Body: "ping",
@ -32,17 +32,17 @@ func (n *Notifier) Send(body interface{}, tokens ...string) error {
} }
// SetMessage to send for given the tokens list. // SetMessage to send for given the tokens list.
func (n *Notifier) setMessage(body interface{}, tokens ...string) { func (n *Notification) setMessage(body interface{}, tokens ...string) {
n.client.NewFcmRegIdsMsg(tokens, body) n.client.NewFcmRegIdsMsg(tokens, body)
} }
// SetPayload sets payload message information. // SetPayload sets payload message information.
func (n *Notifier) setPayload(payload *notification.Payload) { func (n *Notification) setPayload(payload *notification.Payload) {
fcmPayload := n.toFCMPayload(payload) fcmPayload := n.toFCMPayload(payload)
n.client.SetNotificationPayload(fcmPayload) n.client.SetNotificationPayload(fcmPayload)
} }
func (n *Notifier) toFCMPayload(payload *notification.Payload) *fcm.NotificationPayload { func (n *Notification) toFCMPayload(payload *notification.Payload) *fcm.NotificationPayload {
return &fcm.NotificationPayload{ return &fcm.NotificationPayload{
Title: payload.Title, Title: payload.Title,
Body: payload.Body, Body: payload.Body,

4
geth/notification/fcm/notifier_test.go → geth/notification/fcm/notification_test.go
View File

@ -37,7 +37,7 @@ func (s *NotifierTestSuite) TestNotifySuccess() {
s.fcmClientMock.EXPECT().SetNotificationPayload(fcmPayload).Times(1) s.fcmClientMock.EXPECT().SetNotificationPayload(fcmPayload).Times(1)
s.fcmClientMock.EXPECT().NewFcmRegIdsMsg(ids, body).Times(1) s.fcmClientMock.EXPECT().NewFcmRegIdsMsg(ids, body).Times(1)
s.fcmClientMock.EXPECT().Send().Return(nil, nil).Times(1) s.fcmClientMock.EXPECT().Send().Return(nil, nil).Times(1)
fcmClient := Notifier{s.fcmClientMock} fcmClient := Notification{s.fcmClientMock}
err := fcmClient.Send(body, ids...) err := fcmClient.Send(body, ids...)
@ -53,7 +53,7 @@ func (s *NotifierTestSuite) TestNotifyError() {
s.fcmClientMock.EXPECT().SetNotificationPayload(fcmPayload).Times(1) s.fcmClientMock.EXPECT().SetNotificationPayload(fcmPayload).Times(1)
s.fcmClientMock.EXPECT().NewFcmRegIdsMsg(ids, body).Times(1) s.fcmClientMock.EXPECT().NewFcmRegIdsMsg(ids, body).Times(1)
s.fcmClientMock.EXPECT().Send().Return(nil, expectedError).Times(1) s.fcmClientMock.EXPECT().Send().Return(nil, expectedError).Times(1)
fcmClient := Notifier{s.fcmClientMock} fcmClient := Notification{s.fcmClientMock}
err := fcmClient.Send(body, ids...) err := fcmClient.Send(body, ids...)