gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-11 06:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #509

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-03-31 17:08:25 +02:00
parent ae8ff9d1e5
commit d8f8f45e40
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -230,7 +230,7 @@ public class NotificationWorker extends Worker {
smallIcon = R.drawable.ic_logo; smallIcon = R.drawable.ic_logo;
if (decryptedPushMessage.getType().equals("chat")) { if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) {
category = Notification.CATEGORY_MESSAGE; category = Notification.CATEGORY_MESSAGE;
} else { } else {
category = Notification.CATEGORY_CALL; category = Notification.CATEGORY_CALL;
@ -238,7 +238,7 @@ public class NotificationWorker extends Worker {
switch (conversationType) { switch (conversationType) {
case "one2one": case "one2one":
if (decryptedPushMessage.getType().equals("chat")) { if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_chat_black_24dp); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_chat_black_24dp);
} else { } else {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_call_black_24dp); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_call_black_24dp);
@ -251,7 +251,7 @@ public class NotificationWorker extends Worker {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_link_black_24px); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_link_black_24px);
break; break;
default: default:
if (decryptedPushMessage.getType().equals("chat")) { if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_chat_black_24dp); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_chat_black_24dp);
} else { } else {
largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_call_black_24dp); largeIcon = BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_call_black_24dp);
@ -299,7 +299,7 @@ public class NotificationWorker extends Worker {
Long.toString(crc32.getValue()), Long.toString(crc32.getValue()),
groupName); groupName);
if (decryptedPushMessage.getType().equals("chat")) { if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) {
NotificationUtils.createNotificationChannel(context, NotificationUtils.createNotificationChannel(context,
NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V3, context.getResources() NotificationUtils.NOTIFICATION_CHANNEL_MESSAGES_V3, context.getResources()
.getString(R.string.nc_notification_channel_messages), context.getResources() .getString(R.string.nc_notification_channel_messages), context.getResources()
@ -357,7 +357,7 @@ public class NotificationWorker extends Worker {
AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType AudioAttributes.Builder audioAttributesBuilder = new AudioAttributes.Builder().setContentType
(AudioAttributes.CONTENT_TYPE_SONIFICATION); (AudioAttributes.CONTENT_TYPE_SONIFICATION);
if (decryptedPushMessage.getType().equals("chat")) { if (decryptedPushMessage.getType().equals("chat") || decryptedPushMessage.getType().equals("room")) {
audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT); audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT);
} else { } else {
audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST); audioAttributesBuilder.setUsage(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST);
@ -429,17 +429,7 @@ public class NotificationWorker extends Worker {
boolean hasChatSupport = signatureVerification.getUserEntity(). boolean hasChatSupport = signatureVerification.getUserEntity().
hasSpreedCapabilityWithName("chat-v2"); hasSpreedCapabilityWithName("chat-v2");
boolean isInTheSameRoomAsNotification = (ApplicationWideCurrentRoomHolder.getInstance(). boolean shouldShowNotification = decryptedPushMessage.getApp().equals("spreed");
getCurrentRoomId().equals(decryptedPushMessage.getId()) ||
ApplicationWideCurrentRoomHolder.getInstance()
.getCurrentRoomToken().equals(decryptedPushMessage.getId())) &&
signatureVerification.getUserEntity().equals(ApplicationWideCurrentRoomHolder
.getInstance().getUserInRoom());
boolean shouldShowNotification = decryptedPushMessage.getApp().equals("spreed") &&
!decryptedPushMessage.getType().equals("room") &&
(!isInTheSameRoomAsNotification ||
decryptedPushMessage.getType().equals("call"));
if (shouldShowNotification) { if (shouldShowNotification) {
Intent intent; Intent intent;
@ -479,7 +469,9 @@ public class NotificationWorker extends Worker {
} }
break; break;
case "room": case "room":
// do absolutely nothing, we won't even come to this point if (bundle.containsKey(BundleKeys.KEY_ROOM_TOKEN)) {
showNotificationForCallWithNoPing(intent);
}
break; break;
case "chat": case "chat":
if (decryptedPushMessage.getNotificationId() != Long.MIN_VALUE) { if (decryptedPushMessage.getNotificationId() != Long.MIN_VALUE) {