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

Set RemotePushNotifications

This commit is contained in:
Andrea Maria Piana 2020-07-30 15:01:49 +02:00
parent 91074ac95e
commit 4b9d3df5ad
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protocol/messenger.go
View File

@ -3097,6 +3097,7 @@ func (m *Messenger) RemovePushNotificationServer(ctx context.Context, publicKey
// UnregisterFromPushNotifications unregister from any server
func (m *Messenger) UnregisterFromPushNotifications(ctx context.Context) error {
return m.pushNotificationClient.Unregister()
}

18
protocol/pushnotificationclient/client.go
View File

@ -180,7 +180,11 @@ func (c *Client) Start() error {
c.subscribeForSentMessages()
c.subscribeForScheduledMessages()
// We start even if push notifications are disabled, as we might
// actually be sending an unregister message
c.startRegistrationLoop()
c.startResendingLoop()
return nil
@ -198,6 +202,8 @@ func (c *Client) Unregister() error {
// stop registration loop
c.stopRegistrationLoop()
c.config.RemoteNotificationsEnabled = false
registration := c.buildPushNotificationUnregisterMessage()
err := c.saveLastPushNotificationRegistration(registration, nil)
if err != nil {
@ -246,6 +252,11 @@ func (c *Client) Reregister(contactIDs []*ecdsa.PublicKey, mutedChatIDs []string
return nil
}
if !c.config.RemoteNotificationsEnabled {
c.config.Logger.Info("remote notifications not enabled, not registering")
return nil
}
return c.Register(c.deviceToken, c.apnTopic, c.tokenType, contactIDs, mutedChatIDs)
}
@ -254,6 +265,8 @@ func (c *Client) Register(deviceToken, apnTopic string, tokenType protobuf.PushN
// stop registration loop
c.stopRegistrationLoop()
c.config.RemoteNotificationsEnabled = true
// reset servers
err := c.resetServers()
if err != nil {
@ -441,7 +454,7 @@ func (c *Client) DisableSending() {
func (c *Client) EnablePushNotificationsFromContactsOnly(contactIDs []*ecdsa.PublicKey, mutedChatIDs []string) error {
c.config.Logger.Debug("enabling push notification from contacts only")
c.config.AllowFromContactsOnly = true
if c.lastPushNotificationRegistration != nil {
if c.lastPushNotificationRegistration != nil && c.config.RemoteNotificationsEnabled {
c.config.Logger.Debug("re-registering after enabling push notifications from contacts only")
return c.Register(c.deviceToken, c.apnTopic, c.tokenType, contactIDs, mutedChatIDs)
}
@ -451,7 +464,7 @@ func (c *Client) EnablePushNotificationsFromContactsOnly(contactIDs []*ecdsa.Pub
func (c *Client) DisablePushNotificationsFromContactsOnly(contactIDs []*ecdsa.PublicKey, mutedChatIDs []string) error {
c.config.Logger.Debug("disabling push notification from contacts only")
c.config.AllowFromContactsOnly = false
if c.lastPushNotificationRegistration != nil {
if c.lastPushNotificationRegistration != nil && c.config.RemoteNotificationsEnabled {
c.config.Logger.Debug("re-registering after disabling push notifications from contacts only")
return c.Register(c.deviceToken, c.apnTopic, c.tokenType, contactIDs, mutedChatIDs)
}
@ -1211,7 +1224,6 @@ func (c *Client) saveLastPushNotificationRegistration(registration *protobuf.Pus
c.lastPushNotificationRegistration = registration
c.lastContactIDs = contactIDs
c.startRegistrationLoop()
return nil
}