Skip to content

Commit

Permalink
Remove Features.RustCrypto
Browse files Browse the repository at this point in the history
  • Loading branch information
florianduros committed Nov 27, 2024
1 parent c34cbd0 commit 888f762
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 18 deletions.
7 changes: 0 additions & 7 deletions src/MatrixClientPeg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ import IdentityAuthClient from "./IdentityAuthClient";
import { crossSigningCallbacks } from "./SecurityManager";
import { SlidingSyncManager } from "./SlidingSyncManager";
import { _t, UserFriendlyError } from "./languageHandler";
import { SettingLevel } from "./settings/SettingLevel";
import MatrixClientBackedController from "./settings/controllers/MatrixClientBackedController";
import ErrorDialog from "./components/views/dialogs/ErrorDialog";
import PlatformPeg from "./PlatformPeg";
import { formatList } from "./utils/FormattingUtils";
import SdkConfig from "./SdkConfig";
import { Features } from "./settings/Settings";
import { setDeviceIsolationMode } from "./settings/controllers/DeviceIsolationModeController.ts";

export interface IMatrixClientCreds {
Expand Down Expand Up @@ -333,11 +331,6 @@ class MatrixClientPegClass implements IMatrixClientPeg {
logger.error("Warning! Not using an encryption key for rust crypto store.");
}

// Record the fact that we used the Rust crypto stack with this client. This just guards against people
// rolling back to versions of EW that did not default to Rust crypto (which would lead to an error, since
// we cannot migrate from Rust to Legacy crypto).
await SettingsStore.setValue(Features.RustCrypto, null, SettingLevel.DEVICE, true);

await this.matrixClient.initRustCrypto({
storageKey: rustCryptoStoreKey,
storagePassword: rustCryptoStorePassword,
Expand Down
11 changes: 0 additions & 11 deletions src/settings/Settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,6 @@ export enum Features {
NotificationSettings2 = "feature_notification_settings2",
OidcNativeFlow = "feature_oidc_native_flow",
ReleaseAnnouncement = "feature_release_announcement",

/** If true, use the Rust crypto implementation.
*
* This is no longer read, but we continue to populate it on all devices, to guard against people rolling back to
* old versions of EW that do not use rust crypto by default.
*/
RustCrypto = "feature_rust_crypto",
}

export const labGroupNames: Record<LabGroup, TranslationKey> = {
Expand Down Expand Up @@ -469,10 +462,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
description: _td("labs|oidc_native_flow_description"),
default: false,
},
[Features.RustCrypto]: {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: true,
},
/**
* @deprecated in favor of {@link fontSizeDelta}
*/
Expand Down

0 comments on commit 888f762

Please sign in to comment.