0ct0pu5/ente
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Safe guard against OOMs while uploading a video file

Browse source
This commit is contained in:
Vishnu Mohandas 2020-09-17 17:57:02 +05:30
parent 305b7b470d
commit ff0811dfe1
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/file_uploader.dart
View file

@ -5,6 +5,7 @@ import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/core/constants.dart';
import 'package:photos/models/file.dart';
import 'package:photos/models/file_type.dart';
import 'package:photos/models/upload_url.dart';
import 'package:photos/utils/crypto_util.dart';
import 'package:photos/utils/file_name_util.dart';
@ -41,6 +42,7 @@ class FileUploader {
}
Future<File> encryptAndUploadFile(File file) async {
_logger.info("Uploading " + file.toString());
final password = CryptoUtil.getSecureRandomString(length: 32);
final iv = CryptoUtil.getSecureRandomBytes(length: 16);
final base64EncodedIV = base64.encode(iv);
@ -51,8 +53,15 @@ class FileUploader {
final encryptedFileName = file.generatedID.toString() + ".aes";
final tempDirectory = Configuration.instance.getTempDirectory();
final encryptedFilePath = tempDirectory + encryptedFileName;
await CryptoUtil.encryptDataToFile(
await getBytesFromDisk(file), encryptedFilePath, password);
if (file.fileType == FileType.image) {
await CryptoUtil.encryptDataToFile(
await getBytesFromDisk(file), encryptedFilePath, password);
} else {
await CryptoUtil.encryptFileToFile(
(await (await file.getAsset()).originFile).path,
encryptedFilePath,
password);
}
final fileUploadURL = await getUploadURL();
String fileObjectKey =

1
lib/photo_sync_manager.dart
View file

@ -198,7 +198,6 @@ class PhotoSyncManager {
final foldersToBackUp = Configuration.instance.getFoldersToBackUp();
for (int i = 0; i < photosToBeUploaded.length; i++) {
File file = photosToBeUploaded[i];
_logger.info("Uploading " + file.toString());
try {
if (!foldersToBackUp.contains(file.deviceFolder)) {
continue;