Page MenuHomePhabricator
Differential D5503

Revert "[native] Add wrapper for generate_device_id"
AbandonedPublicDraft
Actions

Authored by inka on Oct 31 2022, 1:04 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 1:00 PM
Unknown Object (File)
Sat, Mar 15, 9:31 PM
Unknown Object (File)
Tue, Mar 4, 10:51 AM
Unknown Object (File)
Tue, Mar 4, 10:50 AM
Unknown Object (File)
Tue, Mar 4, 10:43 AM
Unknown Object (File)
Feb 17 2025, 8:55 PM
Unknown Object (File)
Feb 17 2025, 8:55 PM
Unknown Object (File)
Jan 20 2025, 2:31 AM
View All Files
Subscribers
• abosh

Details

Reviewers
ashoat
tomek
atul
varun
• jon
Summary

This reverts commit 07547636bf7c530d480c83f97c67672798206c0a.

Test Plan

The test is pushing to phabricator and seeing if CI fails

Diff Detail

Repository
rCOMM Comm
Branch
master
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

inka created this revision.Oct 31 2022, 1:04 AM
Herald added a reviewer: • jon. · View Herald TranscriptOct 31 2022, 1:04 AM
Herald added a subscriber: • abosh. · View Herald Transcript
Harbormaster returned this revision to the author for changes because remote builds failed.Oct 31 2022, 1:16 AM
Harbormaster failed remote builds in B13095: Diff 17981!
inka abandoned this revision.Nov 2 2022, 1:21 AM

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
CryptoTools/
ios/
Comm.xcodeproj/
6 lines

Diff 17981

View Options

native/cpp/CommonCpp/CryptoTools/DeviceID.h

// @flow // @flow
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
sendReactionMessage, sendReactionMessage,
sendReactionMessageActionTypes, sendReactionMessageActionTypes,
} from 'lib/actions/message-actions'; } from 'lib/actions/message-actions';
import { useModalContext } from 'lib/components/modal-provider.react'; import { useModalContext } from 'lib/components/modal-provider.react';
import { messageTypes } from 'lib/types/message-types';
import type { RawReactionMessageInfo } from 'lib/types/messages/reaction';
import { import {
useDispatchActionPromise, useDispatchActionPromise,
useServerCall, useServerCall,
} from 'lib/utils/action-utils'; } from 'lib/utils/action-utils';
import Alert from '../modals/alert.react'; import Alert from '../modals/alert.react';
import { useSelector } from '../redux/redux-utils';
function useOnClickReact( function useOnClickReact(
messageID: ?string, messageID: ?string,
localID: string, localID: string,
threadID: string, threadID: string,
reaction: string, reaction: string,
action: 'add_reaction' | 'remove_reaction', action: 'add_reaction' | 'remove_reaction',
): (event: SyntheticEvent<HTMLElement>) => mixed { ): (event: SyntheticEvent<HTMLElement>) => mixed {
const { pushModal } = useModalContext(); const { pushModal } = useModalContext();
const viewerID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const callSendReactionMessage = useServerCall(sendReactionMessage); const callSendReactionMessage = useServerCall(sendReactionMessage);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
return React.useCallback( return React.useCallback(
(event: SyntheticEvent<HTMLElement>) => { (event: SyntheticEvent<HTMLElement>) => {
event.preventDefault(); event.preventDefault();
if (!messageID) { if (!messageID) {
return; return;
} }
invariant(viewerID, 'viewerID should be set');
const reactionMessagePromise = (async () => { const reactionMessagePromise = (async () => {
try { try {
const result = await callSendReactionMessage({ const result = await callSendReactionMessage({
threadID, threadID,
localID, localID,
targetMessageID: messageID, targetMessageID: messageID,
reaction, reaction,
action, action,
Show All 9 Lines (event: SyntheticEvent<HTMLElement>) => {
<Alert title="Couldn’t send the reaction"> <Alert title="Couldn’t send the reaction">
Please try again later Please try again later
</Alert>, </Alert>,
); );
throw e; throw e;
} }
})(); })();
const startingPayload: RawReactionMessageInfo = {
type: messageTypes.REACTION,
threadID,
localID,
creatorID: viewerID,
time: Date.now(),
targetMessageID: messageID,
reaction,
action,
};
dispatchActionPromise( dispatchActionPromise(
sendReactionMessageActionTypes, sendReactionMessageActionTypes,
reactionMessagePromise, reactionMessagePromise,
undefined,
startingPayload,
); );
}, },
[ [
action,
callSendReactionMessage,
dispatchActionPromise,
messageID, messageID,
pushModal,
reaction,
threadID, threadID,
localID, localID,
viewerID,
reaction,
action,
dispatchActionPromise,
callSendReactionMessage,
pushModal,
], ],
); );
} }
export { useOnClickReact }; export { useOnClickReact };
View Options

native/cpp/CommonCpp/CryptoTools/DeviceID.cpp

// @flow // @flow
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
sendReactionMessage, sendReactionMessage,
sendReactionMessageActionTypes, sendReactionMessageActionTypes,
} from 'lib/actions/message-actions'; } from 'lib/actions/message-actions';
import { useModalContext } from 'lib/components/modal-provider.react'; import { useModalContext } from 'lib/components/modal-provider.react';
import { messageTypes } from 'lib/types/message-types';
import type { RawReactionMessageInfo } from 'lib/types/messages/reaction';
import { import {
useDispatchActionPromise, useDispatchActionPromise,
useServerCall, useServerCall,
} from 'lib/utils/action-utils'; } from 'lib/utils/action-utils';
import Alert from '../modals/alert.react'; import Alert from '../modals/alert.react';
import { useSelector } from '../redux/redux-utils';
function useOnClickReact( function useOnClickReact(
messageID: ?string, messageID: ?string,
localID: string, localID: string,
threadID: string, threadID: string,
reaction: string, reaction: string,
action: 'add_reaction' | 'remove_reaction', action: 'add_reaction' | 'remove_reaction',
): (event: SyntheticEvent<HTMLElement>) => mixed { ): (event: SyntheticEvent<HTMLElement>) => mixed {
const { pushModal } = useModalContext(); const { pushModal } = useModalContext();
const viewerID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const callSendReactionMessage = useServerCall(sendReactionMessage); const callSendReactionMessage = useServerCall(sendReactionMessage);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
return React.useCallback( return React.useCallback(
(event: SyntheticEvent<HTMLElement>) => { (event: SyntheticEvent<HTMLElement>) => {
event.preventDefault(); event.preventDefault();
if (!messageID) { if (!messageID) {
return; return;
} }
invariant(viewerID, 'viewerID should be set');
const reactionMessagePromise = (async () => { const reactionMessagePromise = (async () => {
try { try {
const result = await callSendReactionMessage({ const result = await callSendReactionMessage({
threadID, threadID,
localID, localID,
targetMessageID: messageID, targetMessageID: messageID,
reaction, reaction,
action, action,
Show All 9 Lines (event: SyntheticEvent<HTMLElement>) => {
<Alert title="Couldn’t send the reaction"> <Alert title="Couldn’t send the reaction">
Please try again later Please try again later
</Alert>, </Alert>,
); );
throw e; throw e;
} }
})(); })();
const startingPayload: RawReactionMessageInfo = {
type: messageTypes.REACTION,
threadID,
localID,
creatorID: viewerID,
time: Date.now(),
targetMessageID: messageID,
reaction,
action,
};
dispatchActionPromise( dispatchActionPromise(
sendReactionMessageActionTypes, sendReactionMessageActionTypes,
reactionMessagePromise, reactionMessagePromise,
undefined,
startingPayload,
); );
}, },
[ [
action,
callSendReactionMessage,
dispatchActionPromise,
messageID, messageID,
pushModal,
reaction,
threadID, threadID,
localID, localID,
viewerID,
reaction,
action,
dispatchActionPromise,
callSendReactionMessage,
pushModal,
], ],
); );
} }
export { useOnClickReact }; export { useOnClickReact };
View Options

native/ios/Comm.xcodeproj/project.pbxproj

// @flow // @flow
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
sendReactionMessage, sendReactionMessage,
sendReactionMessageActionTypes, sendReactionMessageActionTypes,
} from 'lib/actions/message-actions'; } from 'lib/actions/message-actions';
import { useModalContext } from 'lib/components/modal-provider.react'; import { useModalContext } from 'lib/components/modal-provider.react';
import { messageTypes } from 'lib/types/message-types';
import type { RawReactionMessageInfo } from 'lib/types/messages/reaction';
import { import {
useDispatchActionPromise, useDispatchActionPromise,
useServerCall, useServerCall,
} from 'lib/utils/action-utils'; } from 'lib/utils/action-utils';
import Alert from '../modals/alert.react'; import Alert from '../modals/alert.react';
import { useSelector } from '../redux/redux-utils';
function useOnClickReact( function useOnClickReact(
messageID: ?string, messageID: ?string,
localID: string, localID: string,
threadID: string, threadID: string,
reaction: string, reaction: string,
action: 'add_reaction' | 'remove_reaction', action: 'add_reaction' | 'remove_reaction',
): (event: SyntheticEvent<HTMLElement>) => mixed { ): (event: SyntheticEvent<HTMLElement>) => mixed {
const { pushModal } = useModalContext(); const { pushModal } = useModalContext();
const viewerID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const callSendReactionMessage = useServerCall(sendReactionMessage); const callSendReactionMessage = useServerCall(sendReactionMessage);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
return React.useCallback( return React.useCallback(
(event: SyntheticEvent<HTMLElement>) => { (event: SyntheticEvent<HTMLElement>) => {
event.preventDefault(); event.preventDefault();
if (!messageID) { if (!messageID) {
return; return;
} }
invariant(viewerID, 'viewerID should be set');
const reactionMessagePromise = (async () => { const reactionMessagePromise = (async () => {
try { try {
const result = await callSendReactionMessage({ const result = await callSendReactionMessage({
threadID, threadID,
localID, localID,
targetMessageID: messageID, targetMessageID: messageID,
reaction, reaction,
action, action,
Show All 9 Lines (event: SyntheticEvent<HTMLElement>) => {
<Alert title="Couldn’t send the reaction"> <Alert title="Couldn’t send the reaction">
Please try again later Please try again later
</Alert>, </Alert>,
); );
throw e; throw e;
} }
})(); })();
const startingPayload: RawReactionMessageInfo = {
type: messageTypes.REACTION,
threadID,
localID,
creatorID: viewerID,
time: Date.now(),
targetMessageID: messageID,
reaction,
action,
};
dispatchActionPromise( dispatchActionPromise(
sendReactionMessageActionTypes, sendReactionMessageActionTypes,
reactionMessagePromise, reactionMessagePromise,
undefined,
startingPayload,
); );
}, },
[ [
action,
callSendReactionMessage,
dispatchActionPromise,
messageID, messageID,
pushModal,
reaction,
threadID, threadID,
localID, localID,
viewerID,
reaction,
action,
dispatchActionPromise,
callSendReactionMessage,
pushModal,
], ],
); );
} }
export { useOnClickReact }; export { useOnClickReact };