Skip to content
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

use a default channel if no channel is specified #1099

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use a default channel if no channel is specified #1099

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 18 additions & 2 deletions android/src/main/java/com/evollu/react/fcm/SendNotificationTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.evollu.react.fcm;

import android.app.Notification;
import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
Expand Down Expand Up @@ -32,6 +34,7 @@
import java.net.URL;
import java.net.URLDecoder;

import static android.content.Context.NOTIFICATION_SERVICE;
import static com.facebook.react.common.ReactConstants.TAG;

public class SendNotificationTask extends AsyncTask<Void, Void, Void> {
Expand Down Expand Up @@ -78,7 +81,20 @@ protected Void doInBackground(Void... params) {
String subText = bundle.getString("sub_text");
if (subText != null) subText = URLDecoder.decode( subText, "UTF-8" );

NotificationCompat.Builder notification = new NotificationCompat.Builder(mContext, bundle.getString("channel"))
String defaultChannelId = "default";

String channelId = bundle.getString("channel", defaultChannelId);

NotificationManager mngr = (NotificationManager) mContext.getSystemService(NOTIFICATION_SERVICE);
if (mngr != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
if (mngr.getNotificationChannel(channelId) == null) {
channelId = defaultChannelId;
NotificationChannel channel = new NotificationChannel(channelId, "Default", NotificationManager.IMPORTANCE_DEFAULT);
mngr.createNotificationChannel(channel);
}
}

NotificationCompat.Builder notification = new NotificationCompat.Builder(mContext, channelId)
.setContentTitle(title)
.setContentText(body)
.setTicker(ticker)
Expand Down Expand Up @@ -186,7 +202,7 @@ protected Void doInBackground(Void... params) {
}
}
// setBigContentTitle and setSummaryText overrides current title with body and subtext
// that cause to display duplicated body in subtext when picture has specified
// that cause to display duplicated body in subtext when picture has specified
notification.setStyle(bigPicture);
}

Expand Down