Page MenuHomePhabricator
Differential D13046

[lib] reset session and resend message when device is unable to decrypt messages
ClosedPublic
Actions

Authored by kamil on Aug 12 2024, 2:49 AM.
Tags
None
Referenced Files
F5117995: D13046.diff
Wed, Apr 2, 9:13 PM
Unknown Object (File)
Tue, Apr 1, 8:59 AM
Unknown Object (File)
Wed, Mar 12, 6:31 AM
Unknown Object (File)
Tue, Mar 11, 9:36 AM
Unknown Object (File)
Wed, Mar 5, 8:21 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:12 PM
View All 74 Files
Subscribers
ashoat

Details

Reviewers
tomek
marcin
Commits
rCOMM575677018ac0: [lib] reset session and resend message when device is unable to decrypt messages
Summary

ENG-6982.

We want to reset session when there was an error while decrypting.

Depends on D13033

Test Plan
  1. Create a session between devices A and B
  2. On B comment out sending confirmation.
  3. Send some messages from A to B
  4. On B simulate Olm error.
  5. Test that all messages are sent again and decrypted successfully.

Diff Detail

Repository
rCOMM Comm
Branch
resending-2
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

kamil created this revision.Aug 12 2024, 2:49 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptAug 12 2024, 2:49 AM
kamil published this revision for review.Aug 12 2024, 3:04 AM
kamil added inline comments.
lib/utils/olm-utils.js
126–129

We no longer track order and not using sequential decrypt

Harbormaster failed remote builds in B31040: Diff 43304!Aug 12 2024, 3:07 AM
kamil added a child revision: D13047: [SQLite] recreate table for Inbound P2P messages.Aug 12 2024, 6:43 AM
tomek accepted this revision.Aug 19 2024, 5:46 AM
tomek added inline comments.
lib/utils/olm-utils.js
123
This revision is now accepted and ready to land.Aug 19 2024, 5:46 AM
kamil updated this revision to Diff 43498.Aug 20 2024, 3:53 AM

address review

Harbormaster completed remote builds in B31168: Diff 43498.Aug 20 2024, 4:10 AM
Closed by commit rCOMM575677018ac0: [lib] reset session and resend message when device is unable to decrypt messages (authored by kamil). · Explain WhyAug 21 2024, 2:57 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMM575677018ac0: [lib] reset session and resend message when device is unable to decrypt messages.

Revision Contents
Changeset List

PathSize
lib/
tunnelbroker/
36 lines
utils/
4 lines
5 lines

Diff 43304

View Options

lib/tunnelbroker/use-peer-to-peer-message-handler.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines
View Options

lib/utils/crypto-utils.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines
View Options

lib/utils/olm-utils.js

Show All 20 Lines
import { useNewThread } from 'lib/actions/thread-actions.js'; import { useNewThread } from 'lib/actions/thread-actions.js';
import { import {
uploadMultimedia, uploadMultimedia,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
useBlobServiceUpload, useBlobServiceUpload,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js'; import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js'; import { pathFromURI, replaceExtension } from 'lib/media/file-utils.js';
import { import {
isLocalUploadID, isLocalUploadID,
getNextLocalUploadID, getNextLocalUploadID,
} from 'lib/media/media-utils.js'; } from 'lib/media/media-utils.js';
import { videoDurationLimit } from 'lib/media/video-utils.js'; import { videoDurationLimit } from 'lib/media/video-utils.js';
▲ Show 20 Lines • Show All 797 Lines • ▼ Show 20 Lines ): Promise<?string> {
const { hasWiFi } = this.props; const { hasWiFi } = this.props;
const uploadStart = Date.now(); const uploadStart = Date.now();
let uploadExceptionMessage, let uploadExceptionMessage,
uploadResult, uploadResult,
uploadThumbnailResult, uploadThumbnailResult,
mediaMissionResult; mediaMissionResult;
try { try {
const uploadPromises = [];
if ( if (
this.useBlobServiceUploads && this.useBlobServiceUploads &&
(processedMedia.mediaType === 'encrypted_photo' || (processedMedia.mediaType === 'encrypted_photo' ||
processedMedia.mediaType === 'encrypted_video') processedMedia.mediaType === 'encrypted_video')
) { ) {
uploadPromises.push( const uploadPromise = this.props.blobServiceUpload({
this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: uploadURI, uri: uploadURI,
filename: filename, filename: filename,
mimeType: mime, mimeType: mime,
}, },
blobHash: processedMedia.blobHash, blobHash: processedMedia.blobHash,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: thumbHash:
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
onProgress: (percent: number) => { onProgress: (percent: number) => {
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
); );
}, },
}, },
}), });
);
if (processedMedia.mediaType === 'encrypted_video') { const uploadThumbnailPromise: Promise<?BlobServiceUploadResult> =
uploadPromises.push( (async () => {
this.props.blobServiceUpload({ if (processedMedia.mediaType !== 'encrypted_video') {
return undefined;
}
return await this.props.blobServiceUpload({
uploadInput: { uploadInput: {
blobInput: { blobInput: {
type: 'uri', type: 'uri',
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
filename: replaceExtension(`thumb${filename}`, 'jpg'), filename: replaceExtension(`thumb${filename}`, 'jpg'),
mimeType: 'image/jpeg', mimeType: 'image/jpeg',
}, },
blobHash: processedMedia.thumbnailBlobHash, blobHash: processedMedia.thumbnailBlobHash,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
loop: false, loop: false,
dimensions: processedMedia.dimensions, dimensions: processedMedia.dimensions,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
keyserverOrThreadID: threadInfo.id, keyserverOrThreadID: threadInfo.id,
callbacks: { callbacks: {
blobServiceUploadHandler, blobServiceUploadHandler,
}, },
}), });
); })();
}
[uploadResult, uploadThumbnailResult] = await Promise.all( [uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromises, uploadPromise,
); uploadThumbnailPromise,
]);
} else { } else {
uploadPromises.push( const uploadPromise = this.props.uploadMultimedia(
this.props.uploadMultimedia(
{ uri: uploadURI, name: filename, type: mime }, { uri: uploadURI, name: filename, type: mime },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: loop:
processedMedia.mediaType === 'video' || processedMedia.mediaType === 'video' ||
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType === 'encrypted_video'
? processedMedia.loop ? processedMedia.loop
: undefined, : undefined,
encryptionKey: processedMedia.encryptionKey, encryptionKey: processedMedia.encryptionKey,
thumbHash: thumbHash:
processedMedia.mediaType === 'photo' || processedMedia.mediaType === 'photo' ||
processedMedia.mediaType === 'encrypted_photo' processedMedia.mediaType === 'encrypted_photo'
? processedMedia.thumbHash ? processedMedia.thumbHash
: null, : null,
}, },
{ {
onProgress: (percent: number) => onProgress: (percent: number) =>
this.setProgress( this.setProgress(
localMessageID, localMessageID,
localMediaID, localMediaID,
'uploading', 'uploading',
percent, percent,
), ),
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
); );
const uploadThumbnailPromise: Promise<?UploadMultimediaResult> =
(async () => {
if ( if (
processedMedia.mediaType === 'video' || processedMedia.mediaType !== 'video' &&
processedMedia.mediaType === 'encrypted_video' processedMedia.mediaType !== 'encrypted_video'
) { ) {
uploadPromises.push( return undefined;
this.props.uploadMultimedia( }
return await this.props.uploadMultimedia(
{ {
uri: processedMedia.uploadThumbnailURI, uri: processedMedia.uploadThumbnailURI,
name: replaceExtension(`thumb${filename}`, 'jpg'), name: replaceExtension(`thumb${filename}`, 'jpg'),
type: 'image/jpeg', type: 'image/jpeg',
}, },
{ {
...processedMedia.dimensions, ...processedMedia.dimensions,
loop: false, loop: false,
encryptionKey: processedMedia.thumbnailEncryptionKey, encryptionKey: processedMedia.thumbnailEncryptionKey,
thumbHash: processedMedia.thumbHash, thumbHash: processedMedia.thumbHash,
}, },
{ {
uploadBlob: this.uploadBlob, uploadBlob: this.uploadBlob,
}, },
),
);
}
[uploadResult, uploadThumbnailResult] = await Promise.all(
uploadPromises,
); );
})();
[uploadResult, uploadThumbnailResult] = await Promise.all([
uploadPromise,
uploadThumbnailPromise,
]);
} }
mediaMissionResult = { success: true }; mediaMissionResult = { success: true };
} catch (e) { } catch (e) {
uploadExceptionMessage = getMessageForException(e); uploadExceptionMessage = getMessageForException(e);
onUploadFailed(localMediaID, 'upload failed'); onUploadFailed(localMediaID, 'upload failed');
mediaMissionResult = { mediaMissionResult = {
success: false, success: false,
reason: 'http_upload_failed', reason: 'http_upload_failed',
▲ Show 20 Lines • Show All 787 Lines • Show Last 20 Lines