Skip to content

Add support for APNS #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Henridv wants to merge 6 commits into
base: fcm-support-v2
Choose a base branch
from
Open

Add support for APNS #3

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0f01bc
Do not set notification for Android
Henridv May 29, 2024
ecee6ce
Configure APNS config for mutable_content and content_available
Henridv May 29, 2024
0047545
Add back Android notification
Henridv Jun 6, 2024
808b6de
Add sound to APNS config
Henridv Jun 6, 2024
1667d1d
Set default sound to false, if sound not set
Henridv Jun 6, 2024
523c393
Set Android notification only when available
Henridv Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions lib/rpush/client/active_model/fcm/notification.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,33 +48,41 @@ def dry_run=(value)
fail ArgumentError, 'FCM does not support dry run' if value
end

def mutable_content=(value)
fail ArgumentError, 'RPush does not currently support mutable_content for FCM' if value
end

def as_json(options = nil) # rubocop:disable Metrics/PerceivedComplexity
json = {
'data' => data,
'android' => android_config,
'apns' => apns_config,
'token' => device_token
}
# Android does not appear to handle content_available anymore. Instead "priority" should be used
# with "low" being a background only message. APN however should support this field.
# json['content_available'] = content_available if content_available

json['notification'] = root_notification if notification
{ 'message' => json }
end

def android_config
json = {
'notification' => android_notification,
}
json = ActiveSupport::OrderedHash.new
json['notification'] = android_notification if notification
json['collapse_key'] = collapse_key if collapse_key
json['priority'] = priority_str if priority
json['ttl'] = "#{expiry}s" if expiry
json
end

def apns_config
json = ActiveSupport::OrderedHash.new
json['payload'] = ActiveSupport::OrderedHash.new

aps = ActiveSupport::OrderedHash.new
aps['mutable-content'] = 1 if mutable_content
aps['content-available'] = 1 if content_available
aps['sound'] = 'default' if sound == 'default'

json['payload']['aps'] = aps

json
end

def notification=(value)
super(value.with_indifferent_access)
end
Expand All @@ -89,7 +97,7 @@ def android_notification
json = notification&.slice(*ANDROID_NOTIFICATION_KEYS) || {}
json['notification_priority'] = priority_for_notification if priority
json['sound'] = sound if sound
json['default_sound'] = !sound || sound == 'default' ? true : false
json['default_sound'] = sound == 'default' ? true : false
json
end

Expand Down