Upgrade dependencies

lib/utils/file_util.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 import 'dart:io' as io;
-import 'dart:io';
 import 'dart:typed_data';
 
 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/constants.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/services/collections_service.dart';
 import 'package:photos/utils/thumbnail_util.dart';
@@ -24,7 +23,7 @@ import 'crypto_util.dart';
 
 final _logger = Logger("FileUtil");
 
-void preloadFile(File file) {
+void preloadFile(ente.File file) {
   if (file.fileType == FileType.video) {
     return;
   }
@@ -41,7 +40,7 @@ void preloadFile(File file) {
   }
 }
 
-void preloadThumbnail(File file) {
+void preloadThumbnail(ente.File file) {
   if (file.localID == null) {
     getThumbnailFromServer(file);
   } 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) {
     return getFileFromServer(file);
   } 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) {
     return getFileFromServer(file).then((file) => file.readAsBytesSync());
   } 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;
   if (extension(file.title) == ".HEIC" || quality != 100) {
     return originalBytes.then((bytes) {
@@ -97,7 +96,7 @@ Future<Uint8List> getBytesFromDisk(File file, {int quality = 100}) async {
 final Map<int, Future<io.File>> fileDownloadsInProgress =
     Map<int, Future<io.File>>();
 
-Future<io.File> getFileFromServer(File file,
+Future<io.File> getFileFromServer(ente.File file,
     {ProgressCallback progressCallback}) async {
   final cacheManager = file.fileType == FileType.video
       ? 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 {
   _logger.info("Downloading file " + file.uploadedFileID.toString());
   final encryptedFilePath = Configuration.instance.getTempDirectory() +
@@ -161,7 +161,7 @@ Future<io.File> _downloadAndDecrypt(File file, BaseCacheManager cacheManager,
     encryptedFile.deleteSync();
     var fileExtension = extension(file.title).substring(1).toLowerCase();
     var outputFile = decryptedFile;
-    if (Platform.isAndroid && fileExtension == "heic") {
+    if (io.Platform.isAndroid && fileExtension == "heic") {
       outputFile = await FlutterImageCompress.compressAndGetFile(
         decryptedFilePath,
         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 nonce = Sodium.base642bin(file.keyDecryptionNonce);
   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) {
     VideoCacheManager.instance.removeFile(file.getDownloadUrl());
   } else {

pubspec.lock

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