diff options
| author | Corey Hulen <corey@hulen.com> | 2016-01-14 09:29:25 -0600 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-01-14 09:29:25 -0600 |
| commit | 1ef6fd1b2595eee03005fc21c5d147290d9610cd (patch) | |
| tree | 7ed2156d65b13d6b9b97968c8ffb5d2a12b428d0 /api | |
| parent | a341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff) | |
| parent | 96b08d45741b443e0e1055ec4737974138d8b50f (diff) | |
| download | chat-1ef6fd1b2595eee03005fc21c5d147290d9610cd.tar.gz chat-1ef6fd1b2595eee03005fc21c5d147290d9610cd.tar.bz2 chat-1ef6fd1b2595eee03005fc21c5d147290d9610cd.zip | |
Merge pull request #1888 from mattermost/fix-droid
Fixing android push
Diffstat (limited to 'api')
| -rw-r--r-- | api/post.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/api/post.go b/api/post.go index be1ecd96a..ae4d3cc50 100644 --- a/api/post.go +++ b/api/post.go @@ -632,15 +632,22 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team, alreadySeen := make(map[string]string) for _, session := range sessions { - if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" && strings.HasPrefix(session.DeviceId, "apple:") { + if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" && + (strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_APPLE+":") || strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_ANDROID+":")) { alreadySeen[session.DeviceId] = session.DeviceId msg := model.PushNotification{} - msg.Platform = model.PUSH_NOTIFY_APPLE msg.Badge = 1 - msg.DeviceId = strings.TrimPrefix(session.DeviceId, "apple:") msg.ServerId = utils.CfgDiagnosticId + if strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_APPLE+":") { + msg.Platform = model.PUSH_NOTIFY_APPLE + msg.DeviceId = strings.TrimPrefix(session.DeviceId, model.PUSH_NOTIFY_APPLE+":") + } else if strings.HasPrefix(session.DeviceId, model.PUSH_NOTIFY_ANDROID+":") { + msg.Platform = model.PUSH_NOTIFY_ANDROID + msg.DeviceId = strings.TrimPrefix(session.DeviceId, model.PUSH_NOTIFY_ANDROID+":") + } + if channel.Type == model.CHANNEL_DIRECT { msg.Message = senderName + " sent you a direct message" } else { |