Merge pull request #47 from theskyblockman/tests

General bug fixes

android/app/build.gradle

@@ -61,6 +61,11 @@ android {
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+
+        ndk {
+            //noinspection ChromeOsAbiSupport
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
+        }
     }
 
     signingConfigs {

android/gradle.properties

@@ -4,3 +4,4 @@ android.enableJetifier=true
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+android.bundle.enableUncompressedNativeLibs=false

fastlane/metadata/android/en-US/changelogs/10201.txt

@@ -0,0 +1 @@
+- Fixed bugs and improved stability.

fastlane/metadata/android/en-US/changelogs/10202.txt

@@ -0,0 +1 @@
+- Fixed bugs and improved stability.

fastlane/metadata/android/fr-FR/changelogs/10201.txt

@@ -0,0 +1 @@
+- Bugs reglés et amelioration générale de la stabilité

fastlane/metadata/android/fr-FR/changelogs/10202.txt

@@ -0,0 +1 @@
+- Bugs reglés et amelioration générale de la stabilité

lib/file_explorer/file_explorer.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'dart:isolate';
 
 import 'package:cryptography/cryptography.dart';
+import 'package:document_file_save_plus/document_file_save_plus.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -18,6 +19,8 @@ import 'package:life_chest/vault.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 
+typedef FileExportArgs = (String thumbnailFilePath, List<int> encryptionKey, Map<String, dynamic> data, List<int> fileContent, String unlockMechanismType, Map<String, dynamic> additionalUnlockData);
+
 /// The file reader, this enable the user to see file and to browse between them while keeping a cache of them
 class FileReader extends StatefulWidget {
   final List<FileThumbnail> Function() thumbnails;
@@ -257,32 +260,11 @@ class FileExplorerState extends State<FileExplorer> {
   bool isGridView = true;
 
   static Future<void> exportEncryptedThumbnails(
-      List<
-              (
-                String thumbnailFilePath,
-                List<int> encryptionKey,
-                Map<String, dynamic> data,
-                List<int> fileContent,
-                String unlockMechanismType,
-                Map<String, dynamic> additionalUnlockData,
-                String saveLocationPath
-              )>
-          message) async {
-    for ((
-      String thumbnailFilePath,
-      List<int> encryptionKey,
-      Map<String, dynamic> data,
-      List<int> fileContent,
-      String unlockMechanismType,
-      Map<String, dynamic> additionalUnlockData,
-      String saveLocationPath
-    ) data in message) {
+      (SendPort, List<FileExportArgs>) message) async {
+    for (FileExportArgs data in message.$2) {
       List<int> exportedFile = await FileExporter.exportFile(basename(data.$1),
           SecretKey(data.$2), data.$3, data.$4, data.$5, data.$6);
-      File fileToSaveTo =
-          File(join(data.$7, 'Life_Chest_${md5RandomFileName()}.lcef'));
-      fileToSaveTo.createSync();
-      fileToSaveTo.writeAsBytesSync(exportedFile);
+      message.$1.send(exportedFile);
     }
   }
 
@@ -446,83 +428,59 @@ class FileExplorerState extends State<FileExplorer> {
                                       filesToExport.add(thumbnail);
                                     }
                                   }
-                                  String validDirectoryName =
-                                      S.of(context).lifeChestBulkSave;
-                                  Directory? downloadDirectory;
-                                  if (Platform.isIOS) {
-                                    downloadDirectory =
-                                        await getDownloadsDirectory();
-
-                                    if (downloadDirectory == null) return;
-                                  } else {
-                                    downloadDirectory = Directory(
-                                        '/storage/emulated/0/Download');
-                                    // Put file in global download folder, if for an unknown reason it didn't exist, we fallback
-                                    if (!await downloadDirectory.exists()) {
-                                      downloadDirectory =
-                                          await getExternalStorageDirectory();
-                                    }
-                                  }
-
-                                  Directory saveLocation = downloadDirectory!;
-
-                                  if (filesToExport.length > 1) {
-                                    String currentSuffix = '';
-                                    int currentDirID = 2;
-                                    List<FileSystemEntity> dirFiles =
-                                        downloadDirectory.listSync();
-                                    while (dirFiles.any((element) =>
-                                        basename(element.path) ==
-                                        validDirectoryName + currentSuffix)) {
-                                      currentSuffix = ' ($currentDirID)';
-                                      currentDirID++;
-                                    }
-                                    validDirectoryName =
-                                        validDirectoryName + currentSuffix;
 
-                                    saveLocation = Directory(join(
-                                        saveLocation.path, validDirectoryName));
-                                    saveLocation.createSync();
-                                  }
+                                  setState(() {
+                                    loaderTarget = filesToExport.length;
+                                    loaderCurrentLoad = 0;
+                                  });
 
                                   List<int> encryptionKey = await widget
                                       .vault.encryptionKey!
                                       .extractBytes();
 
-                                  Isolate.spawn(
-                                      exportEncryptedThumbnails,
-                                      List<
-                                              (
-                                                String thumbnailFilePath,
-                                                List<int> encryptionKey,
-                                                Map<String, dynamic> data,
-                                                List<int> fileContent,
-                                                String unlockMechanismType,
-                                                Map<String,
-                                                    dynamic> additionalUnlockData,
-                                                String saveLocationPath
-                                              )>.generate(filesToExport.length,
+                                  final receivePort = ReceivePort();
+
+                                  Isolate.spawn(exportEncryptedThumbnails,
+                                      (receivePort.sendPort, List<FileExportArgs>.generate(filesToExport.length,
                                           (index) {
                                         FileThumbnail fileToExport =
                                             filesToExport[index];
-
                                         return (
                                           fileToExport.localPath,
                                           encryptionKey,
                                           fileToExport.data,
                                           fileToExport.file.readAsBytesSync(),
                                           widget.vault.unlockMechanismType,
-                                          widget.vault.additionalUnlockData,
-                                          saveLocation.path
+                                          widget.vault.additionalUnlockData
                                         );
-                                      })).then((value) {
+                                      })));
+
+                                  List<Uint8List> decryptedFiles = [];
+
+                                  await for(List<int> decryptedFile in receivePort) {
+                                    decryptedFiles.add(Uint8List.fromList(decryptedFile));
+                                    setState(() {
+                                      loaderCurrentLoad = decryptedFiles.length;
+                                    });
+                                    if(loaderTarget == loaderCurrentLoad) break;
+                                  }
+
+                                  setState(() {
+                                    loaderTarget = null;
+                                    loaderCurrentLoad = null;
+                                  });
+
+                                  DocumentFileSavePlus().saveMultipleFiles(
+                                      dataList: decryptedFiles,
+                                      fileNameList: [for (FileThumbnail thumbnail in filesToExport) setExtension(basenameWithoutExtension(thumbnail.data['name']), '.lcef')],
+                                      mimeTypeList: List.filled(filesToExport.length, 'plain')
+                                  ).then((value) {
                                     if (context.mounted) {
                                       ScaffoldMessenger.of(context)
                                           .showSnackBar(SnackBar(
-                                              content: Text(S
-                                                  .of(context)
-                                                  .savedToFolder(basename(
-                                                      saveLocation.path)))));
+                                          content: Text(S
+                                              .of(context)
+                                              .savedToFolder)));
                                     }
                                   });
                                 }
@@ -591,8 +549,7 @@ class FileExplorerState extends State<FileExplorer> {
                             if (context.mounted) {
                               ScaffoldMessenger.of(context).showSnackBar(
                                   SnackBar(
-                                      content: Text(S.of(context).savedToFolder(
-                                          basename(saveLocation.path)))));
+                                      content: Text(S.of(context).savedToFolder)));
                             }
                           },
                           child: Text(S.of(context).exportAsCleartext)),
@@ -970,7 +927,6 @@ class FileExplorerState extends State<FileExplorer> {
           loaderCurrentLoad = loaderCurrentLoad! + 1;
         });
       }
-
       setState(() {
         loaderTarget = null;
         loaderCurrentLoad = null;
@@ -987,7 +943,6 @@ class FileExplorerState extends State<FileExplorer> {
       return;
     }
   }
-
   /// A helper method to know if an entity is 1 level deeper in the tree than a local path so that whe can know if the UI should draw it
   static bool shouldThumbnailBeShown(
       String fileLocalPath, String currentLocalPath) {

lib/file_recovery/single_threaded_recovery.dart

@@ -4,6 +4,8 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:cryptography/cryptography.dart';
+import 'package:ffmpeg_kit_flutter/ffprobe_kit.dart';
+import 'package:ffmpeg_kit_flutter/media_information_session.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_media_metadata/flutter_media_metadata.dart';
@@ -33,16 +35,17 @@ class SingleThreadedRecovery {
   }
 
   /// Selects the portion to decrypt and decrypts it (maybe the file reading part could be worked on)
-  static Future<Stream<List<int>>> loadAndDecryptPartialFile(
+  static Stream<List<int>> loadAndDecryptPartialFile(
       SecretKey encryptionKey,
       File fileToRead,
       int startByte,
-      int endByte) async {
-    return VaultsManager.cipher.decryptStream(
-        fileToRead.openRead(startByte, endByte),
-        mac: Mac.empty,
-        secretKey: encryptionKey,
-        nonce: Uint8List(VaultsManager.cipher.nonceLength));
+      int endByte) {
+    int currentLength = startByte;
+    return fileToRead.openRead(startByte, endByte).asyncMap((event) async {
+      currentLength += event.length;
+      return await VaultsManager.cipher
+          .decrypt(SecretBox(event, nonce: Uint8List(VaultsManager.cipher.nonceLength), mac: Mac.empty), secretKey: encryptionKey, keyStreamIndex: currentLength - event.length);
+    });
   }
 
   /// Encrypts the file in a specific location with the [encryptionKey] in the ChaCha20 algorithm
@@ -99,8 +102,10 @@ class SingleThreadedRecovery {
                 ? relative(createdFile.path, from: rootFolderPath)
                 : relative(importedFile!.$1['name'], from: rootFolderPath));
     Map<String, dynamic> finalData = {'name': finalName, 'type': type};
-    if (FileThumbnailsPlaceholder.getPlaceholderFromFileName(
-            [finalData])[finalName] ==
+
+    FileThumbnailsPlaceholder? placeholder = FileThumbnailsPlaceholder.getPlaceholderFromFileName(
+        [finalData])[finalName];
+    if (placeholder ==
         FileThumbnailsPlaceholder.audio) {
       if (createdFile != null) {
         Metadata foundData = await MetadataRetriever.fromFile(createdFile);
@@ -113,6 +118,15 @@ class SingleThreadedRecovery {
       } else {
         finalData['audioData'] = importedFile!.$1['audioData'];
       }
+    } else if (placeholder == FileThumbnailsPlaceholder.videos) {
+      if (createdFile != null) {
+        MediaInformationSession result = await FFprobeKit.getMediaInformation(createdFile.absolute.path);
+
+        finalData['videoData'] = result.getMediaInformation()!.getAllProperties();
+
+      } else {
+        finalData['videoData'] = importedFile!.$1.containsKey('videoData') ? importedFile.$1['videoData'] : {};
+      }
     }
 
     try {

lib/file_viewers/audio.dart

@@ -348,10 +348,10 @@ class EncryptedAudioSource extends StreamAudioSource {
     return StreamAudioResponse(
         sourceLength: fileByteLength,
         contentLength: (end ?? fileByteLength) - (start ?? 0),
-        offset: start,
+        offset: start ?? 0,
         stream: start == null && end == null ?
           SingleThreadedRecovery.loadAndDecryptFile(encryptionKey, fileToRead) :
-          await SingleThreadedRecovery.loadAndDecryptPartialFile(encryptionKey, fileToRead, start ?? 0, end ?? fileByteLength),
+          SingleThreadedRecovery.loadAndDecryptPartialFile(encryptionKey, fileToRead, start ?? 0, end ?? fileByteLength),
         contentType: mimeType,
         rangeRequestsSupported: true);
   }

lib/file_viewers/video.dart

@@ -43,7 +43,9 @@ class VideoViewer extends FileViewer {
         autoPlay: false,
         looping: true,
         autoDetectFullscreenDeviceOrientation: true,
-        controlsConfiguration: BetterPlayerControlsConfiguration.white(),
+        controlsConfiguration: const BetterPlayerControlsConfiguration(),
+        aspectRatio: fileData['videoData']['streams'][0]['width'] / fileData['videoData']['streams'][0]['height'],
+        fit: BoxFit.contain,
         translations: [
           BetterPlayerTranslations(),
           BetterPlayerTranslations(
@@ -54,10 +56,10 @@ class VideoViewer extends FileViewer {
               generalRetry: 'Réessayer',
               playlistLoadingNextVideo: "Chargement de la prochaine vidéo",
               controlsLive: "DIRECT",
-              controlsNextVideoIn: "Prochaine vidéo dans ",
+              controlsNextVideoIn: "Prochaine vidéo dans",
               overflowMenuPlaybackSpeed: "Vitesse de lecture",
               overflowMenuSubtitles: "Sous-titres",
-              overflowMenuQuality: "Qualitée",
+              overflowMenuQuality: "Qualité",
               overflowMenuAudioTracks: "Audio",
               qualityAuto: "Auto"
           )
@@ -68,9 +70,6 @@ class VideoViewer extends FileViewer {
             const BetterPlayerPlaylistConfiguration(
                 loopVideos: true, initialStartIndex: 0));
 
-        controller!.setOverriddenAspectRatio(
-            controller!.videoPlayerController!.value.aspectRatio);
-
     return true;
   }
 

lib/generated/intl/messages_en.dart

@@ -25,11 +25,9 @@ class MessageLookup extends MessageLookupByLibrary {
 
   static String m1(groupID) => "Group n.${groupID}";
 
-  static String m2(path) => "Saved the file(s) to ${path}";
+  static String m2(count) => "${count} selected";
 
-  static String m3(count) => "${count} selected";
-
-  static String m4(unlockName) =>
+  static String m3(unlockName) =>
       "This group can be unlocked with: ${unlockName}.";
 
   final messages = _notInlinedMessages(_notInlinedMessages);
@@ -141,12 +139,13 @@ class MessageLookup extends MessageLookupByLibrary {
         "pleaseUseBiometrics": MessageLookupByLibrary.simpleMessage(
             "Please use your biometrics to unlock the chest"),
         "rename": MessageLookupByLibrary.simpleMessage("Rename"),
-        "savedToFolder": m2,
+        "savedToFolder": MessageLookupByLibrary.simpleMessage(
+            "We successfully saved the file(s)"),
         "scheme": MessageLookupByLibrary.simpleMessage("Pattern"),
         "selectAll": MessageLookupByLibrary.simpleMessage("Select all"),
-        "selected": m3,
+        "selected": m2,
         "sortBy": MessageLookupByLibrary.simpleMessage("Sort by..."),
-        "unlockAbleBy": m4,
+        "unlockAbleBy": m3,
         "unlockChest": MessageLookupByLibrary.simpleMessage("Unlock the chest"),
         "unlockFile": MessageLookupByLibrary.simpleMessage("Unlock the file"),
         "unlockWizard": MessageLookupByLibrary.simpleMessage("Unlock wizard"),