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

Upgrade dependencies

Browse source
This commit is contained in:
Vishnu Mohandas 2021-05-30 03:28:42 +05:30
parent 065d400ef2
commit 47997e2100
4 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/utils/file_util.dart
View file

@ -1,6 +1,5 @@
import 'dart:async'; import 'dart:async';
import 'dart:io' as io; import 'dart:io' as io;
import 'dart:io';
import 'dart:typed_data'; import 'dart:typed_data';
import 'package:flutter_sodium/flutter_sodium.dart'; import 'package:flutter_sodium/flutter_sodium.dart';
@ -15,7 +14,7 @@ import 'package:photos/core/cache/video_cache_manager.dart';
import 'package:photos/core/configuration.dart'; import 'package:photos/core/configuration.dart';
import 'package:photos/core/constants.dart'; import 'package:photos/core/constants.dart';
import 'package:photos/core/network.dart'; import 'package:photos/core/network.dart';
import 'package:photos/models/file.dart'; import 'package:photos/models/file.dart' as ente;
import 'package:photos/models/file_type.dart'; import 'package:photos/models/file_type.dart';
import 'package:photos/services/collections_service.dart'; import 'package:photos/services/collections_service.dart';
import 'package:photos/utils/thumbnail_util.dart'; import 'package:photos/utils/thumbnail_util.dart';
@ -24,7 +23,7 @@ import 'crypto_util.dart';
final _logger = Logger("FileUtil"); final _logger = Logger("FileUtil");
void preloadFile(File file) { void preloadFile(ente.File file) {
if (file.fileType == FileType.video) { if (file.fileType == FileType.video) {
return; return;
} }
@ -41,7 +40,7 @@ void preloadFile(File file) {
} }
} }
void preloadThumbnail(File file) { void preloadThumbnail(ente.File file) {
if (file.localID == null) { if (file.localID == null) {
getThumbnailFromServer(file); getThumbnailFromServer(file);
} else { } else {
@ -64,7 +63,7 @@ void preloadThumbnail(File file) {
} }
} }
Future<io.File> getNativeFile(File file) async { Future<io.File> getNativeFile(ente.File file) async {
if (file.localID == null) { if (file.localID == null) {
return getFileFromServer(file); return getFileFromServer(file);
} else { } else {
@ -72,7 +71,7 @@ Future<io.File> getNativeFile(File file) async {
} }
} }
Future<Uint8List> getBytes(File file, {int quality = 100}) async { Future<Uint8List> getBytes(ente.File file, {int quality = 100}) async {
if (file.localID == null) { if (file.localID == null) {
return getFileFromServer(file).then((file) => file.readAsBytesSync()); return getFileFromServer(file).then((file) => file.readAsBytesSync());
} else { } else {
@ -80,7 +79,7 @@ Future<Uint8List> getBytes(File file, {int quality = 100}) async {
} }
} }
Future<Uint8List> getBytesFromDisk(File file, {int quality = 100}) async { Future<Uint8List> getBytesFromDisk(ente.File file, {int quality = 100}) async {
final originalBytes = (await file.getAsset()).originBytes; final originalBytes = (await file.getAsset()).originBytes;
if (extension(file.title) == ".HEIC" || quality != 100) { if (extension(file.title) == ".HEIC" || quality != 100) {
return originalBytes.then((bytes) { return originalBytes.then((bytes) {
@ -97,7 +96,7 @@ Future<Uint8List> getBytesFromDisk(File file, {int quality = 100}) async {
final Map<int, Future<io.File>> fileDownloadsInProgress = final Map<int, Future<io.File>> fileDownloadsInProgress =
Map<int, Future<io.File>>(); Map<int, Future<io.File>>();
Future<io.File> getFileFromServer(File file, Future<io.File> getFileFromServer(ente.File file,
{ProgressCallback progressCallback}) async { {ProgressCallback progressCallback}) async {
final cacheManager = file.fileType == FileType.video final cacheManager = file.fileType == FileType.video
? VideoCacheManager.instance ? VideoCacheManager.instance
@ -118,7 +117,8 @@ Future<io.File> getFileFromServer(File file,
}); });
} }
Future<io.File> _downloadAndDecrypt(File file, BaseCacheManager cacheManager, Future<io.File> _downloadAndDecrypt(
ente.File file, BaseCacheManager cacheManager,
{ProgressCallback progressCallback}) async { {ProgressCallback progressCallback}) async {
_logger.info("Downloading file " + file.uploadedFileID.toString()); _logger.info("Downloading file " + file.uploadedFileID.toString());
final encryptedFilePath = Configuration.instance.getTempDirectory() + final encryptedFilePath = Configuration.instance.getTempDirectory() +
@ -161,7 +161,7 @@ Future<io.File> _downloadAndDecrypt(File file, BaseCacheManager cacheManager,
encryptedFile.deleteSync(); encryptedFile.deleteSync();
var fileExtension = extension(file.title).substring(1).toLowerCase(); var fileExtension = extension(file.title).substring(1).toLowerCase();
var outputFile = decryptedFile; var outputFile = decryptedFile;
if (Platform.isAndroid && fileExtension == "heic") { if (io.Platform.isAndroid && fileExtension == "heic") {
outputFile = await FlutterImageCompress.compressAndGetFile( outputFile = await FlutterImageCompress.compressAndGetFile(
decryptedFilePath, decryptedFilePath,
decryptedFilePath + ".jpg", decryptedFilePath + ".jpg",
@ -184,7 +184,7 @@ Future<io.File> _downloadAndDecrypt(File file, BaseCacheManager cacheManager,
}); });
} }
Uint8List decryptFileKey(File file) { Uint8List decryptFileKey(ente.File file) {
final encryptedKey = Sodium.base642bin(file.encryptedKey); final encryptedKey = Sodium.base642bin(file.encryptedKey);
final nonce = Sodium.base642bin(file.keyDecryptionNonce); final nonce = Sodium.base642bin(file.keyDecryptionNonce);
final collectionKey = final collectionKey =
@ -201,7 +201,7 @@ Future<Uint8List> compressThumbnail(Uint8List thumbnail) {
); );
} }
void clearCache(File file) { void clearCache(ente.File file) {
if (file.fileType == FileType.video) { if (file.fileType == FileType.video) {
VideoCacheManager.instance.removeFile(file.getDownloadUrl()); VideoCacheManager.instance.removeFile(file.getDownloadUrl());
} else { } else {

62
pubspec.lock
View file

@ -28,7 +28,7 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.5.0" version: "2.6.1"
background_fetch: background_fetch:
dependency: "direct main" dependency: "direct main"
description: description:
@ -98,7 +98,7 @@ packages:
name: connectivity name: connectivity
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.3" version: "3.0.6"
connectivity_for_web: connectivity_for_web:
dependency: transitive dependency: transitive
description: description:
@ -140,7 +140,7 @@ packages:
name: crisp name: crisp
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.1.6"
crypto: crypto:
dependency: transitive dependency: transitive
description: description:
@ -154,7 +154,7 @@ packages:
name: cupertino_icons name: cupertino_icons
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.2" version: "1.0.3"
device_info: device_info:
dependency: transitive dependency: transitive
description: description:
@ -203,14 +203,14 @@ packages:
name: ffi name: ffi
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.0" version: "1.1.1"
file: file:
dependency: transitive dependency: transitive
description: description:
name: file name: file
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.1.0" version: "6.1.1"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -229,7 +229,7 @@ packages:
name: flutter_cache_manager name: flutter_cache_manager
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.1" version: "3.1.0"
flutter_email_sender: flutter_email_sender:
dependency: "direct main" dependency: "direct main"
description: description:
@ -299,7 +299,7 @@ packages:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.1" version: "2.0.2"
flutter_secure_storage: flutter_secure_storage:
dependency: "direct main" dependency: "direct main"
description: description:
@ -310,9 +310,9 @@ packages:
flutter_sodium: flutter_sodium:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_sodium path: "thirdparty/flutter_sodium"
url: "https://pub.dartlang.org" relative: true
source: hosted source: path
version: "0.2.0" version: "0.2.0"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
@ -358,7 +358,7 @@ packages:
name: fluttertoast name: fluttertoast
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "8.0.6" version: "8.0.7"
google_nav_bar: google_nav_bar:
dependency: "direct main" dependency: "direct main"
description: description:
@ -372,7 +372,7 @@ packages:
name: http name: http
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.13.2" version: "0.13.3"
http_parser: http_parser:
dependency: transitive dependency: transitive
description: description:
@ -435,7 +435,7 @@ packages:
name: local_auth name: local_auth
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.5" version: "1.1.6"
logging: logging:
dependency: "direct main" dependency: "direct main"
description: description:
@ -498,7 +498,7 @@ packages:
name: package_info_plus_linux name: package_info_plus_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1" version: "1.0.2"
package_info_plus_macos: package_info_plus_macos:
dependency: transitive dependency: transitive
description: description:
@ -547,7 +547,7 @@ packages:
name: path_provider name: path_provider
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.1" version: "2.0.2"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
@ -596,7 +596,7 @@ packages:
name: photo_manager name: photo_manager
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.6" version: "1.2.1"
photo_view: photo_view:
dependency: "direct main" dependency: "direct main"
description: description:
@ -624,7 +624,7 @@ packages:
name: process name: process
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.1.0" version: "4.2.1"
provider: provider:
dependency: "direct main" dependency: "direct main"
description: description:
@ -645,7 +645,7 @@ packages:
name: rxdart name: rxdart
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.26.0" version: "0.27.0"
scrollable_positioned_list: scrollable_positioned_list:
dependency: "direct main" dependency: "direct main"
description: description:
@ -666,14 +666,14 @@ packages:
name: share name: share
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.1" version: "2.0.4"
shared_preferences: shared_preferences:
dependency: "direct main" dependency: "direct main"
description: description:
name: shared_preferences name: shared_preferences
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.5" version: "2.0.6"
shared_preferences_linux: shared_preferences_linux:
dependency: transitive dependency: transitive
description: description:
@ -720,7 +720,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0" version: "1.8.1"
sqflite: sqflite:
dependency: "direct main" dependency: "direct main"
description: description:
@ -790,7 +790,7 @@ packages:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.19" version: "0.3.0"
timezone: timezone:
dependency: transitive dependency: transitive
description: description:
@ -839,7 +839,7 @@ packages:
name: url_launcher name: url_launcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.3" version: "6.0.4"
url_launcher_linux: url_launcher_linux:
dependency: transitive dependency: transitive
description: description:
@ -860,7 +860,7 @@ packages:
name: url_launcher_platform_interface name: url_launcher_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.2" version: "2.0.3"
url_launcher_web: url_launcher_web:
dependency: transitive dependency: transitive
description: description:
@ -895,14 +895,14 @@ packages:
name: video_player name: video_player
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.2" version: "2.1.4"
video_player_platform_interface: video_player_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: video_player_platform_interface name: video_player_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.0.0" version: "4.1.0"
video_player_web: video_player_web:
dependency: transitive dependency: transitive
description: description:
@ -930,21 +930,21 @@ packages:
name: wakelock_macos name: wakelock_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.0" version: "0.1.0+1"
wakelock_platform_interface: wakelock_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: wakelock_platform_interface name: wakelock_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.0" version: "0.2.1+1"
wakelock_web: wakelock_web:
dependency: transitive dependency: transitive
description: description:
name: wakelock_web name: wakelock_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.0" version: "0.2.0+1"
win32: win32:
dependency: transitive dependency: transitive
description: description:
@ -965,7 +965,7 @@ packages:
name: xml name: xml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.1.0" version: "5.1.1"
yaml: yaml:
dependency: transitive dependency: transitive
description: description:

BIN
thirdparty/in_app_purchase/android/.gradle/6.5.1/fileChanges/last-build.bin vendored Normal file
View file

Binary file not shown.

BIN
thirdparty/in_app_purchase/example/android/.gradle/6.5.1/fileChanges/last-build.bin vendored Normal file
View file

Binary file not shown.