Paths

Table of Contentst

Differential D7168

[lib] Introduce encrypted media types
ClosedPublic
Actions

Authored by bartek on Mar 24 2023, 4:10 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 8:30 PM

	Unknown Object (File)
	Thu, Dec 5, 2:00 AM

Subscribers

Details

Reviewers

atul
ashoat
marcin

Commits

rCOMM91164d15145b: [lib] Introduce encrypted media types
rCOMM0acec644d5c2: [lib] Introduce encrypted media types

Summary

Linear task: ENG-386

Added types encrypted_photo and encrypted_video. The only difference is that instead of uri they contain holder and encryptionKey pair.

Added invariant in several places across codebase to indicate places that will be modified in subsequent diffs and to supress Flow errors

Test Plan

Flow doesn't complain. Web and Native don't throw, it is still possible to send unencrypted media messages

Diff Detail

Repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

bartek created this revision.Mar 24 2023, 4:10 AM

bartek held this revision as a draft.

Herald added a subscriber: tomek. · View Herald TranscriptMar 24 2023, 4:10 AM

Simplified if-else branching

Harbormaster completed remote builds in B17578: Diff 24066.Mar 24 2023, 4:23 AM

Harbormaster completed remote builds in B17579: Diff 24067.Mar 24 2023, 4:35 AM

bartek added a child revision: D7169: [lib] Shim encrypted multimedia.Mar 24 2023, 4:44 AM

bartek published this revision for review.Mar 24 2023, 5:31 AM

I think we should include localMediaSelection, but not sure if a future diff adds that

lib/types/media-types.js
24 ↗	(On Diff #24067)	Can we add a comment explaining `holder`?
28 ↗	(On Diff #24067)	We are we excluding `localMediaSelection` here?
44 ↗	(On Diff #24067)	Can we add a comment explaining `holder`?
52 ↗	(On Diff #24067)	We are we excluding `localMediaSelection` here?

This revision is now accepted and ready to land.Mar 24 2023, 11:54 AM

bartek added inline comments.Mar 24 2023, 10:46 PM

lib/types/media-types.js
24 ↗	(On Diff #24067)	Sure! I'll add a short explanation
28 ↗	(On Diff #24067)	The `localMediaSelection` is needed for retrying failed uploads, which will not be the case for encrypted media messages, because the encrypted media will replace the non-encrypted one only after a successful upload.

Added a short description for the holder field

Harbormaster completed remote builds in B17616: Diff 24110.Mar 24 2023, 11:37 PM

ashoat added inline comments.Mar 25 2023, 2:56 AM

lib/types/media-types.js
28 ↗	(On Diff #24067)	Got it!

bartek added a child revision: D7226: [native] VideoPlaybackModal support for encrypted video.Mar 28 2023, 11:33 AM

bartek added a child revision: D7227: [native] Add encrypted source support in <Multimedia>.

bartek added a child revision: D7235: [lib] Support encrypted media types in updateMultimediaMessageMediaAction.Mar 29 2023, 6:59 AM

Rebase before landing

Harbormaster completed remote builds in B17828: Diff 24401.Mar 30 2023, 7:42 AM

Closed by commit rCOMM0acec644d5c2: [lib] Introduce encrypted media types (authored by bartek). · Explain WhyMar 30 2023, 9:58 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM0acec644d5c2: [lib] Introduce encrypted media types.

bartek added a reverting change: rCOMM493a462e18fe: Revert "[lib] Introduce encrypted media types".Mar 30 2023, 11:18 AM

bartek reopened this revision.Mar 30 2023, 11:20 AM

This revision is now accepted and ready to land.Mar 30 2023, 11:20 AM

Fixed https://linear.app/comm/issue/ENG-3567/invariant-in-multimedia-constructor-getting-triggered-whenever-i-open

Harbormaster completed remote builds in B17838: Diff 24433.Mar 30 2023, 11:47 AM

Closed by commit rCOMM91164d15145b: [lib] Introduce encrypted media types (authored by bartek). · Explain WhyMar 30 2023, 11:09 PM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM91164d15145b: [lib] Introduce encrypted media types.

ashoat mentioned this in D10854: [native] Add support for saving encrypted media.Jan 29 2024, 9:36 AM

Revision Contents
Changeset List

Path

Size

lib/

shared/

message-utils.js

2 lines

types/

32 lines

messages/

5 lines

utils/

message-ops-utils.js

5 lines

native/

input/

input-state-container.react.js

5 lines

media/

image-modal.react.js

5 lines

multimedia.react.js

11 lines

web/

chat/

multimedia-message.react.js

5 lines

modals/

threads/

gallery/

thread-settings-media-gallery.react.js

5 lines

Diff 24455

lib/shared/message-utils.js

Loading...

lib/types/media-types.js

Loading...

lib/types/messages/media.js

Loading...

lib/utils/message-ops-utils.js

Loading...

native/input/input-state-container.react.js

Loading...

native/media/image-modal.react.js

Loading...

native/media/multimedia.react.js

Loading...

web/chat/multimedia-message.react.js

Loading...

web/modals/threads/gallery/thread-settings-media-gallery.react.js

Loading...