Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3515649
D7228.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D7228.diff
View Options
diff --git a/native/chat/inline-multimedia.react.js b/native/chat/inline-multimedia.react.js
--- a/native/chat/inline-multimedia.react.js
+++ b/native/chat/inline-multimedia.react.js
@@ -82,7 +82,7 @@
}
let playButton;
- if (mediaInfo.type === 'video') {
+ if (mediaInfo.type === 'video' || mediaInfo.type === 'encrypted_video') {
playButton = (
<View style={styles.centerContainer}>
<IonIcon name="ios-play-circle" style={styles.playButton} size={80} />
diff --git a/native/chat/multimedia-message.react.js b/native/chat/multimedia-message.react.js
--- a/native/chat/multimedia-message.react.js
+++ b/native/chat/multimedia-message.react.js
@@ -70,7 +70,7 @@
const { navigation, item, route, verticalBounds } = this.props;
navigation.navigate<'VideoPlaybackModal' | 'ImageModal'>({
name:
- mediaInfo.type === 'video'
+ mediaInfo.type === 'video' || mediaInfo.type === 'encrypted_video'
? VideoPlaybackModalRouteName
: ImageModalRouteName,
key: getMediaKey(item, mediaInfo),
diff --git a/native/chat/settings/thread-settings-media-gallery.react.js b/native/chat/settings/thread-settings-media-gallery.react.js
--- a/native/chat/settings/thread-settings-media-gallery.react.js
+++ b/native/chat/settings/thread-settings-media-gallery.react.js
@@ -88,9 +88,15 @@
if (activeTab === 'ALL') {
return mediaInfos;
} else if (activeTab === 'IMAGES') {
- return mediaInfos.filter(mediaInfo => mediaInfo.type === 'photo');
+ return mediaInfos.filter(
+ mediaInfo =>
+ mediaInfo.type === 'photo' || mediaInfo.type === 'encrypted_photo',
+ );
} else if (activeTab === 'VIDEOS') {
- return mediaInfos.filter(mediaInfo => mediaInfo.type === 'video');
+ return mediaInfos.filter(
+ mediaInfo =>
+ mediaInfo.type === 'video' || mediaInfo.type === 'encrypted_video',
+ );
}
return mediaInfos;
}, [activeTab, mediaInfos]);
@@ -171,7 +177,7 @@
navigation.navigate<'VideoPlaybackModal' | 'ImageModal'>({
name:
- mediaInfo.type === 'video'
+ mediaInfo.type === 'video' || mediaInfo.type === 'encrypted_video'
? VideoPlaybackModalRouteName
: ImageModalRouteName,
key: `multimedia|${threadID}|${mediaInfo.id}`,
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Dec 23, 9:27 AM (19 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2694351
Default Alt Text
D7228.diff (2 KB)
Attached To
Mode
D7228: [native] Fixes for handling encrypted media messages
Attached
Detach File
Event Timeline
Log In to Comment