Text Android encrypted notifications coalescing

gistfile1.txt

diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js
index 894dbf0a4..181c52db8 100644
--- a/keyserver/src/push/send.js
+++ b/keyserver/src/push/send.js
@@ -912,14 +912,14 @@ async function prepareAndroidNotification(
     dbID,
   } = convertedData;
 
-  const isTextNotification = newRawMessageInfos.every(
-    newRawMessageInfo => newRawMessageInfo.type === messageTypes.TEXT,
-  );
+  // const isTextNotification = newRawMessageInfos.every(
+  //   newRawMessageInfo => newRawMessageInfo.type === messageTypes.TEXT,
+  // );
 
-  const shouldBeEncrypted =
-    isTextNotification && !collapseKey && codeVersion && codeVersion > 228;
+  const shouldBeEncrypted = true;
+  // isTextNotification && !collapseKey && codeVersion && codeVersion > 228;
 
-  const notifID = collapseKey ? collapseKey : dbID;
+  const notifID = dbID;
   const { merged, ...rest } = notifTexts;
   const notification = {
     data: {
@@ -929,6 +929,13 @@ async function prepareAndroidNotification(
     },
   };
 
+  if (collapseKey) {
+    notification.data = {
+      ...notification.data,
+      collapseKey,
+    };
+  }
+
   // The reason we only include `badgeOnly` for newer clients is because older
   // clients don't know how to parse it. The reason we only include `id` for
   // newer clients is that if the older clients see that field, they assume