imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conform more of the codebase to strict types (#11191)

Browse source
This commit is contained in:
Michael Telatynski 2023-07-05 11:53:22 +01:00 • committed by GitHub
parent 4044c2aa66
commit 8107f1d271
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 88 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/dialogs/ChangelogDialog.tsx
View file

@ -60,7 +60,7 @@ export default class ChangelogDialog extends React.Component<IProps, State> {
const body = await res.json();
this.setState({ [repo]: body.commits });
} catch (err) {
this.setState({ [repo]: err.message });
this.setState({ [repo]: err instanceof Error ? err.message : _t("Unknown error") });
}
}

2
src/components/views/dialogs/LogoutDialog.tsx
View file

@ -39,7 +39,6 @@ interface IState {
shouldLoadBackupStatus: boolean;
loading: boolean;
backupInfo: IKeyBackupInfo | null;
error?: string;
}
export default class LogoutDialog extends React.Component<IProps, IState> {
@ -75,7 +74,6 @@ export default class LogoutDialog extends React.Component<IProps, IState> {
logger.log("Unable to fetch key backup status", e);
this.setState({
loading: false,
error: e,
});
}
}

2
src/components/views/dialogs/ReportEventDialog.tsx
View file

@ -272,7 +272,7 @@ export default class ReportEventDialog extends React.Component<IProps, IState> {
logger.error(e);
this.setState({
busy: false,
err: e.message,
err: e instanceof Error ? e.message : String(e),
});
}
};

9
src/components/views/dialogs/security/CreateCrossSigningDialog.tsx
View file

@ -18,7 +18,8 @@ limitations under the License.
import React from "react";
import { CrossSigningKeys } from "matrix-js-sdk/src/client";
import { logger } from "matrix-js-sdk/src/logger";
import { UIAFlow } from "matrix-js-sdk/src/matrix";
import { AuthDict, MatrixError, UIAFlow } from "matrix-js-sdk/src/matrix";
import { UIAResponse } from "matrix-js-sdk/src/@types/uia";
import { MatrixClientPeg } from "../../../../MatrixClientPeg";
import { _t } from "../../../../languageHandler";
@ -79,7 +80,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
// no keys which would be a no-op.
logger.log("uploadDeviceSigningKeys unexpectedly succeeded without UI auth!");
} catch (error) {
if (!error.data || !error.data.flows) {
if (!(error instanceof MatrixError) || !error.data || !error.data.flows) {
logger.log("uploadDeviceSigningKeys advertised no flows!");
return;
}
@ -92,7 +93,9 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
}
}
private doBootstrapUIAuth = async (makeRequest: (authData: any) => Promise<{}>): Promise<void> => {
private doBootstrapUIAuth = async (
makeRequest: (authData: AuthDict) => Promise<UIAResponse<void>>,
): Promise<void> => {
if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
await makeRequest({
type: "m.login.password",

6
src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
View file

@ -55,7 +55,7 @@ interface IState {
backupInfo: IKeyBackupInfo | null;
backupKeyStored: Record<string, ISecretStorageKeyInfo> | null;
loading: boolean;
loadError: string | null;
loadError: boolean | null;
restoreError: {
errcode: string;
} | null;
@ -66,7 +66,7 @@ interface IState {
passPhrase: string;
restoreType: RestoreType | null;
progress: {
stage: ProgressState;
stage: ProgressState | string;
total?: number;
successes?: number;
failures?: number;
@ -304,7 +304,7 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
} catch (e) {
logger.log("Error loading backup status", e);
this.setState({
loadError: e,
loadError: true,
loading: false,
});
}