Page MenuHomePhabricator
Differential D10173

[native] Return inputState.sendMultimediaMessage Promise directly in ChatCameraModal
ClosedPublic
Actions

Authored by ashoat on Dec 4 2023, 1:16 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 19, 11:13 AM
Unknown Object (File)
Sat, Apr 19, 4:02 AM
Unknown Object (File)
Fri, Apr 18, 10:32 PM
Unknown Object (File)
Fri, Apr 18, 9:41 PM
Unknown Object (File)
Fri, Apr 18, 2:41 PM
Unknown Object (File)
Wed, Apr 9, 12:33 AM
Unknown Object (File)
Tue, Apr 8, 9:04 PM
Unknown Object (File)
Tue, Apr 8, 8:33 PM
View All Files
Subscribers
tomek

Details

Reviewers
atul
michal
Commits
rCOMM7d8c0e0ae555: [native] Return inputState.sendMultimediaMessage Promise directly in…
Summary

The API of CameraModal doesn't care what the function returns, so we might as well return the Promise directly, as an alternative to prefixing with void.

Depends on D10171

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
media/
2 lines

Diff 34307

View Options

native/media/chat-camera-modal.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useBroadcastDeviceListUpdates } from '../hooks/peer-list-hooks.js'; import {
useBroadcastDeviceListUpdates,
useBroadcastAccountDeletion,
} from '../hooks/peer-list-hooks.js';
import type { import type {
CallSingleKeyserverEndpoint, CallSingleKeyserverEndpoint,
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
} from '../keyserver-conn/call-single-keyserver-endpoint.js'; } from '../keyserver-conn/call-single-keyserver-endpoint.js';
import { import {
extractKeyserverIDFromID, extractKeyserverIDFromID,
sortThreadIDsPerKeyserver, sortThreadIDsPerKeyserver,
sortCalendarQueryPerKeyserver, sortCalendarQueryPerKeyserver,
▲ Show 20 Lines • Show All 486 Lines • ▼ Show 20 Lines
} }
const deleteAccountActionTypes = Object.freeze({ const deleteAccountActionTypes = Object.freeze({
started: 'DELETE_ACCOUNT_STARTED', started: 'DELETE_ACCOUNT_STARTED',
success: 'DELETE_ACCOUNT_SUCCESS', success: 'DELETE_ACCOUNT_SUCCESS',
failed: 'DELETE_ACCOUNT_FAILED', failed: 'DELETE_ACCOUNT_FAILED',
}); });
const accountDeletionBroadcastOptions = Object.freeze({
broadcastToOwnDevices: true,
});
function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> { function useDeleteAccount(): (password: ?string) => Promise<LogOutResult> {
const client = React.useContext(IdentityClientContext); const client = React.useContext(IdentityClientContext);
const identityClient = client?.identityClient; const identityClient = client?.identityClient;
const broadcastAccountDeletion = useBroadcastAccountDeletion(
accountDeletionBroadcastOptions,
);
const preRequestUserState = usePreRequestUserState(); const preRequestUserState = usePreRequestUserState();
const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount); const callKeyserverDeleteAccount = useKeyserverCall(deleteKeyserverAccount);
const commServicesAccessToken = useSelector( const commServicesAccessToken = useSelector(
state => state.commServicesAccessToken, state => state.commServicesAccessToken,
); );
return React.useCallback( return React.useCallback(
async password => { async password => {
if (usingCommServicesAccessToken) { if (usingCommServicesAccessToken) {
if (!identityClient) { if (!identityClient) {
throw new Error('Identity service client is not initialized'); throw new Error('Identity service client is not initialized');
} }
if ( const { deleteWalletUser, deletePasswordUser } = identityClient;
!identityClient.deleteWalletUser || if (!deleteWalletUser || !deletePasswordUser) {
bartekAuthorUnsubmitted
Done
Inline Actions

This is because of Flow not being able to infer these as non-null after await broadcastAccountDeletion(); was called

bartek: This is because of Flow not being able to infer these as non-null after `await…
!identityClient.deletePasswordUser
) {
throw new Error('Delete user method unimplemented'); throw new Error('Delete user method unimplemented');
} }
await broadcastAccountDeletion();
if (password) { if (password) {
await identityClient.deletePasswordUser(password); await deletePasswordUser(password);
} else { } else {
await identityClient.deleteWalletUser(); await deleteWalletUser();
} }
} }
try { try {
const keyserverResult = await callKeyserverDeleteAccount({ const keyserverResult = await callKeyserverDeleteAccount({
preRequestUserState, preRequestUserState,
}); });
const { keyserverIDs: _, ...result } = keyserverResult; const { keyserverIDs: _, ...result } = keyserverResult;
return { return {
Show All 16 Lines async password => {
currentUserInfo: null, currentUserInfo: null,
preRequestUserState: { preRequestUserState: {
...preRequestUserState, ...preRequestUserState,
commServicesAccessToken, commServicesAccessToken,
}, },
}; };
}, },
[ [
broadcastAccountDeletion,
callKeyserverDeleteAccount, callKeyserverDeleteAccount,
commServicesAccessToken, commServicesAccessToken,
identityClient, identityClient,
preRequestUserState, preRequestUserState,
], ],
); );
} }
▲ Show 20 Lines • Show All 887 Lines • Show Last 20 Lines