fix #9

odinapp · Nov 27, 2021 · d4b1c29 · d4b1c29
1 parent 36ba1a4
commit d4b1c29
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 19 deletions.
diff --git a/lib/services/download_service.dart b/lib/services/download_service.dart
@@ -2,21 +2,17 @@ import 'dart:io';
 
 import 'package:android_path_provider/android_path_provider.dart';
 import 'package:dio/dio.dart';
-import 'package:odin/services/locator.dart';
 import 'package:odin/services/logger.dart';
-import 'package:odin/services/random_service.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:permission_handler/permission_handler.dart';
 
 class DownloadService {
-  final RandomService _randomService = locator<RandomService>();
   String progress = '0%';
   bool downloading = false;
 
   Dio dio = Dio();
-  Future<String> _getFilePath() async {
-    final fileName = "odin_" + _randomService.getRandomString(10);
+  Future<String> _getFilePath(String fileName) async {
     Directory? dir;
     if (Platform.isAndroid) {
       var status = await Permission.storage.status;
@@ -29,15 +25,24 @@ class DownloadService {
     } else {
       dir = await getDownloadsDirectory();
     }
-    String path = join(dir?.path ?? '', fileName + ".odin");
+    String path = join(dir?.path ?? '', fileName);
     logger.d("File path : $path");
     return path;
   }
 
   Future<File> downloadFile(String url) async {
-    final filePath = await _getFilePath();
     progress = '0%';
     downloading = true;
+    Response response = await Dio().get(
+      url,
+      options: Options(
+          followRedirects: false,
+          validateStatus: (status) {
+            return (status ?? 0) < 500;
+          }),
+    );
+    final filePath = await _getFilePath(
+        basename(response.headers.map["location"]?[0] ?? ''));
     await dio.download(
       url,
       filePath,

diff --git a/lib/services/encryption_service.dart b/lib/services/encryption_service.dart
@@ -15,7 +15,7 @@ class EncryptionService {
     final password = _randomService.getRandomString(16);
     crypt.setPassword(password);
     final encryptedFilePath =
-        join(file.parent.path, basenameWithoutExtension(file.path) + '.odin');
+        join(file.parent.path, basename(file.path) + '.odin');
     crypt.encryptFileSync(file.path, encryptedFilePath);
     file.deleteSync(); // Delete the original zip file
     logger.d('Finished Encryption');
@@ -28,8 +28,8 @@ class EncryptionService {
     crypt.setPassword(password);
     file = await file
         .rename(file.path.substring(0, file.path.length - 5) + ".aes");
-    final decryptedFilePath = crypt.decryptFileSync(file.path,
-        join(file.parent.path, basenameWithoutExtension(file.path) + '.zip'));
+    final decryptedFilePath = crypt.decryptFileSync(
+        file.path, join(file.parent.path, basenameWithoutExtension(file.path)));
     File decryptedFile = File(decryptedFilePath);
     file.deleteSync(); // Delete the original AES file
     logger.d('Finished Decryption');

diff --git a/lib/services/file_service.dart b/lib/services/file_service.dart
@@ -9,6 +9,7 @@ import 'package:odin/services/logger.dart';
 import 'package:odin/services/shortener_service.dart';
 import 'package:odin/services/zip_service.dart';
 import 'package:path/path.dart';
+import 'package:path_provider/path_provider.dart';
 
 class FileService {
   final _shortenerService = locator<ShortenerService>();
@@ -32,7 +33,15 @@ class FileService {
       uploading = true;
       processing = true;
       List<File> files = result.paths.map((path) => File(path!)).toList();
-      final zippedFile = await _zipService.zipFile(fileToZips: files);
+      File zippedFile;
+      if (files.length > 1) {
+        zippedFile = await _zipService.zipFile(fileToZips: files);
+      } else {
+        final Directory cacheDir = await getTemporaryDirectory();
+        zippedFile = files[0];
+        zippedFile =
+            zippedFile.copySync(join(cacheDir.path, basename(files[0].path)));
+      }
       final encryptedFileDetails =
           await _encrytionService.encryptFile(zippedFile);
       zipfileName = basename(zippedFile.path);
@@ -54,9 +63,16 @@ class FileService {
       zipfileName = '';
       uploading = true;
       processing = true;
-      final List<File> fileToZips =
-          urls.map((e) => File(e.toFilePath())).toList();
-      final zippedFile = await _zipService.zipFile(fileToZips: fileToZips);
+      final List<File> files = urls.map((e) => File(e.toFilePath())).toList();
+      File zippedFile;
+      if (files.length > 1) {
+        zippedFile = await _zipService.zipFile(fileToZips: files);
+      } else {
+        final Directory cacheDir = await getTemporaryDirectory();
+        zippedFile = files[0];
+        zippedFile =
+            zippedFile.copySync(join(cacheDir.path, basename(files[0].path)));
+      }
       final encryptedFileDetails =
           await _encrytionService.encryptFile(zippedFile);
       zipfileName = basename(zippedFile.path);
@@ -81,10 +97,16 @@ class FileService {
     processing = true;
     final decryptedFile = await _encrytionService.decryptFile(file, password);
     logger.d("decryptedFile path : ${decryptedFile.path}");
-    final unzippedFilePath = await _zipService.unzipFile(decryptedFile);
-    processing = false;
-    downloading = false;
-    logger.d("unzippedFile path : $unzippedFilePath");
-    return unzippedFilePath;
+    if (decryptedFile.path.endsWith('.zip')) {
+      final unzippedFilePath = await _zipService.unzipFile(decryptedFile);
+      logger.d("unzippedFile path : $unzippedFilePath");
+      processing = false;
+      downloading = false;
+      return unzippedFilePath;
+    } else {
+      processing = false;
+      downloading = false;
+      return decryptedFile.parent.path;
+    }
   }
 }