dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10679 from thingsboard/fix/firebase-senderid-mismatch

Browse Source 
Improve mobile notifications stability
This commit is contained in:
Viacheslav Klimov 2024-04-30 17:21:52 +03:00 committed by GitHub
commit 20d074e87f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
View File

@ -105,9 +105,10 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data, unreadCount); firebaseService.sendMessage(ctx.getTenantId(), credentials, token, subject, body, data, unreadCount);
} catch (FirebaseMessagingException e) { } catch (FirebaseMessagingException e) {
MessagingErrorCode errorCode = e.getMessagingErrorCode(); MessagingErrorCode errorCode = e.getMessagingErrorCode();
if (errorCode == MessagingErrorCode.UNREGISTERED || errorCode == MessagingErrorCode.INVALID_ARGUMENT) { if (errorCode == MessagingErrorCode.UNREGISTERED || errorCode == MessagingErrorCode.INVALID_ARGUMENT || errorCode == MessagingErrorCode.SENDER_ID_MISMATCH) {
validTokens.remove(token); validTokens.remove(token);
userService.removeMobileSession(recipient.getTenantId(), token); userService.removeMobileSession(recipient.getTenantId(), token);
log.debug("[{}][{}] Removed invalid FCM token due to {} {} ({})", recipient.getTenantId(), recipient.getId(), errorCode, e.getMessage(), token);
continue; continue;
} }
throw new RuntimeException("Failed to send message via FCM: " + e.getMessage(), e); throw new RuntimeException("Failed to send message via FCM: " + e.getMessage(), e);