[Android] Refactor openssl code to separate file and target
ClosedPublic
Actions

Authored by • jon on Feb 13 2023, 11:08 AM.

Details

Reviewers

• max
atul

Commits

rCOMM72905906676f: [Android] Refactor openssl code to separate file and target

Summary

CommonCpp/DatabaseManagers also makes use of sqlite +
openssl, refactor the logic so that the related openssl gets
moved to it's own file.

https://linear.app/comm/issue/ENG-3002

Depends on D6621

Test Plan

Android gate passes.

Local dev workflow also works:

# start keyserver and native
(cd keyserver && yarn dev &)
(cd native && yarn dev &)

cd native && yarn react-native run-android

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jon created this revision.Feb 13 2023, 11:08 AM

Herald added subscribers: tomek, ashoat. · View Herald TranscriptFeb 13 2023, 11:08 AM

Harbormaster returned this revision to the author for changes because remote builds failed.Feb 13 2023, 11:10 AM

Harbormaster failed remote builds in B16455: Diff 22496!

• jon added a child revision: D6722: [Android] Reference Tools by CMake project.Feb 13 2023, 11:38 AM

Lint

Harbormaster completed remote builds in B16459: Diff 22503.Feb 13 2023, 12:27 PM

• jon requested review of this revision.Feb 13 2023, 12:27 PM

Thanks for including testing Android in the test plan!

Let's chat about prioritization of this work tomorrow – I was under the impression we were pausing for the time being, but understand you might just be putting up some code you had already worked on

I had already done the work in my attempt to get the jni working for the native modules

atul accepted this revision.Feb 14 2023, 10:35 AM

This revision is now accepted and ready to land.Feb 14 2023, 10:35 AM

Happy to land this now, but let's discuss tomorrow RE ways to reduce JNI boilerplate for devs

• max accepted this revision.Feb 15 2023, 3:51 PM

Closed by commit rCOMM72905906676f: [Android] Refactor openssl code to separate file and target (authored by • jon). · Explain WhyFeb 20 2023, 6:29 PM

This revision was automatically updated to reflect the committed changes.

• jon added a commit: rCOMM72905906676f: [Android] Refactor openssl code to separate file and target.

Revision Contents
Changeset List

Path

Size

native/

android/

app/

CMakeLists.txt

32 lines

cmake/

openssl-target.cmake

30 lines

Diff 22503

View Options

native/android/app/CMakeLists.txt

	Show All 20 Lines

	type ContentProps = {			type ContentProps = {
	+threadInfo: ThreadInfo,			+threadInfo: ThreadInfo,
	};			};

	function MessageSearchModal(props: ContentProps): React.Node {			function MessageSearchModal(props: ContentProps): React.Node {
	const { threadInfo } = props;			const { threadInfo } = props;

	const [lastID, setLastID] = React.useState();			const {
	const [searchResults, setSearchResults] = React.useState([]);			getQuery,
	const [endReached, setEndReached] = React.useState(false);			setQuery,
				clearQuery,
				getSearchResults,
				appendSearchResult,
				getEndReached,
				setEndReached,
				} = useMessageSearchContext();

	const { getQuery, setQuery, clearQuery } = useMessageSearchContext();			const loading = React.useRef(false);

	const query = React.useMemo(			const searchResults = React.useMemo(
	() => getQuery(threadInfo.id),			() => getSearchResults(threadInfo.id),
	[getQuery, threadInfo.id],			[getSearchResults, threadInfo.id],
	);			);

	const appendSearchResults = React.useCallback(			const endReached = React.useMemo(
				() => getEndReached(threadInfo.id),
				[getEndReached, threadInfo.id],
				);

				const appendResults = React.useCallback(
	(newMessages: $ReadOnlyArray<RawMessageInfo>, end: boolean) => {			(newMessages: $ReadOnlyArray<RawMessageInfo>, end: boolean) => {
	setSearchResults(oldMessages => [...oldMessages, ...newMessages]);			appendSearchResult(newMessages, threadInfo.id);
	setEndReached(end);			if (end) {
				setEndReached(threadInfo.id);
				}
				loading.current = false;
	},			},
	[],			[appendSearchResult, setEndReached, threadInfo.id],
	);			);

	React.useEffect(() => {
	setSearchResults([]);
	setLastID(undefined);
	setEndReached(false);
	}, [query]);

	const searchMessages = useSearchMessages();			const searchMessages = useSearchMessages();

	React.useEffect(			const [input, setInput] = React.useState(getQuery(threadInfo.id));
	() => searchMessages(query, threadInfo.id, appendSearchResults, lastID),
	[appendSearchResults, lastID, query, searchMessages, threadInfo.id],
	);

	const modifiedItems = useParseSearchResults(threadInfo, searchResults);

	const renderItem = React.useCallback(			const onPressSearch = React.useCallback(() => {
	item => (			setQuery(input, threadInfo.id);
	<MessageResult			loading.current = true;
	key={item.messageInfo.id}			searchMessages(
	item={item}			getQuery(threadInfo.id),
	threadInfo={threadInfo}			threadInfo.id,
	scrollable={false}			appendResults,
	/>			undefined,
	),
	[threadInfo],
	);			);
				}, [setQuery, input, searchMessages, getQuery, threadInfo.id, appendResults]);

	const messages = React.useMemo(			const onKeyDown = React.useCallback(
	() => modifiedItems.map(item => renderItem(item)),			event => {
	[modifiedItems, renderItem],			if (event.key === 'Enter') {
				onPressSearch();
				}
				},
				[onPressSearch],
	);			);

	const messageContainer = React.useRef(null);			const modifiedItems = useParseSearchResults(threadInfo, searchResults);

				const { clearTooltip } = useTooltipContext();

				const messageContainer = React.useRef(null);
	const messageContainerRef = (msgContainer: ?HTMLDivElement) => {			const messageContainerRef = (msgContainer: ?HTMLDivElement) => {
	messageContainer.current = msgContainer;			messageContainer.current = msgContainer;
	messageContainer.current?.addEventListener('scroll', onScroll);
	};			};

	const { clearTooltip } = useTooltipContext();

	const possiblyLoadMoreMessages = React.useCallback(() => {			const possiblyLoadMoreMessages = React.useCallback(() => {
	if (!messageContainer.current) {			if (!messageContainer.current) {
	return;			return;
	}			}

	const loaderTopOffset = 32;			const loaderTopOffset = 32;
	const { scrollTop, scrollHeight, clientHeight } = messageContainer.current;			const { scrollTop, scrollHeight, clientHeight } = messageContainer.current;
	if (			if (
	endReached \|\|			endReached \|\|
				loading.current \|\|
	Math.abs(scrollTop) + clientHeight + loaderTopOffset < scrollHeight			Math.abs(scrollTop) + clientHeight + loaderTopOffset < scrollHeight
	) {			) {
	return;			return;
	}			}
	setLastID(modifiedItems ? oldestMessageID(modifiedItems) : undefined);			loading.current = true;
	}, [endReached, modifiedItems]);			const lastID = modifiedItems ? oldestMessageID(modifiedItems) : undefined;
				searchMessages(
				getQuery(threadInfo.id),
				threadInfo.id,
				appendResults,
				lastID,
				);
				}, [
				appendResults,
				endReached,
				getQuery,
				modifiedItems,
				searchMessages,
				threadInfo.id,
				]);

	const onScroll = React.useCallback(() => {			const onScroll = React.useCallback(() => {
	if (!messageContainer.current) {
	return;
	}
	clearTooltip();			clearTooltip();
	possiblyLoadMoreMessages();			possiblyLoadMoreMessages();
	}, [clearTooltip, possiblyLoadMoreMessages]);			}, [clearTooltip, possiblyLoadMoreMessages]);

				const renderItem = React.useCallback(
				item => (
				<MessageResult
				key={item.messageInfo.id}
				item={item}
				threadInfo={threadInfo}
				scrollable={false}
				/>
				),
				[threadInfo],
				);

				const messages = React.useMemo(
				() => modifiedItems.map(item => renderItem(item)),
				[modifiedItems, renderItem],
				);

	const footer = React.useMemo(() => {			const footer = React.useMemo(() => {
	if (query === '') {			if (getQuery(threadInfo.id) === '') {
	return (			return (
	<div className={css.footer}>Your search results will appear here</div>			<div className={css.footer}>Your search results will appear here</div>
	);			);
	}			}
	if (!endReached) {			if (!endReached) {
	return (			return (
	<div key="search-loader" className={css.loading}>			<div key="search-loader" className={css.loading}>
	<LoadingIndicator status="loading" size="medium" color="white" />			<LoadingIndicator status="loading" size="medium" color="white" />
	</div>			</div>
	);			);
	}			}
	if (modifiedItems.length > 0) {			if (modifiedItems.length > 0) {
	return <div className={css.footer}>End of results</div>;			return <div className={css.footer}>End of results</div>;
	}			}
	return (			return (
	<div className={css.footer}>			<div className={css.footer}>
	No results. Please try using different keywords to refine your search			No results. Please try using different keywords to refine your search
	</div>			</div>
	);			);
	}, [query, endReached, modifiedItems.length]);			}, [getQuery, threadInfo.id, endReached, modifiedItems.length]);

	const [input, setInput] = React.useState(query);

	const onPressSearch = React.useCallback(			const { uiName } = useResolvedThreadInfo(threadInfo);
	() => setQuery(input, threadInfo.id),			const searchPlaceholder = `Searching in ${uiName}`;
	[setQuery, input, threadInfo.id],			const { popModal } = useModalContext();
	);

	const clearQueryWrapper = React.useCallback(			const clearQueryWrapper = React.useCallback(
	() => clearQuery(threadInfo.id),			() => clearQuery(threadInfo.id),
	[clearQuery, threadInfo.id],			[clearQuery, threadInfo.id],
	);			);

	const onKeyDown = React.useCallback(
	event => {
	if (event.key === 'Enter') {
	onPressSearch();
	}
	},
	[onPressSearch],
	);

	const { uiName } = useResolvedThreadInfo(threadInfo);
	const searchPlaceholder = `Searching in ${uiName}`;
	const { popModal } = useModalContext();

	return (			return (
	<Modal name="Search Message" onClose={popModal} size="large">			<Modal name="Search Message" onClose={popModal} size="large">
	<div className={css.container}>			<div className={css.container}>
	<div className={css.header}>			<div className={css.header}>
	<Search			<Search
	onChangeText={setInput}			onChangeText={setInput}
	searchText={input}			searchText={input}
	placeholder={searchPlaceholder}			placeholder={searchPlaceholder}
	onClearText={clearQueryWrapper}			onClearText={clearQueryWrapper}
	onKeyDown={onKeyDown}			onKeyDown={onKeyDown}
	/>			/>
	<Button			<Button
	onClick={onPressSearch}			onClick={onPressSearch}
	variant="filled"			variant="filled"
	className={css.button}			className={css.button}
	>			>
	Search			Search
	</Button>			</Button>
	</div>			</div>
	<div className={css.content} ref={messageContainerRef}>			<div
				className={css.content}
				ref={messageContainerRef}
				onScroll={onScroll}
				>
	{messages}			{messages}
	{footer}			{footer}
	</div>			</div>
	</div>			</div>
	</Modal>			</Modal>
	);			);
	}			}

	Show All 10 Lines