Page MenuHomePhorge
Files F33314410

D8356.1768821735.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D8356.1768821735.diff
View Options

diff --git a/lib/selectors/socket-selectors.js b/lib/selectors/socket-selectors.js
--- a/lib/selectors/socket-selectors.js
+++ b/lib/selectors/socket-selectors.js
@@ -69,13 +69,31 @@
(state: AppState) => state.currentUserInfo,
currentCalendarQuery,
(
- threadInfos: { +[id: string]: RawThreadInfo },
- entryInfos: { +[id: string]: RawEntryInfo },
- userInfos: UserInfos,
- currentUserInfo: ?CurrentUserInfo,
- calendarQuery: (calendarActive: boolean) => CalendarQuery,
- ) =>
- async (
+ threadInfos: { +[id: string]: RawThreadInfo },
+ entryInfos: { +[id: string]: RawEntryInfo },
+ userInfos: UserInfos,
+ currentUserInfo: ?CurrentUserInfo,
+ calendarQuery: (calendarActive: boolean) => CalendarQuery,
+ ) => {
+ if (convertToNewIDSchema) {
+ threadInfos = convertClientIDsToServerIDs(
+ keyserverPrefixID,
+ t.dict(tID, rawThreadInfoValidator),
+ threadInfos,
+ );
+ userInfos = convertClientIDsToServerIDs(
+ keyserverPrefixID,
+ userInfosValidator,
+ userInfos,
+ );
+ currentUserInfo = convertClientIDsToServerIDs(
+ keyserverPrefixID,
+ t.maybe(currentUserInfoValidator),
+ currentUserInfo,
+ );
+ }
+
+ return async (
calendarActive: boolean,
oneTimeKeyGenerator: ?OneTimeKeyGenerator,
getSignedIdentityKeysBlob: ?() => Promise<SignedIdentityKeysBlob>,
@@ -107,21 +125,6 @@
);
if (convertToNewIDSchema) {
- threadInfos = convertClientIDsToServerIDs(
- keyserverPrefixID,
- t.dict(tID, rawThreadInfoValidator),
- threadInfos,
- );
- userInfos = convertClientIDsToServerIDs(
- keyserverPrefixID,
- userInfosValidator,
- userInfos,
- );
- currentUserInfo = convertClientIDsToServerIDs(
- keyserverPrefixID,
- t.maybe(currentUserInfoValidator),
- currentUserInfo,
- );
filteredEntryInfos = convertClientIDsToServerIDs(
keyserverPrefixID,
t.dict(tID, rawEntryInfoValidator),
@@ -228,7 +231,8 @@
}
}
return clientResponses;
- },
+ };
+ },
);
const sessionStateFuncSelector: (

File Metadata

Mime Type
text/plain
Expires
Mon, Jan 19, 11:22 AM (10 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5956073
Default Alt Text
D8356.1768821735.diff (2 KB)

Event Timeline