status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[#12450] Hide deleted message from PNs (Android)

This commit is contained in:
Roman Volosovskyi 2021-08-23 11:47:04 +03:00
parent d8fb0e866b
commit 428ce7bbdf
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
1 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java
View File

@ -183,7 +183,11 @@ public class PushNotificationHelper {
} }
public void handleConversation(final Bundle bundle) { public void handleConversation(final Bundle bundle) {
this.addStatusMessage(bundle); if (bundle.getBoolean("deleted")){
this.removeStatusMessage(bundle);
} else {
this.addStatusMessage(bundle);
}
} }
public void sendToNotificationCentreWithPicture(final Bundle bundle, Bitmap largeIconBitmap, Bitmap bigPictureBitmap) { public void sendToNotificationCentreWithPicture(final Bundle bundle, Bitmap largeIconBitmap, Bitmap bigPictureBitmap) {
@ -654,7 +658,7 @@ public class PushNotificationHelper {
private StatusMessage createMessage(Bundle data) { private StatusMessage createMessage(Bundle data) {
Person author = getPerson(data.getBundle("notificationAuthor")); Person author = getPerson(data.getBundle("notificationAuthor"));
return new StatusMessage(author, data.getLong("timestamp"), data.getString("message")); return new StatusMessage(data.getString("id"), author, data.getLong("timestamp"), data.getString("message"));
} }
private PendingIntent createGroupOnDismissedIntent(Context context, int notificationId, String groupId, String deepLink) { private PendingIntent createGroupOnDismissedIntent(Context context, int notificationId, String groupId, String deepLink) {
@ -683,6 +687,22 @@ public class PushNotificationHelper {
return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT); return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, PendingIntent.FLAG_CANCEL_CURRENT);
} }
public void removeStatusMessage(Bundle bundle) {
String conversationId = bundle.getString("conversationId");
StatusMessageGroup group = this.messageGroups.get(conversationId);
NotificationManager notificationManager = notificationManager();
if (group == null) {
group = new StatusMessageGroup(conversationId);
}
this.messageGroups.put(conversationId, group);
String id = bundle.getString("id");
group.removeMessage(id);
this.showMessages(bundle);
}
public void addStatusMessage(Bundle bundle) { public void addStatusMessage(Bundle bundle) {
String conversationId = bundle.getString("conversationId"); String conversationId = bundle.getString("conversationId");
@ -697,8 +717,22 @@ public class PushNotificationHelper {
group.addMessage(createMessage(bundle)); group.addMessage(createMessage(bundle));
this.showMessages(bundle);
}
public void showMessages(Bundle bundle) {
String conversationId = bundle.getString("conversationId");
StatusMessageGroup group = this.messageGroups.get(conversationId);
NotificationManager notificationManager = notificationManager();
NotificationCompat.MessagingStyle messagingStyle = new NotificationCompat.MessagingStyle("Me"); NotificationCompat.MessagingStyle messagingStyle = new NotificationCompat.MessagingStyle("Me");
ArrayList<StatusMessage> messages = group.getMessages(); ArrayList<StatusMessage> messages = group.getMessages();
if (messages.size() == 0) {
notificationManager.cancel(conversationId.hashCode());
return;
}
for (int i = 0; i < messages.size(); i++) { for (int i = 0; i < messages.size(); i++) {
StatusMessage message = messages.get(i); StatusMessage message = messages.get(i);
messagingStyle.addMessage(message.getText(), messagingStyle.addMessage(message.getText(),
@ -744,6 +778,16 @@ public class PushNotificationHelper {
this.messages.add(message); this.messages.add(message);
} }
public void removeMessage(String id) {
ArrayList<StatusMessage> newMessages = new ArrayList<StatusMessage>();
for(StatusMessage message: this.messages) {
if(!message.id.equals(id)) {
newMessages.add(message);
}
}
this.messages = newMessages;
}
public String getId() { public String getId() {
return this.id; return this.id;
} }
@ -762,11 +806,13 @@ public class PushNotificationHelper {
return text; return text;
} }
private String id;
private Person author; private Person author;
private long timestamp; private long timestamp;
private String text; private String text;
StatusMessage(Person author, long timestamp, String text) { StatusMessage(String id, Person author, long timestamp, String text) {
this.id = id;
this.author = author; this.author = author;
this.timestamp = timestamp; this.timestamp = timestamp;
this.text = text; this.text = text;