Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3113690
D10056.id34035.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D10056.id34035.diff
View Options
diff --git a/keyserver/src/push/crypto.js b/keyserver/src/push/crypto.js
--- a/keyserver/src/push/crypto.js
+++ b/keyserver/src/push/crypto.js
@@ -22,7 +22,7 @@
import { encrypt, generateKey } from '../utils/aes-crypto-utils.js';
import { getOlmUtility } from '../utils/olm-utils.js';
-async function encryptIOSNotification(
+async function encryptAPNsNotification(
cookieID: string,
notification: apn.Notification,
codeVersion?: ?number,
@@ -268,7 +268,7 @@
}
}
-function prepareEncryptedIOSNotifications(
+function prepareEncryptedAPNsNotifications(
devices: $ReadOnlyArray<NotificationTargetDevice>,
notification: apn.Notification,
codeVersion?: ?number,
@@ -285,7 +285,7 @@
> {
const notificationPromises = devices.map(
async ({ cookieID, deviceToken }) => {
- const notif = await encryptIOSNotification(
+ const notif = await encryptAPNsNotification(
cookieID,
notification,
codeVersion,
@@ -310,7 +310,7 @@
> {
const notificationPromises = devices.map(
async ({ deviceToken, cookieID }) => {
- const { notification: notif } = await encryptIOSNotification(
+ const { notification: notif } = await encryptAPNsNotification(
cookieID,
notification,
codeVersion,
@@ -416,7 +416,7 @@
}
export {
- prepareEncryptedIOSNotifications,
+ prepareEncryptedAPNsNotifications,
prepareEncryptedIOSNotificationRescind,
prepareEncryptedAndroidNotifications,
prepareEncryptedAndroidNotificationRescinds,
diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js
--- a/keyserver/src/push/send.js
+++ b/keyserver/src/push/send.js
@@ -47,7 +47,7 @@
import { tID, tPlatformDetails, tShape } from 'lib/utils/validation-utils.js';
import {
- prepareEncryptedIOSNotifications,
+ prepareEncryptedAPNsNotifications,
prepareEncryptedAndroidNotifications,
prepareEncryptedWebNotifications,
} from './crypto.js';
@@ -969,7 +969,7 @@
}));
}
- const notifsWithMessageInfos = await prepareEncryptedIOSNotifications(
+ const notifsWithMessageInfos = await prepareEncryptedAPNsNotifications(
devices,
copyWithMessageInfos,
platformDetails.codeVersion,
@@ -996,7 +996,7 @@
);
}
- const notifsWithoutMessageInfos = await prepareEncryptedIOSNotifications(
+ const notifsWithoutMessageInfos = await prepareEncryptedAPNsNotifications(
devicesWithExcessiveSize,
notification,
platformDetails.codeVersion,
@@ -1617,7 +1617,7 @@
const preparePromise: Promise<PreparePushResult[]> = (async () => {
let targetedNotifications: $ReadOnlyArray<TargetedAPNsNotification>;
if (codeVersion > 222) {
- const notificationsArray = await prepareEncryptedIOSNotifications(
+ const notificationsArray = await prepareEncryptedAPNsNotifications(
deviceInfos,
notification,
codeVersion,
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 1, 6:21 PM (21 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2400492
Default Alt Text
D10056.id34035.diff (2 KB)
Attached To
Mode
D10056: Rename IOS to APNs in function responsible for notifications encryption
Attached
Detach File
Event Timeline
Log In to Comment