Convert more of js-sdk crypto and fix underscored field accesses

src/SecurityManager.ts

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { ICryptoCallbacks, IDeviceTrustLevel, ISecretStorageKeyInfo } from 'matrix-js-sdk/src/matrix';
+import { ICryptoCallbacks, ISecretStorageKeyInfo } from 'matrix-js-sdk/src/matrix';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
 import Modal from './Modal';
 import * as sdk from './index';
@@ -28,6 +28,7 @@ import AccessSecretStorageDialog from './components/views/dialogs/security/Acces
 import RestoreKeyBackupDialog from './components/views/dialogs/security/RestoreKeyBackupDialog';
 import SettingsStore from "./settings/SettingsStore";
 import SecurityCustomisations from "./customisations/Security";
+import { DeviceTrustLevel } from 'matrix-js-sdk/src/crypto/CrossSigning';
 
 // This stores the secret storage private keys in memory for the JS SDK. This is
 // only meant to act as a cache to avoid prompting the user multiple times
@@ -244,7 +245,7 @@ async function onSecretRequested(
  deviceId: string,
  requestId: string,
  name: string,
- deviceTrust: IDeviceTrustLevel,
+ deviceTrust: DeviceTrustLevel,
 ): Promise<string> {
  console.log("onSecretRequested", userId, deviceId, requestId, name, deviceTrust);
  const client = MatrixClientPeg.get();

src/components/views/dialogs/DevtoolsDialog.tsx

@@ -766,7 +766,7 @@ class VerificationExplorer extends React.PureComponent<IExplorerProps> {
  render() {
  const cli = this.context;
  const room = this.props.room;
- const inRoomChannel = cli.crypto._inRoomVerificationRequests;
+ const inRoomChannel = cli.crypto.inRoomVerificationRequests;
  const inRoomRequests = (inRoomChannel._requestsByRoomId || new Map()).get(room.roomId) || new Map();
 
  return (<div>

src/components/views/settings/CrossSigningPanel.js

@@ -79,8 +79,8 @@ export default class CrossSigningPanel extends React.PureComponent {
  async _getUpdatedStatus() {
  const cli = MatrixClientPeg.get();
  const pkCache = cli.getCrossSigningCacheCallbacks();
- const crossSigning = cli.crypto._crossSigningInfo;
- const secretStorage = cli.crypto._secretStorage;
+ const crossSigning = cli.crypto.crossSigningInfo;
+ const secretStorage = cli.crypto.secretStorage;
  const crossSigningPublicKeysOnDevice = crossSigning.getId();
  const crossSigningPrivateKeysInStorage = await crossSigning.isStoredInSecretStorage(secretStorage);
  const masterPrivateKeyCached = !!(pkCache && await pkCache.getCrossSigningKeyCache("master"));

src/components/views/settings/SecureBackupPanel.js

@@ -131,7 +131,7 @@ export default class SecureBackupPanel extends React.PureComponent {
 
  async _getUpdatedDiagnostics() {
  const cli = MatrixClientPeg.get();
- const secretStorage = cli.crypto._secretStorage;
+ const secretStorage = cli.crypto.secretStorage;
 
  const backupKeyStored = !!(await cli.isKeyBackupKeyStored());
  const backupKeyFromCache = await cli.crypto.getSessionBackupPrivateKey();