Skip to content

Fix lost chat messages through push #33

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
outlander24 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix lost chat messages through push #33

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion '27.0.1'
buildToolsVersion '27.0.2'
defaultConfig {
applicationId "com.sendbird.android.sample"
minSdkVersion 14
Expand Down
34 changes: 26 additions & 8 deletions app/src/main/java/com/sendbird/android/sample/fcm/MyFirebaseMessagingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import android.media.RingtoneManager;
import android.net.Uri;
import android.support.v4.app.NotificationCompat;
import android.text.TextUtils;
import android.util.Log;

import com.google.firebase.messaging.FirebaseMessagingService;
Expand Down Expand Up @@ -71,17 +72,27 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
Log.d(TAG, "Message Notification Body: " + remoteMessage.getNotification().getBody());
}

String channelUrl = null;
String channelUrl = null, channelName = "";
int notificationId = 0;
try {
JSONObject sendBird = new JSONObject(remoteMessage.getData().get("sendbird"));
JSONObject channel = (JSONObject) sendBird.get("channel");
channelUrl = (String) channel.get("channel_url");
channelName = (String) channel.get("name");
notificationId = new JSONObject(remoteMessage.getData().get("sendbird")).optInt("unread_message_count");
} catch (JSONException e) {
e.printStackTrace();
}
// Also if you intend on generating your own notifications as a result of a received FCM
// message, here is where that should be initiated. See sendNotification method below.
sendNotification(this, remoteMessage.getData().get("message"), channelUrl);
if (!TextUtils.isEmpty(remoteMessage.getData().get("message")) &&
!TextUtils.isEmpty(channelUrl)) {
try {
sendNotification(this, remoteMessage.getData().get("message"), channelUrl, notificationId, channelName);
} catch (Exception ex) {
ex.printStackTrace();
}
}
}
// [END receive_message]

Expand All @@ -90,12 +101,12 @@ public void onMessageReceived(RemoteMessage remoteMessage) {
*
* @param messageBody FCM message body received.
*/
public static void sendNotification(Context context, String messageBody, String channelUrl) {
public static void sendNotification(Context context, String messageBody, String channelUrl, int notificationId, String channelName) {
Intent intent = new Intent(context, GroupChannelActivity.class);
intent.putExtra("groupChannelUrl", channelUrl);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);

PendingIntent pendingIntent = PendingIntent.getActivity(context, 0 /* Request code */, intent,
PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationId /* Request code */, intent,
PendingIntent.FLAG_UPDATE_CURRENT);

Uri defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
Expand All @@ -106,16 +117,23 @@ public static void sendNotification(Context context, String messageBody, String
.setSound(defaultSoundUri)
.setPriority(Notification.PRIORITY_MAX)
.setDefaults(Notification.DEFAULT_ALL)
.setGroup(channelUrl)
.setContentIntent(pendingIntent);

if (PreferenceUtils.getNotificationsShowPreviews()) {
notificationBuilder.setContentText(messageBody);
if (channelName.equalsIgnoreCase("group channel")) {
notificationBuilder.setContentText(messageBody);
} else {
String message = "";
int indexOfColon = messageBody.lastIndexOf(":");
message = message.concat(messageBody.substring(0, indexOfColon));
message = message.concat("@ " + channelName + messageBody.substring(indexOfColon));
notificationBuilder.setContentText(message);
}
} else {
notificationBuilder.setContentText("Somebody sent you a message.");
}

NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

notificationManager.notify(0 /* ID of notification */, notificationBuilder.build());
notificationManager.notify(notificationId/* ID of notification */, notificationBuilder.build());
}
}