Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2835611
D11007.id36930.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
28 KB
Referenced Files
None
Subscribers
None
D11007.id36930.diff
View Options
diff --git a/native/account/log-in-panel.react.js b/native/account/log-in-panel.react.js
--- a/native/account/log-in-panel.react.js
+++ b/native/account/log-in-panel.react.js
@@ -30,12 +30,12 @@
} from 'lib/types/account-types.js';
import type { IdentityAuthResult } from 'lib/types/identity-service-types.js';
import type { LoadingStatus } from 'lib/types/loading-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import {
useDispatchActionPromise,
type DispatchActionPromise,
} from 'lib/utils/redux-promise-utils.js';
import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { TextInput } from './modal-components.react.js';
import {
@@ -254,7 +254,7 @@
const extraInfo = await this.props.logInExtraInfo();
const initialNotificationsEncryptedMessage =
await this.props.getInitialNotificationsEncryptedMessage(
- ashoatKeyserverID,
+ authoritativeKeyserverID,
);
if (usingCommServicesAccessToken) {
diff --git a/native/account/logged-out-modal.react.js b/native/account/logged-out-modal.react.js
--- a/native/account/logged-out-modal.react.js
+++ b/native/account/logged-out-modal.react.js
@@ -27,9 +27,9 @@
import { useInitialNotificationsEncryptedMessage } from 'lib/shared/crypto-utils.js';
import { logInActionSources } from 'lib/types/account-types.js';
import type { Dispatch } from 'lib/types/redux-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
import { usingCommServicesAccessToken } from 'lib/utils/services-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { splashBackgroundURI } from './background-info.js';
import FullscreenSIWEPanel from './fullscreen-siwe-panel.react.js';
@@ -439,7 +439,7 @@
cookie,
urlPrefix,
actionSource,
- ashoatKeyserverID,
+ authoritativeKeyserverID,
this.props.getInitialNotificationsEncryptedMessage,
);
if (
@@ -816,8 +816,8 @@
state => !!(state._persist && state._persist.rehydrated && navContext),
);
const persistedStateLoaded = usePersistedStateLoaded();
- const cookie = useSelector(cookieSelector(ashoatKeyserverID));
- const urlPrefix = useSelector(urlPrefixSelector(ashoatKeyserverID));
+ const cookie = useSelector(cookieSelector(authoritativeKeyserverID));
+ const urlPrefix = useSelector(urlPrefixSelector(authoritativeKeyserverID));
invariant(urlPrefix, "missing urlPrefix for ashoat's keyserver");
const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector);
diff --git a/native/account/register-panel.react.js b/native/account/register-panel.react.js
--- a/native/account/register-panel.react.js
+++ b/native/account/register-panel.react.js
@@ -33,12 +33,12 @@
import type { LoadingStatus } from 'lib/types/loading-types.js';
import type { Dispatch } from 'lib/types/redux-types.js';
import { useLegacyAshoatKeyserverCall } from 'lib/utils/action-utils.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import {
useDispatchActionPromise,
type DispatchActionPromise,
} from 'lib/utils/redux-promise-utils.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js';
@@ -312,7 +312,7 @@
const extraInfo = await this.props.logInExtraInfo();
const initialNotificationsEncryptedMessage =
await this.props.getInitialNotificationsEncryptedMessage(
- ashoatKeyserverID,
+ authoritativeKeyserverID,
);
void this.props.dispatchActionPromise(
keyserverRegisterActionTypes,
diff --git a/native/account/siwe-hooks.js b/native/account/siwe-hooks.js
--- a/native/account/siwe-hooks.js
+++ b/native/account/siwe-hooks.js
@@ -9,9 +9,9 @@
LogInExtraInfo,
} from 'lib/types/account-types.js';
import { useLegacyAshoatKeyserverCall } from 'lib/utils/action-utils.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import type { CallSingleKeyserverEndpointOptions } from 'lib/utils/call-single-keyserver-endpoint.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
@@ -60,9 +60,12 @@
) => {
const extraInfo = await logInExtraInfo();
const initialNotificationsEncryptedMessage =
- await getInitialNotificationsEncryptedMessage(ashoatKeyserverID, {
- callSingleKeyserverEndpointOptions,
- });
+ await getInitialNotificationsEncryptedMessage(
+ authoritativeKeyserverID,
+ {
+ callSingleKeyserverEndpointOptions,
+ },
+ );
const siwePromise = callSIWE(
message,
diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js
--- a/native/avatars/avatar-hooks.js
+++ b/native/avatars/avatar-hooks.js
@@ -28,7 +28,7 @@
MediaMissionFailure,
} from 'lib/types/media-types.js';
import { useLegacyAshoatKeyserverCall } from 'lib/utils/action-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import CommIcon from '../components/comm-icon.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js';
@@ -108,7 +108,7 @@
thumbHash,
loop: false,
},
- keyserverOrThreadID: ashoatKeyserverID,
+ keyserverOrThreadID: authoritativeKeyserverID,
callbacks: { blobServiceUploadHandler },
});
if (!id) {
diff --git a/native/calendar/calendar.react.js b/native/calendar/calendar.react.js
--- a/native/calendar/calendar.react.js
+++ b/native/calendar/calendar.react.js
@@ -37,6 +37,7 @@
import type { LoadingStatus } from 'lib/types/loading-types.js';
import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import type { ConnectionStatus } from 'lib/types/socket-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import {
dateFromString,
dateString,
@@ -47,7 +48,6 @@
useDispatchActionPromise,
} from 'lib/utils/redux-promise-utils.js';
import sleep from 'lib/utils/sleep.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import CalendarInputBar from './calendar-input-bar.react.js';
import {
@@ -1081,7 +1081,9 @@
const calendarFilters = useSelector(state => state.calendarFilters);
const dimensions = useSelector(derivedDimensionsInfoSelector);
const loadingStatus = useSelector(loadingStatusSelector);
- const connection = useSelector(connectionSelector(ashoatKeyserverID));
+ const connection = useSelector(
+ connectionSelector(authoritativeKeyserverID),
+ );
invariant(connection, 'keyserver missing from keyserverStore');
const connectionStatus = connection.status;
const colors = useColors();
diff --git a/native/calendar/entry.react.js b/native/calendar/entry.react.js
--- a/native/calendar/entry.react.js
+++ b/native/calendar/entry.react.js
@@ -48,6 +48,7 @@
} from 'lib/types/minimally-encoded-thread-permissions-types.js';
import type { Dispatch } from 'lib/types/redux-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { dateString } from 'lib/utils/date-utils.js';
import { useResolvedThreadInfo } from 'lib/utils/entity-helpers.js';
import { ServerError } from 'lib/utils/errors.js';
@@ -57,7 +58,6 @@
} from 'lib/utils/redux-promise-utils.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
import sleep from 'lib/utils/sleep.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import type { EntryInfoWithHeight } from './calendar.react.js';
import LoadingIndicator from './loading-indicator.react.js';
@@ -783,7 +783,9 @@
navContext,
}),
);
- const connection = useSelector(connectionSelector(ashoatKeyserverID));
+ const connection = useSelector(
+ connectionSelector(authoritativeKeyserverID),
+ );
invariant(connection, 'keyserver missing from keyserverStore');
const online = connection.status === 'connected';
const styles = useStyles(unboundStyles);
diff --git a/native/data/sqlite-data-handler.js b/native/data/sqlite-data-handler.js
--- a/native/data/sqlite-data-handler.js
+++ b/native/data/sqlite-data-handler.js
@@ -20,9 +20,9 @@
logInActionSources,
type LogInActionSource,
} from 'lib/types/account-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { getMessageForException } from 'lib/utils/errors.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { filesystemMediaCache } from '../media/media-cache.js';
import { commCoreModule } from '../native-modules.js';
@@ -49,8 +49,8 @@
const rehydrateConcluded = useSelector(
state => !!(state._persist && state._persist.rehydrated),
);
- const cookie = useSelector(cookieSelector(ashoatKeyserverID));
- const urlPrefix = useSelector(urlPrefixSelector(ashoatKeyserverID));
+ const cookie = useSelector(cookieSelector(authoritativeKeyserverID));
+ const urlPrefix = useSelector(urlPrefixSelector(authoritativeKeyserverID));
invariant(urlPrefix, "missing urlPrefix for ashoat's keyserver");
const staffCanSee = useStaffCanSee();
const { staffUserHasBeenLoggedIn } = useStaffContext();
@@ -70,7 +70,7 @@
cookie,
urlPrefix,
source,
- ashoatKeyserverID,
+ authoritativeKeyserverID,
getInitialNotificationsEncryptedMessage,
);
dispatch({ type: setStoreLoadedActionType });
diff --git a/native/media/encrypted-image.react.js b/native/media/encrypted-image.react.js
--- a/native/media/encrypted-image.react.js
+++ b/native/media/encrypted-image.react.js
@@ -5,7 +5,7 @@
import { MediaCacheContext } from 'lib/components/media-cache-provider.react.js';
import { connectionSelector } from 'lib/selectors/keyserver-selectors.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { decryptBase64, useFetchAndDecryptMedia } from './encryption-utils.js';
import LoadableImage from './loadable-image.react.js';
@@ -39,7 +39,7 @@
const mediaCache = React.useContext(MediaCacheContext);
const [source, setSource] = React.useState<?ImageSource>(null);
- const connection = useSelector(connectionSelector(ashoatKeyserverID));
+ const connection = useSelector(connectionSelector(authoritativeKeyserverID));
invariant(connection, 'keyserver missing from keyserverStore');
const connectionStatus = connection.status;
const prevConnectionStatusRef = React.useRef(connectionStatus);
diff --git a/native/media/remote-image.react.js b/native/media/remote-image.react.js
--- a/native/media/remote-image.react.js
+++ b/native/media/remote-image.react.js
@@ -5,7 +5,7 @@
import { connectionSelector } from 'lib/selectors/keyserver-selectors.js';
import { type ConnectionStatus } from 'lib/types/socket-types.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import LoadableImage from './loadable-image.react.js';
import { useSelector } from '../redux/redux-utils.js';
@@ -69,7 +69,7 @@
}
function ConnectedRemoteImage(props: BaseProps): React.Node {
- const connection = useSelector(connectionSelector(ashoatKeyserverID));
+ const connection = useSelector(connectionSelector(authoritativeKeyserverID));
invariant(connection, 'keyserver missing from keyserverStore');
const connectionStatus = connection.status;
diff --git a/native/navigation/navigation-handler.react.js b/native/navigation/navigation-handler.react.js
--- a/native/navigation/navigation-handler.react.js
+++ b/native/navigation/navigation-handler.react.js
@@ -4,7 +4,7 @@
import { cookieSelector } from 'lib/selectors/keyserver-selectors.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { logInActionType, logOutActionType } from './action-types.js';
import ModalPruner from './modal-pruner.react.js';
@@ -61,7 +61,7 @@
const hasCurrentUserInfo = useSelector(isLoggedIn);
- const cookie = useSelector(cookieSelector(ashoatKeyserverID));
+ const cookie = useSelector(cookieSelector(authoritativeKeyserverID));
const hasUserCookie = !!(cookie && cookie.startsWith('user='));
const loggedIn = hasCurrentUserInfo && hasUserCookie;
diff --git a/native/profile/custom-server-modal.react.js b/native/profile/custom-server-modal.react.js
--- a/native/profile/custom-server-modal.react.js
+++ b/native/profile/custom-server-modal.react.js
@@ -7,9 +7,9 @@
import { setCustomServerActionType } from 'lib/actions/custom-server-actions.js';
import { urlPrefixSelector } from 'lib/selectors/keyserver-selectors.js';
import type { Dispatch } from 'lib/types/redux-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
import { setURLPrefix } from 'lib/utils/url-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import Button from '../components/button.react.js';
import Modal from '../components/modal.react.js';
@@ -120,7 +120,7 @@
const ConnectedCustomServerModal: React.ComponentType<BaseProps> =
React.memo<BaseProps>(function ConnectedCustomServerModal(props: BaseProps) {
- const urlPrefix = useSelector(urlPrefixSelector(ashoatKeyserverID));
+ const urlPrefix = useSelector(urlPrefixSelector(authoritativeKeyserverID));
invariant(urlPrefix, "missing urlPrefix for ashoat's keyserver");
const customServer = useSelector(state => state.customServer);
const styles = useStyles(unboundStyles);
diff --git a/native/profile/dev-tools.react.js b/native/profile/dev-tools.react.js
--- a/native/profile/dev-tools.react.js
+++ b/native/profile/dev-tools.react.js
@@ -7,9 +7,9 @@
import { urlPrefixSelector } from 'lib/selectors/keyserver-selectors.js';
import type { Dispatch } from 'lib/types/redux-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
import { setURLPrefix } from 'lib/utils/url-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import type { ProfileNavigationProp } from './profile.react.js';
import Button from '../components/button.react.js';
@@ -237,7 +237,7 @@
const ConnectedDevTools: React.ComponentType<BaseProps> = React.memo<BaseProps>(
function ConnectedDevTools(props: BaseProps) {
- const urlPrefix = useSelector(urlPrefixSelector(ashoatKeyserverID));
+ const urlPrefix = useSelector(urlPrefixSelector(authoritativeKeyserverID));
invariant(urlPrefix, "missing urlPrefix for ashoat's keyserver");
const customServer = useSelector(state => state.customServer);
const colors = useColors();
diff --git a/native/push/android.js b/native/push/android.js
--- a/native/push/android.js
+++ b/native/push/android.js
@@ -4,11 +4,11 @@
import { mergePrefixIntoBody } from 'lib/shared/notif-utils.js';
import type { RawMessageInfo } from 'lib/types/message-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import {
convertNonPendingIDToNewSchema,
convertNotificationMessageInfoToNewIDSchema,
} from 'lib/utils/migration-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
type CommAndroidNotificationsConstants = {
+NOTIFICATIONS_IMPORTANCE_HIGH: number,
@@ -53,7 +53,7 @@
...message,
threadID: convertNonPendingIDToNewSchema(
message.threadID,
- ashoatKeyserverID,
+ authoritativeKeyserverID,
),
messageInfos: convertNotificationMessageInfoToNewIDSchema(
message.messageInfos,
diff --git a/native/push/comm-ios-notification.js b/native/push/comm-ios-notification.js
--- a/native/push/comm-ios-notification.js
+++ b/native/push/comm-ios-notification.js
@@ -3,11 +3,11 @@
import { NativeModules } from 'react-native';
import type { RawMessageInfo } from 'lib/types/message-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import {
convertNonPendingIDToNewSchema,
convertNotificationMessageInfoToNewIDSchema,
} from 'lib/utils/migration-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
const { CommIOSNotifications } = NativeModules;
@@ -53,7 +53,7 @@
...notification,
threadID: convertNonPendingIDToNewSchema(
notification.threadID,
- ashoatKeyserverID,
+ authoritativeKeyserverID,
),
messageInfos: convertNotificationMessageInfoToNewIDSchema(
notification.messageInfos,
diff --git a/native/push/push-handler.react.js b/native/push/push-handler.react.js
--- a/native/push/push-handler.react.js
+++ b/native/push/push-handler.react.js
@@ -32,6 +32,7 @@
import type { Dispatch } from 'lib/types/redux-types.js';
import { type ConnectionInfo } from 'lib/types/socket-types.js';
import type { GlobalTheme } from 'lib/types/theme-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import {
convertNonPendingIDToNewSchema,
convertNotificationMessageInfoToNewIDSchema,
@@ -47,7 +48,6 @@
} from 'lib/utils/redux-promise-utils.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
import sleep from 'lib/utils/sleep.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import {
type AndroidMessage,
@@ -654,7 +654,7 @@
androidNotificationOpened = async (threadID: string) => {
const convertedThreadID = convertNonPendingIDToNewSchema(
threadID,
- ashoatKeyserverID,
+ authoritativeKeyserverID,
);
this.onPushNotifBootsApp();
this.onPressNotificationForThread(convertedThreadID, true);
@@ -705,10 +705,12 @@
const notifPermissionAlertInfo = useSelector(
state => state.notifPermissionAlertInfo,
);
- const connection = useSelector(connectionSelector(ashoatKeyserverID));
+ const connection = useSelector(
+ connectionSelector(authoritativeKeyserverID),
+ );
invariant(connection, 'keyserver missing from keyserverStore');
const updatesCurrentAsOf = useSelector(
- updatesCurrentAsOfSelector(ashoatKeyserverID),
+ updatesCurrentAsOfSelector(authoritativeKeyserverID),
);
const activeTheme = useSelector(state => state.globalThemeInfo.activeTheme);
const loggedIn = useSelector(isLoggedIn);
diff --git a/native/redux/default-state.js b/native/redux/default-state.js
--- a/native/redux/default-state.js
+++ b/native/redux/default-state.js
@@ -8,8 +8,8 @@
import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import { defaultKeyserverInfo } from 'lib/types/keyserver-types.js';
import { defaultGlobalThemeInfo } from 'lib/types/theme-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { defaultDimensionsInfo } from './dimensions-updater.react.js';
import type { AppState } from './state-types.js';
@@ -37,7 +37,7 @@
messages: {},
threads: {},
local: {},
- currentAsOf: { [ashoatKeyserverID]: 0 },
+ currentAsOf: { [authoritativeKeyserverID]: 0 },
},
storeLoaded: false,
loadingStatuses: {},
@@ -72,7 +72,7 @@
},
keyserverStore: {
keyserverInfos: {
- [ashoatKeyserverID]: defaultKeyserverInfo(defaultURLPrefix),
+ [authoritativeKeyserverID]: defaultKeyserverInfo(defaultURLPrefix),
},
},
localSettings: {
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -73,6 +73,7 @@
LegacyRawThreadInfo,
MixedRawThreadInfos,
} from 'lib/types/thread-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { wipeKeyserverStore } from 'lib/utils/keyserver-store-utils.js';
import {
translateClientDBMessageInfoToRawMessageInfo,
@@ -90,7 +91,6 @@
convertRawThreadInfoToClientDBThreadInfo,
} from 'lib/utils/thread-ops-utils.js';
import { getUUID } from 'lib/utils/uuid.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import {
updateClientDBThreadStoreThreadInfos,
@@ -716,7 +716,7 @@
),
connection: convertConnectionInfoToNewIDSchema(state.connection),
watchedThreadIDs: state.watchedThreadIDs.map(
- id => `${ashoatKeyserverID}|${id}`,
+ id => `${authoritativeKeyserverID}|${id}`,
),
inviteLinksStore: convertInviteLinksStoreToNewIDSchema(inviteLinksStore),
};
@@ -726,7 +726,9 @@
return {
...rest,
- keyserverStore: { keyserverInfos: { [ashoatKeyserverID]: { cookie } } },
+ keyserverStore: {
+ keyserverInfos: { [authoritativeKeyserverID]: { cookie } },
+ },
};
},
[45]: async (state: any) => {
@@ -738,8 +740,8 @@
...keyserverStore,
keyserverInfos: {
...keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
- ...keyserverStore.keyserverInfos[ashoatKeyserverID],
+ [authoritativeKeyserverID]: {
+ ...keyserverStore.keyserverInfos[authoritativeKeyserverID],
updatesCurrentAsOf,
},
},
@@ -753,7 +755,7 @@
...state,
messageStore: {
...state.messageStore,
- currentAsOf: { [ashoatKeyserverID]: currentAsOf },
+ currentAsOf: { [authoritativeKeyserverID]: currentAsOf },
},
};
},
@@ -766,8 +768,8 @@
...keyserverStore,
keyserverInfos: {
...keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
- ...keyserverStore.keyserverInfos[ashoatKeyserverID],
+ [authoritativeKeyserverID]: {
+ ...keyserverStore.keyserverInfos[authoritativeKeyserverID],
urlPrefix,
},
},
@@ -783,8 +785,8 @@
...keyserverStore,
keyserverInfos: {
...keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
- ...keyserverStore.keyserverInfos[ashoatKeyserverID],
+ [authoritativeKeyserverID]: {
+ ...keyserverStore.keyserverInfos[authoritativeKeyserverID],
connection,
},
},
@@ -795,7 +797,7 @@
const { keyserverStore, ...rest } = state;
const { connection, ...keyserverRest } =
- keyserverStore.keyserverInfos[ashoatKeyserverID];
+ keyserverStore.keyserverInfos[authoritativeKeyserverID];
return {
...rest,
@@ -803,7 +805,7 @@
...keyserverStore,
keyserverInfos: {
...keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
+ [authoritativeKeyserverID]: {
...keyserverRest,
},
},
@@ -830,8 +832,8 @@
...keyserverStore,
keyserverInfos: {
...keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
- ...keyserverStore.keyserverInfos[ashoatKeyserverID],
+ [authoritativeKeyserverID]: {
+ ...keyserverStore.keyserverInfos[authoritativeKeyserverID],
lastCommunicatedPlatformDetails,
},
},
@@ -905,8 +907,10 @@
...state.keyserverStore,
keyserverInfos: {
...state.keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
- ...state.keyserverStore.keyserverInfos[ashoatKeyserverID],
+ [authoritativeKeyserverID]: {
+ ...state.keyserverStore.keyserverInfos[
+ authoritativeKeyserverID
+ ],
urlPrefix: defaultURLPrefix,
},
},
@@ -922,8 +926,8 @@
...keyserverStore,
keyserverInfos: {
...keyserverStore.keyserverInfos,
- [ashoatKeyserverID]: {
- ...keyserverStore.keyserverInfos[ashoatKeyserverID],
+ [authoritativeKeyserverID]: {
+ ...keyserverStore.keyserverInfos[authoritativeKeyserverID],
deviceToken,
},
},
diff --git a/native/socket.react.js b/native/socket.react.js
--- a/native/socket.react.js
+++ b/native/socket.react.js
@@ -18,9 +18,9 @@
import { useInitialNotificationsEncryptedMessage } from 'lib/shared/crypto-utils.js';
import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js';
import { logInActionSources } from 'lib/types/account-types.js';
+import { authoritativeKeyserverID } from 'lib/utils/authoritative-keyserver.js';
import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js';
import { useDispatch } from 'lib/utils/redux-utils.js';
-import { ashoatKeyserverID } from 'lib/utils/validation-utils.js';
import { InputStateContext } from './input/input-state.js';
import {
@@ -44,27 +44,31 @@
const inputState = React.useContext(InputStateContext);
const navContext = React.useContext(NavContext);
- const cookie = useSelector(cookieSelector(ashoatKeyserverID));
- const urlPrefix = useSelector(urlPrefixSelector(ashoatKeyserverID));
+ const cookie = useSelector(cookieSelector(authoritativeKeyserverID));
+ const urlPrefix = useSelector(urlPrefixSelector(authoritativeKeyserverID));
invariant(urlPrefix, 'missing urlPrefix for given keyserver id');
- const connection = useSelector(connectionSelector(ashoatKeyserverID));
+ const connection = useSelector(
+ connectionSelector(authoritativeKeyserverID),
+ );
invariant(connection, 'keyserver missing from keyserverStore');
const frozen = useSelector(state => state.frozen);
const active = useSelector(
state => isLoggedIn(state) && state.lifecycleState !== 'background',
);
const noDataAfterPolicyAcknowledgment = useSelector(
- noDataAfterPolicyAcknowledgmentSelector(ashoatKeyserverID),
+ noDataAfterPolicyAcknowledgmentSelector(authoritativeKeyserverID),
);
const currentUserInfo = useSelector(state => state.currentUserInfo);
- const openSocket = useSelector(openSocketSelector(ashoatKeyserverID));
+ const openSocket = useSelector(
+ openSocketSelector(authoritativeKeyserverID),
+ );
invariant(openSocket, 'openSocket failed to be created');
const sessionIdentification = useSelector(
- sessionIdentificationSelector(ashoatKeyserverID),
+ sessionIdentificationSelector(authoritativeKeyserverID),
);
const preRequestUserState = useSelector(
- preRequestUserStateForSingleKeyserverSelector(ashoatKeyserverID),
+ preRequestUserStateForSingleKeyserverSelector(authoritativeKeyserverID),
);
const getInitialNotificationsEncryptedMessage =
@@ -80,7 +84,7 @@
}),
);
const sessionStateFunc = useSelector(state =>
- nativeSessionStateFuncSelector(ashoatKeyserverID)({
+ nativeSessionStateFuncSelector(authoritativeKeyserverID)({
redux: state,
navContext,
}),
@@ -107,7 +111,7 @@
}, [active, navContext]);
const lastCommunicatedPlatformDetails = useSelector(
- lastCommunicatedPlatformDetailsSelector(ashoatKeyserverID),
+ lastCommunicatedPlatformDetailsSelector(authoritativeKeyserverID),
);
const dispatch = useDispatch();
@@ -118,7 +122,7 @@
void dispatch({
type: setConnectionIssueActionType,
payload: {
- keyserverID: ashoatKeyserverID,
+ keyserverID: authoritativeKeyserverID,
connectionIssue: 'policy_acknowledgement_socket_crash_loop',
},
});
@@ -135,7 +139,7 @@
cookie,
urlPrefix,
logInActionSources.refetchUserDataAfterAcknowledgment,
- ashoatKeyserverID,
+ authoritativeKeyserverID,
getInitialNotificationsEncryptedMessage,
);
}, [
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Sep 29, 2:06 PM (21 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2200966
Default Alt Text
D11007.id36930.diff (28 KB)
Attached To
Mode
D11007: [native] Replace ashoatKeyserverID with authoritativeKeyserverID
Attached
Detach File
Event Timeline
Log In to Comment