Skip to content

[IMPROVEMENT] Use MessagingStyle on Android Notification #1575

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

Merged
diegolmello merged 5 commits into from
Jan 31, 2020
Merged

[IMPROVEMENT] Use MessagingStyle on Android Notification #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5f33f9
[IMPROVEMENT] Use MessagingStyle on Android Notification
djorkaeffalexandre Jan 13, 2020
a7b605c
Handle test push cases
djorkaeffalexandre Jan 14, 2020
023877e
Improvements
djorkaeffalexandre Jan 14, 2020
3b910b3
Merge branch 'develop' into improvement.messaging-style
diegolmello Jan 31, 2020
e7e9652
Set title on direct messages
diegolmello Jan 31, 2020
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
121 changes: 92 additions & 29 deletions android/app/src/main/java/chat/rocket/reactnative/CustomPushNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Icon;
import android.os.Build;
import android.os.Bundle;
import android.app.Person;

import com.google.gson.*;
import com.bumptech.glide.Glide;
Expand All @@ -30,6 +32,7 @@
import java.util.List;
import java.util.Map;
import java.util.ArrayList;
import java.util.Date;

import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;

Expand All @@ -41,7 +44,7 @@ public CustomPushNotification(Context context, Bundle bundle, AppLifecycleFacade
reactApplicationContext = new ReactApplicationContext(context);
}

private static Map<String, List<String>> notificationMessages = new HashMap<String, List<String>>();
private static Map<String, List<Bundle>> notificationMessages = new HashMap<String, List<Bundle>>();
public static String KEY_REPLY = "KEY_REPLY";
public static String NOTIFICATION_ID = "NOTIFICATION_ID";

Expand All @@ -53,23 +56,34 @@ public static void clearMessages(int notId) {
public void onReceived() throws InvalidNotificationException {
final Bundle bundle = mNotificationProps.asBundle();

String notId = bundle.getString("notId");
String message = bundle.getString("message");
String notId = bundle.getString("notId", "1");
String title = bundle.getString("title");

if (notificationMessages.get(notId) == null) {
notificationMessages.put(notId, new ArrayList<String>());
notificationMessages.put(notId, new ArrayList<Bundle>());
}
notificationMessages.get(notId).add(message);

super.postNotification(notId != null ? Integer.parseInt(notId) : 1);
Gson gson = new Gson();
Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);

boolean hasSender = ejson.sender != null;

bundle.putLong("time", new Date().getTime());
bundle.putString("username", hasSender ? ejson.sender.username : title);
bundle.putString("senderId", hasSender ? ejson.sender._id : "1");
bundle.putString("avatarUri", ejson.getAvatarUri());

notificationMessages.get(notId).add(bundle);

super.postNotification(Integer.parseInt(notId));

notifyReceivedToJS();
}

@Override
public void onOpened() {
Bundle bundle = mNotificationProps.asBundle();
final String notId = bundle.getString("notId");
final String notId = bundle.getString("notId", "1");
notificationMessages.remove(notId);
digestNotification();
}
Expand All @@ -79,19 +93,16 @@ protected Notification.Builder getNotificationBuilder(PendingIntent intent) {
final Notification.Builder notification = new Notification.Builder(mContext);

Bundle bundle = mNotificationProps.asBundle();
String title = bundle.getString("title");
String message = bundle.getString("message");
String notId = bundle.getString("notId");
String notId = bundle.getString("notId", "1");

notification
.setContentIntent(intent)
.setContentTitle(title)
.setContentText(message)
.setPriority(Notification.PRIORITY_HIGH)
.setDefaults(Notification.DEFAULT_ALL)
.setAutoCancel(true);

Integer notificationId = notId != null ? Integer.parseInt(notId) : 1;
Integer notificationId = Integer.parseInt(notId);
notificationColor(notification);
notificationChannel(notification);
notificationIcons(notification, bundle);
notificationStyle(notification, notificationId, bundle);
Expand All @@ -114,22 +125,26 @@ private Bitmap getAvatar(String uri) {
.submit(100, 100)
.get();
} catch (final ExecutionException | InterruptedException e) {
return null;
return largeIcon();
}
}

private Bitmap largeIcon() {
final Resources res = mContext.getResources();
String packageName = mContext.getPackageName();
int largeIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName);
Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId);
return largeIconBitmap;
}

private void notificationIcons(Notification.Builder notification, Bundle bundle) {
final Resources res = mContext.getResources();
String packageName = mContext.getPackageName();

int smallIconResId = res.getIdentifier("ic_notification", "mipmap", packageName);

Gson gson = new Gson();
Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);

notification
.setSmallIcon(smallIconResId)
.setLargeIcon(getAvatar(ejson.getAvatarUri()));
.setSmallIcon(smallIconResId);
}

private void notificationChannel(Notification.Builder notification) {
Expand All @@ -148,21 +163,69 @@ private void notificationChannel(Notification.Builder notification) {
}
}

private void notificationStyle(Notification.Builder notification, int notId, Bundle bundle) {
Notification.InboxStyle messageStyle = new Notification.InboxStyle();
List<String> messages = notificationMessages.get(Integer.toString(notId));
if (messages != null) {
for (int i = 0; i < messages.size(); i++) {
messageStyle.addLine(messages.get(i));
}
String summary = bundle.getString("summaryText");
messageStyle.setSummaryText(summary.replace("%n%", Integer.toString(messages.size())));
notification.setNumber(messages.size());
private String extractMessage(String message, Ejson ejson) {
if (ejson.type != null && !ejson.type.equals("d")) {
int pos = message.indexOf(":");
int start = pos == -1 ? 0 : pos + 2;
return message.substring(start, message.length());
}
return message;
}

private void notificationColor(Notification.Builder notification) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
notification.setColor(mContext.getColor(R.color.notification_text));
}
}

private void notificationStyle(Notification.Builder notification, int notId, Bundle bundle) {
Notification.MessagingStyle messageStyle;
String title = bundle.getString("title");

Gson gson = new Gson();
Ejson ejson = gson.fromJson(bundle.getString("ejson", "{}"), Ejson.class);

if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
messageStyle = new Notification.MessagingStyle("");
} else {
Person sender = new Person.Builder()
.setKey("")
.setName("")
.build();
messageStyle = new Notification.MessagingStyle(sender);
}

messageStyle.setConversationTitle(title);
if (ejson.type != null && !ejson.type.equals("d")) {
messageStyle.setGroupConversation(true);
}

List<Bundle> bundles = notificationMessages.get(Integer.toString(notId));

if (bundles != null) {
for (int i = 0; i < bundles.size(); i++) {
Bundle data = bundles.get(i);

long timestamp = data.getLong("time");
String message = data.getString("message");
String username = data.getString("username");
String senderId = data.getString("senderId");
String avatarUri = data.getString("avatarUri");

String m = extractMessage(message, ejson);

if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
messageStyle.addMessage(m, timestamp, username);
} else {
Person sender = new Person.Builder()
.setKey(senderId)
.setName(username)
.setIcon(Icon.createWithBitmap(getAvatar(avatarUri)))
.build();
messageStyle.addMessage(m, timestamp, sender);
}
}
}

notification.setStyle(messageStyle);
}
Expand Down
5 changes: 3 additions & 2 deletions android/app/src/main/java/chat/rocket/reactnative/Ejson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class Ejson {
private SharedPreferences sharedPreferences = RNUserDefaultsModule.getPreferences(CustomPushNotification.reactApplicationContext);

public String getAvatarUri() {
if (type == null || !type.equals("d")) {
if (type == null) {
return null;
}
return serverURL() + "/avatar/" + this.sender.username + "?rc_token=" + token() + "&rc_uid=" + userId();
Expand All @@ -36,7 +36,8 @@ public String serverURL() {
return url;
}

private class Sender {
public class Sender {
String username;
String _id;
}
}