diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml index a9902b6173..58722a00b6 100644 --- a/app/res/values/strings.xml +++ b/app/res/values/strings.xml @@ -393,6 +393,8 @@ Notification containing information around current user session like when the current session is scheduled to expire Server Communications Notifications for status of any background server communication happening at the moment like CommCare App updates, log submission etc. + Priority notifications from Server + Notifications sent from server directly to notify user of priority tasks Choose Reinstall Method @@ -451,6 +453,6 @@ Install from Store No Play Store found on your device FCM Notification - notification-channel-server-communications + notification-channel-push-notifications Required CommCare App is not installed on device diff --git a/app/src/org/commcare/CommCareNoficationManager.java b/app/src/org/commcare/CommCareNoficationManager.java index 2f6bd62efe..6180f9e0e2 100644 --- a/app/src/org/commcare/CommCareNoficationManager.java +++ b/app/src/org/commcare/CommCareNoficationManager.java @@ -38,6 +38,7 @@ public class CommCareNoficationManager { public static final String NOTIFICATION_CHANNEL_ERRORS_ID = "notification-channel-errors"; public static final String NOTIFICATION_CHANNEL_USER_SESSION_ID = "notification-channel-user-session"; public static final String NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID = "notification-channel-server-communications"; + public static final String NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID = "notification-channel-push-notifications"; /** * Handler to receive notifications and show them the user using toast. @@ -188,6 +189,11 @@ public void createNotificationChannels() { R.string.notification_channel_server_communication_title, R.string.notification_channel_server_communication_description, NotificationManager.IMPORTANCE_LOW); + + createNotificationChannel(NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID, + R.string.notification_channel_push_notfications_title, + R.string.notification_channel_push_notfications_description, + NotificationManager.IMPORTANCE_DEFAULT); } @TargetApi(Build.VERSION_CODES.O) diff --git a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java index 7fc2bc6d9d..f189193956 100644 --- a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java +++ b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java @@ -99,7 +99,7 @@ private void showNotification(RemoteMessage.Notification notification) { contentIntent = PendingIntent.getActivity(this, 0, i, 0); NotificationCompat.Builder fcmNotification = new NotificationCompat.Builder(this, - CommCareNoficationManager.NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID) + CommCareNoficationManager.NOTIFICATION_CHANNEL_PUSH_NOTIFICATIONS_ID) .setContentTitle(notificationTitle) .setContentText(notificationText) .setContentIntent(contentIntent)