Page MenuHomePhabricator
Files F3508840

D5760.diff
No OneTemporary
Actions

D5760.diff
View Options

diff --git a/lib/media/file-utils.js b/lib/media/file-utils.js
--- a/lib/media/file-utils.js
+++ b/lib/media/file-utils.js
@@ -94,15 +94,13 @@
'video/mp4': {
mediaType: 'video',
extension: 'mp4',
- // serverCanHandle set to false pending future video message progress
- serverCanHandle: false,
+ serverCanHandle: true,
serverTranscodesImage: false,
},
'video/quicktime': {
mediaType: 'video',
extension: 'mp4',
- // serverCanHandle set to false pending future video message progress
- serverCanHandle: false,
+ serverCanHandle: true,
serverTranscodesImage: false,
},
});
diff --git a/lib/shared/messages/multimedia-message-spec.js b/lib/shared/messages/multimedia-message-spec.js
--- a/lib/shared/messages/multimedia-message-spec.js
+++ b/lib/shared/messages/multimedia-message-spec.js
@@ -222,7 +222,7 @@
platformDetails,
);
// TODO figure out first native codeVersion supporting video playback
- if (hasMinCodeVersion(platformDetails, 99999)) {
+ if (hasMinCodeVersion(platformDetails, 158)) {
return shimmedRawMessageInfo;
}
const { id } = shimmedRawMessageInfo;
diff --git a/lib/shared/unshim-utils.js b/lib/shared/unshim-utils.js
--- a/lib/shared/unshim-utils.js
+++ b/lib/shared/unshim-utils.js
@@ -42,6 +42,7 @@
messageTypes.UPDATE_RELATIONSHIP,
messageTypes.CREATE_SIDEBAR,
messageTypes.SIDEBAR_SOURCE,
+ messageTypes.MULTIMEDIA,
]);
function unshimMessageInfos(
messageInfos: $ReadOnlyArray<RawMessageInfo>,
diff --git a/native/media/media-gallery-keyboard.react.js b/native/media/media-gallery-keyboard.react.js
--- a/native/media/media-gallery-keyboard.react.js
+++ b/native/media/media-gallery-keyboard.react.js
@@ -189,9 +189,7 @@
} = await MediaLibrary.getAssetsAsync({
first: 20,
after,
- // Include `MediaLibrary.MediaType.video` in `mediaType` array
- // when working on video messages so videos show up in media gallery.
- mediaType: [MediaLibrary.MediaType.photo],
+ mediaType: [MediaLibrary.MediaType.photo, MediaLibrary.MediaType.video],
});
let firstRemoved = false,
diff --git a/native/redux/persist.js b/native/redux/persist.js
--- a/native/redux/persist.js
+++ b/native/redux/persist.js
@@ -492,7 +492,7 @@
'storeLoaded',
],
debug: __DEV__,
- version: 31,
+ version: 32,
transforms: [messageStoreMessagesBlocklistTransform],
migrate: (createMigrate(migrations, { debug: __DEV__ }): any),
timeout: ((__DEV__ ? 0 : undefined): number | void),

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 21, 11:58 PM (21 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2689945
Default Alt Text
D5760.diff (2 KB)

Event Timeline