Page MenuHomePhabricator
Differential D6115

[native] Modify `getUserPublicKey()` JSI function to return `ClientPublicKeys`
ClosedPublic
Actions

Authored by atul on Dec 30 2022, 3:23 PM.
Tags
None
Referenced Files
F5192859: D6115.id20453.diff
Fri, Apr 4, 6:35 PM
Unknown Object (File)
Sat, Mar 8, 6:51 PM
Unknown Object (File)
Feb 17 2025, 9:05 PM
Unknown Object (File)
Feb 17 2025, 9:05 PM
Unknown Object (File)
Feb 17 2025, 9:05 PM
Unknown Object (File)
Feb 17 2025, 9:05 PM
Unknown Object (File)
Feb 13 2025, 10:09 AM
Unknown Object (File)
Jan 31 2025, 11:12 PM
View All Files
Subscribers
None

Details

Reviewers
ashoat
tomek
Commits
rCOMM331e51b88036: [native] Modify `getUserPublicKey()` JSI function to return `ClientPublicKeys`
Summary

Right now getUserPublicKey() returns stringified JSON, we want an object of type ClientPublicKeys instead.

Test Plan

Added the following to privacy-preferences.react.js and logged values to ensure that they were as expected:

React.useEffect(() => {
  (async () => {
    await commCoreModule.initializeCryptoAccount('ABC');
    const { curve25519, ed25519 } = await commCoreModule.getUserPublicKey();
    console.log(curve25519);
    console.log(ed25519);
  })();
}, []);

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
13 lines
schema/
7 lines

Diff 20472

View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

// @flow // @flow
import { useRoute } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { useStringForUser } from 'lib/hooks/ens-cache.js'; import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { clusterEndHeight, avatarOffset } from './chat-constants.js'; import { clusterEndHeight, avatarOffset } from './chat-constants.js';
import type { DisplayType } from './timestamp.react.js'; import type { DisplayType } from './timestamp.react.js';
import { Timestamp, timestampHeight } from './timestamp.react.js'; import { Timestamp, timestampHeight } from './timestamp.react.js';
import { SingleLine } from '../components/single-line.react.js'; import { SingleLine } from '../components/single-line.react.js';
import { MessageListRouteName } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js'; import { useStyles } from '../themes/colors.js';
import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js';
import { useShouldRenderAvatars } from '../utils/avatar-utils.js'; import { useShouldRenderAvatars } from '../utils/avatar-utils.js';
type Props = { type Props = {
+item: ChatMessageInfoItemWithHeight, +item: ChatMessageInfoItemWithHeight,
+focused: boolean, +focused: boolean,
+display: DisplayType, +display: DisplayType,
}; };
function MessageHeader(props: Props): React.Node { function MessageHeader(props: Props): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const { item, focused, display } = props; const { item, focused, display } = props;
const { creator, time } = item.messageInfo; const { creator, time } = item.messageInfo;
const { isViewer } = creator; const { isViewer } = creator;
const route = useRoute();
const modalDisplay = display === 'modal'; const modalDisplay = display === 'modal';
const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster); const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster);
const stringForUser = useStringForUser(shouldShowUsername ? creator : null); const stringForUser = useStringForUser(shouldShowUsername ? creator : null);
const shouldRenderAvatars = useShouldRenderAvatars(); const shouldRenderAvatars = useShouldRenderAvatars();
let authorName = null; let authorName = null;
if (stringForUser) { if (stringForUser) {
const style = [styles.authorName]; const style = [styles.authorName];
if (modalDisplay) { if (modalDisplay) {
style.push(styles.modal); style.push(styles.modal);
} }
if (shouldRenderAvatars) { if (shouldRenderAvatars) {
style.push({ marginLeft: 12 + avatarOffset }); style.push({ marginLeft: 12 + avatarOffset });
} else { } else {
style.push({ marginLeft: 12 }); style.push({ marginLeft: 12 });
} }
authorName = <SingleLine style={style}>{stringForUser}</SingleLine>; authorName = <SingleLine style={style}>{stringForUser}</SingleLine>;
} }
// We only want to render the top-placed timestamp for a message if it's
// rendered in the message list, and not any separate screens (i.e.
// the MessageResultsScreen).
const presentedFromMessageList =
typeof route.params?.presentedFrom === 'string' &&
route.params.presentedFrom.startsWith(MessageListRouteName);
const messageInMessageList =
route.name === MessageListRouteName || presentedFromMessageList;
const timestamp = const timestamp =
modalDisplay || item.startsConversation ? ( messageInMessageList && (modalDisplay || item.startsConversation) ? (
<Timestamp time={time} display={display} /> <Timestamp time={time} display={display} />
) : null; ) : null;
let style = null; let style = null;
if (focused && !modalDisplay) { if (focused && !modalDisplay) {
let topMargin = 0; let topMargin = 0;
if (!item.startsCluster && !item.messageInfo.creator.isViewer) { if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
topMargin += authorNameHeight + clusterEndHeight; topMargin += authorNameHeight + clusterEndHeight;
Show All 34 Lines
View Options

native/schema/CommCoreModuleSchema.js

// @flow // @flow
import { useRoute } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { useStringForUser } from 'lib/hooks/ens-cache.js'; import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { clusterEndHeight, avatarOffset } from './chat-constants.js'; import { clusterEndHeight, avatarOffset } from './chat-constants.js';
import type { DisplayType } from './timestamp.react.js'; import type { DisplayType } from './timestamp.react.js';
import { Timestamp, timestampHeight } from './timestamp.react.js'; import { Timestamp, timestampHeight } from './timestamp.react.js';
import { SingleLine } from '../components/single-line.react.js'; import { SingleLine } from '../components/single-line.react.js';
import { MessageListRouteName } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js'; import { useStyles } from '../themes/colors.js';
import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js';
import { useShouldRenderAvatars } from '../utils/avatar-utils.js'; import { useShouldRenderAvatars } from '../utils/avatar-utils.js';
type Props = { type Props = {
+item: ChatMessageInfoItemWithHeight, +item: ChatMessageInfoItemWithHeight,
+focused: boolean, +focused: boolean,
+display: DisplayType, +display: DisplayType,
}; };
function MessageHeader(props: Props): React.Node { function MessageHeader(props: Props): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const { item, focused, display } = props; const { item, focused, display } = props;
const { creator, time } = item.messageInfo; const { creator, time } = item.messageInfo;
const { isViewer } = creator; const { isViewer } = creator;
const route = useRoute();
const modalDisplay = display === 'modal'; const modalDisplay = display === 'modal';
const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster); const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster);
const stringForUser = useStringForUser(shouldShowUsername ? creator : null); const stringForUser = useStringForUser(shouldShowUsername ? creator : null);
const shouldRenderAvatars = useShouldRenderAvatars(); const shouldRenderAvatars = useShouldRenderAvatars();
let authorName = null; let authorName = null;
if (stringForUser) { if (stringForUser) {
const style = [styles.authorName]; const style = [styles.authorName];
if (modalDisplay) { if (modalDisplay) {
style.push(styles.modal); style.push(styles.modal);
} }
if (shouldRenderAvatars) { if (shouldRenderAvatars) {
style.push({ marginLeft: 12 + avatarOffset }); style.push({ marginLeft: 12 + avatarOffset });
} else { } else {
style.push({ marginLeft: 12 }); style.push({ marginLeft: 12 });
} }
authorName = <SingleLine style={style}>{stringForUser}</SingleLine>; authorName = <SingleLine style={style}>{stringForUser}</SingleLine>;
} }
// We only want to render the top-placed timestamp for a message if it's
// rendered in the message list, and not any separate screens (i.e.
// the MessageResultsScreen).
const presentedFromMessageList =
typeof route.params?.presentedFrom === 'string' &&
route.params.presentedFrom.startsWith(MessageListRouteName);
const messageInMessageList =
route.name === MessageListRouteName || presentedFromMessageList;
const timestamp = const timestamp =
modalDisplay || item.startsConversation ? ( messageInMessageList && (modalDisplay || item.startsConversation) ? (
<Timestamp time={time} display={display} /> <Timestamp time={time} display={display} />
) : null; ) : null;
let style = null; let style = null;
if (focused && !modalDisplay) { if (focused && !modalDisplay) {
let topMargin = 0; let topMargin = 0;
if (!item.startsCluster && !item.messageInfo.creator.isViewer) { if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
topMargin += authorNameHeight + clusterEndHeight; topMargin += authorNameHeight + clusterEndHeight;
Show All 34 Lines