Remove redundant warnings about notifications without message infos that exceed limits
ClosedPublic
Actions

Authored by marcin on Aug 1 2023, 6:40 AM.

Details

Reviewers

tomek

Commits

rCOMM4b2634dd0ae4: Remove redundant warnings about notifications without message infos that exceed…

Summary

this differential removes unecessary warnings. We don't have to check if notification exceeds FCM/APN size limits after messageInfos removal. The reason for this is that we construct notification body based on ResolvedNotifTexts, which trims
texts in notification: https://github.com/CommE2E/comm/blob/master/lib/shared/notif-utils.js#L50-L57.

Test Plan

Build iOS and Android apps.
Send large (more than 8000 characters) notification from web.
Ensure that notification is displayed on both devices.
Kill keyserver.
Open both apps.
Ensure notifications weren't persisted (since no messageInfos).

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

marcin created this revision.Aug 1 2023, 6:40 AM

Herald added a subscriber: ashoat. · View Herald TranscriptAug 1 2023, 6:40 AM

marcin added a parent revision: D8588: Refactor olm-session-updater to enable to conditionally skip database content update.Aug 1 2023, 6:54 AM

marcin added a child revision: D8697: Significant refactor of notification encryption code.

Rebase to update commit message

Harbormaster completed remote builds in B21455: Diff 29431.Aug 1 2023, 7:15 AM

Harbormaster completed remote builds in B21459: Diff 29435.Aug 1 2023, 8:10 AM

marcin requested review of this revision.Aug 1 2023, 8:10 AM

tomek accepted this revision.Aug 2 2023, 2:04 AM

This revision is now accepted and ready to land.Aug 2 2023, 2:04 AM

Rebase before landing

Harbormaster completed remote builds in B21893: Diff 30074.Aug 18 2023, 7:27 AM

Closed by commit rCOMM4b2634dd0ae4: Remove redundant warnings about notifications without message infos that exceed… (authored by marcin). · Explain WhyAug 18 2023, 7:53 AM

This revision was automatically updated to reflect the committed changes.

marcin added a commit: rCOMM4b2634dd0ae4: Remove redundant warnings about notifications without message infos that exceed….

Revision Contents
Changeset List

Path

Size

keyserver/

src/

push/

send.js

15 lines

Diff 30074

View Options

keyserver/src/push/send.js

// @flow		// @flow

import * as React from 'react';		import * as React from 'react';
import { TextInput, FlatList, StyleSheet } from 'react-native';		import { TextInput, FlatList, StyleSheet } from 'react-native';

		import { useSearchSidebars } from 'lib/hooks/search-sidebars';
import { sidebarInfoSelector } from 'lib/selectors/thread-selectors';		import { sidebarInfoSelector } from 'lib/selectors/thread-selectors';
import SearchIndex from 'lib/shared/search-index';		import SearchIndex from 'lib/shared/search-index';
import { threadSearchText } from 'lib/shared/thread-utils';		import { threadSearchText } from 'lib/shared/thread-utils';
import type { ThreadInfo, SidebarInfo } from 'lib/types/thread-types';		import type { ThreadInfo, SidebarInfo } from 'lib/types/thread-types';

import Modal from '../components/modal.react';		import Modal from '../components/modal.react';
import Search from '../components/search.react';		import Search from '../components/search.react';
import type { RootNavigationProp } from '../navigation/root-navigator.react';		import type { RootNavigationProp } from '../navigation/root-navigator.react';
Show All 16 Lines
}		}

type Props = {		type Props = {
+navigation: RootNavigationProp<'SidebarListModal'>,		+navigation: RootNavigationProp<'SidebarListModal'>,
+route: NavigationRoute<'SidebarListModal'>,		+route: NavigationRoute<'SidebarListModal'>,
};		};
function SidebarListModal(props: Props): React.Node {		function SidebarListModal(props: Props): React.Node {
const threadID = props.route.params.threadInfo.id;		const threadID = props.route.params.threadInfo.id;
		const { listData, searchState, setSearchState } = useSearchSidebars(
		props.route.params.threadInfo,
		);
const sidebarInfos = useSelector(		const sidebarInfos = useSelector(
state => sidebarInfoSelector(state)[threadID] ?? [],		state => sidebarInfoSelector(state)[threadID] ?? [],
);		);

const [searchState, setSearchState] = React.useState({
text: '',
results: new Set<string>(),
});

const listData = React.useMemo(() => {
if (!searchState.text) {
return sidebarInfos;
}
return sidebarInfos.filter(({ threadInfo }) =>
searchState.results.has(threadInfo.id),
);
}, [sidebarInfos, searchState]);

const userInfos = useSelector(state => state.userStore.userInfos);		const userInfos = useSelector(state => state.userStore.userInfos);
const viewerID = useSelector(		const viewerID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,		state => state.currentUserInfo && state.currentUserInfo.id,
);		);
const searchIndex = React.useMemo(() => {		const searchIndex = React.useMemo(() => {
const index = new SearchIndex();		const index = new SearchIndex();
for (const sidebarInfo of sidebarInfos) {		for (const sidebarInfo of sidebarInfos) {
const { threadInfo } = sidebarInfo;		const { threadInfo } = sidebarInfo;
index.addEntry(		index.addEntry(
threadInfo.id,		threadInfo.id,
threadSearchText(threadInfo, userInfos, viewerID),		threadSearchText(threadInfo, userInfos, viewerID),
);		);
}		}
return index;		return index;
}, [sidebarInfos, userInfos, viewerID]);		}, [sidebarInfos, userInfos, viewerID]);
React.useEffect(() => {		React.useEffect(() => {
setSearchState(curState => ({		setSearchState(curState => ({
...curState,		...curState,
results: new Set(searchIndex.getSearchResults(curState.text)),		results: new Set(searchIndex.getSearchResults(curState.text)),
}));		}));
}, [searchIndex]);		}, [searchIndex, setSearchState]);

const onChangeSearchText = React.useCallback(		const onChangeSearchText = React.useCallback(
(searchText: string) =>		(searchText: string) =>
setSearchState({		setSearchState({
text: searchText,		text: searchText,
results: new Set(searchIndex.getSearchResults(searchText)),		results: new Set(searchIndex.getSearchResults(searchText)),
}),		}),
[searchIndex],		[searchIndex, setSearchState],
);		);

const searchTextInputRef = React.useRef();		const searchTextInputRef = React.useRef();
const setSearchTextInputRef = React.useCallback(		const setSearchTextInputRef = React.useCallback(
async (textInput: ?React.ElementRef<typeof TextInput>) => {		async (textInput: ?React.ElementRef<typeof TextInput>) => {
searchTextInputRef.current = textInput;		searchTextInputRef.current = textInput;
if (!textInput) {		if (!textInput) {
return;		return;
Show All 13 Lines	(threadInfo: ThreadInfo) => {
text: '',		text: '',
results: new Set(),		results: new Set(),
});		});
if (searchTextInputRef.current) {		if (searchTextInputRef.current) {
searchTextInputRef.current.blur();		searchTextInputRef.current.blur();
}		}
navigateToThread({ threadInfo });		navigateToThread({ threadInfo });
},		},
[navigateToThread],		[navigateToThread, setSearchState],
);		);

const renderItem = React.useCallback(		const renderItem = React.useCallback(
(row: { item: SidebarInfo, ... }) => {		(row: { item: SidebarInfo, ... }) => {
return (		return (
<SidebarItem		<SidebarItem
sidebarInfo={row.item}		sidebarInfo={row.item}
onPressItem={onPressItem}		onPressItem={onPressItem}
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines

Remove redundant warnings about notifications without message infos that exceed limitsClosedPublicActions