Merge pull request #1118 from nextcloud/fix/neon/push-notification-decryption

Author: provokateurin

packages/neon/neon/lib/src/models/push_notification.dart

@@ -38,12 +38,13 @@ class PushNotification {
   /// Use [PushNotification.fromJson] when the [subject] is not encrypted.
   factory PushNotification.fromEncrypted(
     final Map<String, dynamic> json,
+    final String accountID,
     final RSAPrivateKey privateKey,
   ) {
     final subject = decryptPushNotificationSubject(privateKey, json[_subjectKey] as String);
 
     return PushNotification(
-      accountID: json[_accountIDKey] as String,
+      accountID: accountID,
       priority: json[_priorityKey] as String,
       type: json[_typeKey] as String,
       subject: subject,

packages/neon/neon/lib/src/utils/push_utils.dart

@@ -79,7 +79,11 @@ class PushUtils {
     final keypair = loadRSAKeypair();
     for (final message in Uri(query: utf8.decode(messages)).queryParameters.values) {
       final data = json.decode(message) as Map<String, dynamic>;
-      final pushNotification = PushNotification.fromEncrypted(data, keypair.privateKey);
+      final pushNotification = PushNotification.fromEncrypted(
+        data,
+        instance,
+        keypair.privateKey,
+      );
 
       if (pushNotification.subject.delete ?? false) {
         await localNotificationsPlugin.cancel(_getNotificationID(instance, pushNotification));