This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h b/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h | |
index 4ae8b8e3a..2d6d6dff3 100644 | |
--- a/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h | |
+++ b/native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h | |
@@ -1,5 +1,6 @@ | |
#pragma once | |
+#include "CommServicesAuthMetadataEmitter.h" | |
#include "DatabaseManager.h" | |
#include <jsi/jsi.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js | |
index 9bf966ce4..e7dc91425 100644 | |
--- a/keyserver/src/creators/message-creator.js | |
+++ b/keyserver/src/creators/message-creator.js | |
@@ -483,14 +483,21 @@ async function postMessageSend( | |
return undefined; | |
} | |
+ const messageInfos1 = []; | |
+ const messageDatas1 = []; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js | |
index 84fe5c48d..473d2b4f8 100644 | |
--- a/keyserver/src/creators/message-creator.js | |
+++ b/keyserver/src/creators/message-creator.js | |
@@ -484,14 +484,21 @@ async function postMessageSend( | |
return undefined; | |
} | |
+ const messageInfos1 = []; | |
+ const messageDatas1 = []; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/lib/flow-typed/web-crypto-common.js b/lib/flow-typed/web-crypto-common.js | |
index 571e479ba..70dd21d90 100644 | |
--- a/lib/flow-typed/web-crypto-common.js | |
+++ b/lib/flow-typed/web-crypto-common.js | |
@@ -20,7 +20,16 @@ type CryptoKey$Usages = | |
| 'wrapKey' | |
| 'unwrapKey'; | |
-declare type CryptoKey = SubtleCrypto$JsonWebKey; | |
+declare type CryptoKey = { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/session/cookies.js b/keyserver/src/session/cookies.js | |
index 9bc7f7910..0ca3e4373 100644 | |
--- a/keyserver/src/session/cookies.js | |
+++ b/keyserver/src/session/cookies.js | |
@@ -833,10 +833,12 @@ async function isCookieMissingOlmNotificationsSession( | |
!viewer.platformDetails || | |
(viewer.platformDetails.platform !== 'ios' && | |
viewer.platformDetails.platform !== 'android' && | |
- !(viewer.platformDetails.platform === 'web' && isStaffOrDev)) || | |
+ !(viewer.platformDetails.platform === 'web' && isStaffOrDev) && |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js | |
index db71a26ed..18caecf3e 100644 | |
--- a/keyserver/src/creators/message-creator.js | |
+++ b/keyserver/src/creators/message-creator.js | |
@@ -476,14 +476,21 @@ async function postMessageSend( | |
return undefined; | |
} | |
+ const messageInfos1 = []; | |
+ const messageDatas1 = []; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js | |
index 8eeeb2967..487c882c8 100644 | |
--- a/keyserver/src/push/send.js | |
+++ b/keyserver/src/push/send.js | |
@@ -895,9 +895,11 @@ async function prepareAPNsNotification( | |
platformDetails.codeVersion && platformDetails.codeVersion >= 267; | |
const shouldBeEncrypted = | |
- platformDetails.platform === 'ios' && | |
- (canDecryptAllNotifTypes || |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js | |
index db71a26ed..18caecf3e 100644 | |
--- a/keyserver/src/creators/message-creator.js | |
+++ b/keyserver/src/creators/message-creator.js | |
@@ -476,14 +476,21 @@ async function postMessageSend( | |
return undefined; | |
} | |
+ const messageInfos1 = []; | |
+ const messageDatas1 = []; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/push/crypto.js b/keyserver/src/push/crypto.js | |
index c4c1b6aae..e8ca7b733 100644 | |
--- a/keyserver/src/push/crypto.js | |
+++ b/keyserver/src/push/crypto.js | |
@@ -221,24 +221,27 @@ async function encryptAndroidNotificationRescind( | |
async function encryptWebNotification( | |
cookieID: string, | |
notification: PlainTextWebNotification, | |
-): Promise<WebNotification> { | |
+): Promise<{ notif: WebNotification, +version?: number }> { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js | |
index c75f2c248..44ea265e8 100644 | |
--- a/keyserver/src/push/send.js | |
+++ b/keyserver/src/push/send.js | |
@@ -361,15 +361,24 @@ async function sendPushNotif(input: { | |
}; | |
const deliveryPromise: Promise<PushResult> = (async () => { | |
- const targetedNotifications = await prepareWebNotification( | |
- { |