From fbb212f383bca41f181397b583803d0962f0017d Mon Sep 17 00:00:00 2001
From: Patryk Hegenberg <patrykhegenberg@gmail.com>
Date: Fri, 17 May 2024 10:32:11 +0200
Subject: [PATCH] feature(flutter_gui): add file storage location for android
 and change screen change after transfer

---
 caesar-core/src/receiver/client.rs            | 42 +++++++++----------
 .../lib/pages/receive_screen.dart             |  8 ++--
 .../lib/pages/waiting_screen.dart             |  7 +++-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/caesar-core/src/receiver/client.rs b/caesar-core/src/receiver/client.rs
index 7287c77..306a4ec 100644
--- a/caesar-core/src/receiver/client.rs
+++ b/caesar-core/src/receiver/client.rs
@@ -23,11 +23,7 @@ const DESTINATION: u8 = 0;
 const NONCE_SIZE: usize = 12;
 
 #[cfg(target_os = "android")]
-// const FILE_PATH_PREFIX: &str = "/storage/emulated/0/Documents/";
-const FILE_PATH_PREFIX: &str = "/data/data/rust.executor_android/files";
-
-#[cfg(not(target_os = "android"))]
-const FILE_PATH_PREFIX: &str = ".";
+const FILE_PATH_PREFIX: &str = "/storage/emulated/0/Download";
 
 struct File {
     name: String,
@@ -80,11 +76,29 @@ fn on_list(context: &mut Context, list: ListPacket) -> Status {
 
     for entry in list.entries {
         let path = sanitize_filename::sanitize(entry.name.clone());
+        #[cfg(target_os = "android")]
+        let file_path = format!("{}/{}", FILE_PATH_PREFIX, path);
 
+        #[cfg(target_os = "android")]
+        if Path::new(&file_path).exists() {
+            return Status::Err(format!("The file '{}' already exists.", path));
+        }
+        #[cfg(target_os = "android")]
+        let handle = match fs::File::create(&file_path) {
+            Ok(handle) => handle,
+            Err(error) => {
+                return Status::Err(format!(
+                    "Error: Failed to create file '{}': {}",
+                    file_path, error
+                ));
+            }
+        };
+        #[cfg(not(target_os = "android"))]
         if Path::new(&path).exists() {
             return Status::Err(format!("The file '{}' already exists.", path));
         }
 
+        #[cfg(not(target_os = "android"))]
         let handle = match fs::File::create(&path) {
             Ok(handle) => handle,
             Err(error) => {
@@ -133,24 +147,6 @@ fn on_chunk(context: &mut Context, chunk: ChunkPacket) -> Status {
 
     context.sequence += 1;
 
-    #[cfg(target_os = "android")]
-    let file_path = format!("{}/{}", FILE_PATH_PREFIX, file.name);
-
-    // Öffnen Sie die Datei mit dem generierten Pfad
-    #[cfg(target_os = "android")]
-    let mut file_handle = match fs::File::create(&file_path) {
-        Ok(handle) => handle,
-        Err(error) => {
-            return Status::Err(format!(
-                "Error: Failed to create file '{}': {}",
-                file_path, error
-            ));
-        }
-    };
-    #[cfg(target_os = "android")]
-    file_handle.write(&chunk.chunk).unwrap();
-
-    #[cfg(not(target_os = "android"))]
     file.handle.write(&chunk.chunk).unwrap();
 
     file.progress = (context.length * 100) / file.size;
diff --git a/flutter_test_gui/lib/pages/receive_screen.dart b/flutter_test_gui/lib/pages/receive_screen.dart
index bc739dc..2d60945 100644
--- a/flutter_test_gui/lib/pages/receive_screen.dart
+++ b/flutter_test_gui/lib/pages/receive_screen.dart
@@ -84,9 +84,11 @@ class _ReceiveScreenState extends State<ReceiveScreen> {
           if (!_showScanner)
             GestureDetector(
               onTap: () {
-                setState(() {
-                  _showScanner = true;
-                });
+                if (Platform.isIOS || Platform.isAndroid) {
+                  setState(() {
+                    _showScanner = true;
+                  });
+                }
               },
               child: Container(
                 width: 200,
diff --git a/flutter_test_gui/lib/pages/waiting_screen.dart b/flutter_test_gui/lib/pages/waiting_screen.dart
index ce60943..3e2d403 100644
--- a/flutter_test_gui/lib/pages/waiting_screen.dart
+++ b/flutter_test_gui/lib/pages/waiting_screen.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_test_gui/pages/send_screen.dart';
+// import 'package:flutter_test_gui/pages/send_screen.dart';
+import 'package:flutter_test_gui/main.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:cross_file/cross_file.dart';
 import 'package:shared_preferences/shared_preferences.dart';
@@ -45,7 +46,9 @@ class _WaitingScreenState extends State<WaitingScreen> {
     final outcome = await startRustSender(
         name: widget.transferName, relay: appOrigin, files: fileNames);
     Navigator.push(
-        context, MaterialPageRoute(builder: (context) => SendScreen()));
+        context,
+        MaterialPageRoute(
+            builder: (context) => MyHomePage(title: 'Caesar Transfer')));
   }
 
   @override