Page MenuHomePhabricator
Differential D14468

[native] Add MediaModule expo module
AcceptedPublic
Actions

Authored by angelika on Thu, Mar 20, 4:30 AM.
Tags
None
Referenced Files
F5054150: D14468.id.diff
Tue, Mar 25, 4:49 AM
F5026268: D14468.id47479.diff
Mon, Mar 24, 11:35 AM
Unknown Object (File)
Sun, Mar 23, 4:06 PM
Subscribers
ashoat
tomek

Details

Reviewers
bartek
Summary

https://linear.app/comm/issue/ENG-10314/migrate-comm-app-to-use-new-media-module

Just some boilerplate, I based the module structure on existing expo modules in the app.

Test Plan

Build the app

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
native/
expo-modules/
comm-expo-package/
android/
src/
main/
java/
app/
comm/
android/
media/
18 lines
10 lines
ios/
13 lines
utils/
6 lines

Diff 47479

View Options

native/expo-modules/comm-expo-package/android/src/main/java/app/comm/android/media/MediaModule.kt

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines [
identityClient, identityClient,
primaryDeviceRequestedLogOut, primaryDeviceRequestedLogOut,
], ],
); );
} }
function usePeerToPeerMessageHandler(): ( function usePeerToPeerMessageHandler(): (
message: PeerToPeerMessage, message: PeerToPeerMessage,
messageID: string,
) => Promise<void> { ) => Promise<void> {
const { olmAPI, sqliteAPI } = getConfig(); const { olmAPI, sqliteAPI } = getConfig();
const identityContext = React.useContext(IdentityClientContext); const identityContext = React.useContext(IdentityClientContext);
invariant(identityContext, 'Identity context should be set'); invariant(identityContext, 'Identity context should be set');
const { identityClient, getAuthMetadata } = identityContext; const { identityClient, getAuthMetadata } = identityContext;
const foreignPeerDevices = useSelector(getForeignPeerDevices); const foreignPeerDevices = useSelector(getForeignPeerDevices);
const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates(); const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates();
const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers(); const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers();
const handleOlmMessageToDevice = useHandleOlmMessageToDevice(); const handleOlmMessageToDevice = useHandleOlmMessageToDevice();
return React.useCallback( return React.useCallback(
async (message: PeerToPeerMessage, messageID: string) => { async (message: PeerToPeerMessage) => {
if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) { if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {
const { senderInfo, encryptedData, sessionVersion } = message; const { senderInfo, encryptedData, sessionVersion } = message;
const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo; const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;
let deviceKeys: ?DeviceOlmInboundKeys = null; let deviceKeys: ?DeviceOlmInboundKeys = null;
try { try {
const { keys } = const { keys } =
await identityClient.getInboundKeysForUser(senderUserID); await identityClient.getInboundKeysForUser(senderUserID);
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines async (message: PeerToPeerMessage) => {
`${senderDeviceID}: ${e.message}, ` + `${senderDeviceID}: ${e.message}, ` +
`session version: ${sessionVersion}`, `session version: ${sessionVersion}`,
); );
} }
} }
} else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) { } else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {
try { try {
await olmAPI.initializeCryptoAccount(); await olmAPI.initializeCryptoAccount();
const decrypted = await olmAPI.decryptSequentialAndPersist( const decrypted = await olmAPI.decrypt(
message.encryptedData, message.encryptedData,
message.senderInfo.deviceID, message.senderInfo.deviceID,
messageID,
); );
console.log( console.log(
'Decrypted message from device ' + 'Decrypted message from device ' +
`${message.senderInfo.deviceID}: ${decrypted}`, `${message.senderInfo.deviceID}: ${decrypted}`,
); );
try { try {
await handleOlmMessageToDevice(decrypted, message.senderInfo); await handleOlmMessageToDevice(decrypted, message.senderInfo);
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines
View Options

native/expo-modules/comm-expo-package/expo-module.config.json

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines [
identityClient, identityClient,
primaryDeviceRequestedLogOut, primaryDeviceRequestedLogOut,
], ],
); );
} }
function usePeerToPeerMessageHandler(): ( function usePeerToPeerMessageHandler(): (
message: PeerToPeerMessage, message: PeerToPeerMessage,
messageID: string,
) => Promise<void> { ) => Promise<void> {
const { olmAPI, sqliteAPI } = getConfig(); const { olmAPI, sqliteAPI } = getConfig();
const identityContext = React.useContext(IdentityClientContext); const identityContext = React.useContext(IdentityClientContext);
invariant(identityContext, 'Identity context should be set'); invariant(identityContext, 'Identity context should be set');
const { identityClient, getAuthMetadata } = identityContext; const { identityClient, getAuthMetadata } = identityContext;
const foreignPeerDevices = useSelector(getForeignPeerDevices); const foreignPeerDevices = useSelector(getForeignPeerDevices);
const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates(); const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates();
const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers(); const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers();
const handleOlmMessageToDevice = useHandleOlmMessageToDevice(); const handleOlmMessageToDevice = useHandleOlmMessageToDevice();
return React.useCallback( return React.useCallback(
async (message: PeerToPeerMessage, messageID: string) => { async (message: PeerToPeerMessage) => {
if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) { if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {
const { senderInfo, encryptedData, sessionVersion } = message; const { senderInfo, encryptedData, sessionVersion } = message;
const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo; const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;
let deviceKeys: ?DeviceOlmInboundKeys = null; let deviceKeys: ?DeviceOlmInboundKeys = null;
try { try {
const { keys } = const { keys } =
await identityClient.getInboundKeysForUser(senderUserID); await identityClient.getInboundKeysForUser(senderUserID);
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines async (message: PeerToPeerMessage) => {
`${senderDeviceID}: ${e.message}, ` + `${senderDeviceID}: ${e.message}, ` +
`session version: ${sessionVersion}`, `session version: ${sessionVersion}`,
); );
} }
} }
} else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) { } else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {
try { try {
await olmAPI.initializeCryptoAccount(); await olmAPI.initializeCryptoAccount();
const decrypted = await olmAPI.decryptSequentialAndPersist( const decrypted = await olmAPI.decrypt(
message.encryptedData, message.encryptedData,
message.senderInfo.deviceID, message.senderInfo.deviceID,
messageID,
); );
console.log( console.log(
'Decrypted message from device ' + 'Decrypted message from device ' +
`${message.senderInfo.deviceID}: ${decrypted}`, `${message.senderInfo.deviceID}: ${decrypted}`,
); );
try { try {
await handleOlmMessageToDevice(decrypted, message.senderInfo); await handleOlmMessageToDevice(decrypted, message.senderInfo);
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines
View Options

native/expo-modules/comm-expo-package/ios/MediaModule.swift

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines [
identityClient, identityClient,
primaryDeviceRequestedLogOut, primaryDeviceRequestedLogOut,
], ],
); );
} }
function usePeerToPeerMessageHandler(): ( function usePeerToPeerMessageHandler(): (
message: PeerToPeerMessage, message: PeerToPeerMessage,
messageID: string,
) => Promise<void> { ) => Promise<void> {
const { olmAPI, sqliteAPI } = getConfig(); const { olmAPI, sqliteAPI } = getConfig();
const identityContext = React.useContext(IdentityClientContext); const identityContext = React.useContext(IdentityClientContext);
invariant(identityContext, 'Identity context should be set'); invariant(identityContext, 'Identity context should be set');
const { identityClient, getAuthMetadata } = identityContext; const { identityClient, getAuthMetadata } = identityContext;
const foreignPeerDevices = useSelector(getForeignPeerDevices); const foreignPeerDevices = useSelector(getForeignPeerDevices);
const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates(); const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates();
const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers(); const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers();
const handleOlmMessageToDevice = useHandleOlmMessageToDevice(); const handleOlmMessageToDevice = useHandleOlmMessageToDevice();
return React.useCallback( return React.useCallback(
async (message: PeerToPeerMessage, messageID: string) => { async (message: PeerToPeerMessage) => {
if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) { if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {
const { senderInfo, encryptedData, sessionVersion } = message; const { senderInfo, encryptedData, sessionVersion } = message;
const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo; const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;
let deviceKeys: ?DeviceOlmInboundKeys = null; let deviceKeys: ?DeviceOlmInboundKeys = null;
try { try {
const { keys } = const { keys } =
await identityClient.getInboundKeysForUser(senderUserID); await identityClient.getInboundKeysForUser(senderUserID);
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines async (message: PeerToPeerMessage) => {
`${senderDeviceID}: ${e.message}, ` + `${senderDeviceID}: ${e.message}, ` +
`session version: ${sessionVersion}`, `session version: ${sessionVersion}`,
); );
} }
} }
} else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) { } else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {
try { try {
await olmAPI.initializeCryptoAccount(); await olmAPI.initializeCryptoAccount();
const decrypted = await olmAPI.decryptSequentialAndPersist( const decrypted = await olmAPI.decrypt(
message.encryptedData, message.encryptedData,
message.senderInfo.deviceID, message.senderInfo.deviceID,
messageID,
); );
console.log( console.log(
'Decrypted message from device ' + 'Decrypted message from device ' +
`${message.senderInfo.deviceID}: ${decrypted}`, `${message.senderInfo.deviceID}: ${decrypted}`,
); );
try { try {
await handleOlmMessageToDevice(decrypted, message.senderInfo); await handleOlmMessageToDevice(decrypted, message.senderInfo);
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines
View Options

native/utils/media-module.js

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines [
identityClient, identityClient,
primaryDeviceRequestedLogOut, primaryDeviceRequestedLogOut,
], ],
); );
} }
function usePeerToPeerMessageHandler(): ( function usePeerToPeerMessageHandler(): (
message: PeerToPeerMessage, message: PeerToPeerMessage,
messageID: string,
) => Promise<void> { ) => Promise<void> {
const { olmAPI, sqliteAPI } = getConfig(); const { olmAPI, sqliteAPI } = getConfig();
const identityContext = React.useContext(IdentityClientContext); const identityContext = React.useContext(IdentityClientContext);
invariant(identityContext, 'Identity context should be set'); invariant(identityContext, 'Identity context should be set');
const { identityClient, getAuthMetadata } = identityContext; const { identityClient, getAuthMetadata } = identityContext;
const foreignPeerDevices = useSelector(getForeignPeerDevices); const foreignPeerDevices = useSelector(getForeignPeerDevices);
const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates(); const broadcastDeviceListUpdates = useBroadcastDeviceListUpdates();
const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers(); const getAndUpdateDeviceListsForUsers = useGetAndUpdateDeviceListsForUsers();
const handleOlmMessageToDevice = useHandleOlmMessageToDevice(); const handleOlmMessageToDevice = useHandleOlmMessageToDevice();
return React.useCallback( return React.useCallback(
async (message: PeerToPeerMessage, messageID: string) => { async (message: PeerToPeerMessage) => {
if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) { if (message.type === peerToPeerMessageTypes.OUTBOUND_SESSION_CREATION) {
const { senderInfo, encryptedData, sessionVersion } = message; const { senderInfo, encryptedData, sessionVersion } = message;
const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo; const { userID: senderUserID, deviceID: senderDeviceID } = senderInfo;
let deviceKeys: ?DeviceOlmInboundKeys = null; let deviceKeys: ?DeviceOlmInboundKeys = null;
try { try {
const { keys } = const { keys } =
await identityClient.getInboundKeysForUser(senderUserID); await identityClient.getInboundKeysForUser(senderUserID);
▲ Show 20 Lines • Show All 59 Lines • ▼ Show 20 Lines async (message: PeerToPeerMessage) => {
`${senderDeviceID}: ${e.message}, ` + `${senderDeviceID}: ${e.message}, ` +
`session version: ${sessionVersion}`, `session version: ${sessionVersion}`,
); );
} }
} }
} else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) { } else if (message.type === peerToPeerMessageTypes.ENCRYPTED_MESSAGE) {
try { try {
await olmAPI.initializeCryptoAccount(); await olmAPI.initializeCryptoAccount();
const decrypted = await olmAPI.decryptSequentialAndPersist( const decrypted = await olmAPI.decrypt(
message.encryptedData, message.encryptedData,
message.senderInfo.deviceID, message.senderInfo.deviceID,
messageID,
); );
console.log( console.log(
'Decrypted message from device ' + 'Decrypted message from device ' +
`${message.senderInfo.deviceID}: ${decrypted}`, `${message.senderInfo.deviceID}: ${decrypted}`,
); );
try { try {
await handleOlmMessageToDevice(decrypted, message.senderInfo); await handleOlmMessageToDevice(decrypted, message.senderInfo);
▲ Show 20 Lines • Show All 119 Lines • Show Last 20 Lines