Skip to content
Snippets Groups Projects
Commit 20cbdc95 authored by Kamal Bramwell's avatar Kamal Bramwell
Browse files

Updated notification text for reset requests - now uses same as received

parent 25592ca4
No related branches found
No related tags found
1 merge request!86FE-1053 Change retry behavior
...@@ -291,18 +291,18 @@ class MessagingService : FirebaseMessagingService(), HasAndroidInjector { ...@@ -291,18 +291,18 @@ class MessagingService : FirebaseMessagingService(), HasAndroidInjector {
private fun NotificationForMeReport.notificationText(): String = private fun NotificationForMeReport.notificationText(): String =
when { when {
isGroupRequest() -> getString(R.string.notification_group_request_text) isGroupRequest() -> getString(R.string.notification_group_request_text)
isRequest() -> getString(R.string.notification_request_text) isRequest() || isReset() -> getString(R.string.notification_request_text)
isConfirm() -> getString(R.string.notification_confirm_text) isConfirm() -> getString(R.string.notification_confirm_text)
isE2E() -> getString(R.string.notification_e2e_text) isE2E() -> getString(R.string.notification_e2e_text)
isGroup() -> getString(R.string.notification_group_text) isGroup() -> getString(R.string.notification_group_text)
isEndFT() -> getString(R.string.notification_endft_text) isEndFT() -> getString(R.string.notification_endft_text)
isReset() -> getString(R.string.notification_reset_text) // isReset() -> getString(R.string.notification_reset_text)
else -> "New activity" // Other types should not be displayed in the first place. else -> "New activity" // Other types should not be displayed in the first place.
} }
private fun NotificationForMeReport.channelId(): String = private fun NotificationForMeReport.channelId(): String =
when { when {
isRequest() || isGroupRequest() -> getString(R.string.request_notification_channel_id) isRequest() || isGroupRequest() || isReset() -> getString(R.string.request_notification_channel_id)
isConfirm() -> getString(R.string.confirm_notification_channel_id) isConfirm() -> getString(R.string.confirm_notification_channel_id)
isE2E() || isEndFT() -> getString(R.string.e2e_notification_channel_id) isE2E() || isEndFT() -> getString(R.string.e2e_notification_channel_id)
isGroup() -> getString(R.string.group_notification_channel_id) isGroup() -> getString(R.string.group_notification_channel_id)
...@@ -311,7 +311,7 @@ class MessagingService : FirebaseMessagingService(), HasAndroidInjector { ...@@ -311,7 +311,7 @@ class MessagingService : FirebaseMessagingService(), HasAndroidInjector {
private fun NotificationForMeReport.channelName(): String = private fun NotificationForMeReport.channelName(): String =
when { when {
isRequest() || isGroupRequest() -> getString(R.string.notification_request_channel_label) isRequest() || isGroupRequest() || isReset() -> getString(R.string.notification_request_channel_label)
isConfirm() -> getString(R.string.notification_confirm_channel_label) isConfirm() -> getString(R.string.notification_confirm_channel_label)
isE2E() || isEndFT() -> getString(R.string.notification_e2e_channel_label) isE2E() || isEndFT() -> getString(R.string.notification_e2e_channel_label)
isGroup() -> getString(R.string.notification_group_channel_label) isGroup() -> getString(R.string.notification_group_channel_label)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment