Page MenuHomePhabricator
Differential D13039

[native] Fix VideoPlaybackModal for encrypted keyserver-hosted media
ClosedPublic
Actions

Authored by ashoat on Aug 9 2024, 9:31 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 11, 3:56 PM
Unknown Object (File)
Tue, Mar 11, 12:01 PM
Unknown Object (File)
Thu, Mar 6, 4:43 AM
Unknown Object (File)
Feb 22 2025, 11:12 PM
Unknown Object (File)
Feb 22 2025, 11:12 PM
Unknown Object (File)
Feb 22 2025, 11:11 PM
Unknown Object (File)
Feb 22 2025, 11:09 PM
Unknown Object (File)
Jan 30 2025, 7:09 PM
View All 70 Files
Subscribers
tomek

Details

Reviewers
bartek
Commits
rCOMMdc35964348c9: [native] Fix VideoPlaybackModal for encrypted keyserver-hosted media
Summary

Encrypted keyserver-hosted encrypted media works on web, but on native it looks like only blob-hosted encrypted media works.

I think this work was missed. I found we're using encryptedMediaBlobURI on web (and elsewhere on native), so I integrated it here and it looks like it did the trick.

Test Plan

Prior to this, when opening keyserver-hosted encrypted media, the app would basically freeze... it would be stuck loading the content, but it wouldn't show anything.

After this diff, I confirmed that keyserver-hosted media loads correctly, and can be viewed.

Diff Detail

Repository
rCOMM Comm
Branch
ashoat/media
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
native/
media/
16 lines

Diff 43291

View Options

native/media/video-playback-modal.react.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