From 7dff026db1e74d5ee60cb84d7e9c9638363e4010 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Fri, 30 Dec 2022 20:55:02 -0700
Subject: [PATCH] new release

---
 app/build.gradle                              |  4 +--
 .../asgardius/page/s3manager/Uploader.java    | 25 ++++++++-----------
 .../metadata/android/en-US/changelogs/54.txt  |  2 --
 .../metadata/android/en-US/changelogs/55.txt  |  3 +++
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 fastlane/metadata/android/en-US/changelogs/54.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/55.txt

diff --git a/app/build.gradle b/app/build.gradle
index b524641..55982c8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "asgardius.page.s3manager"
         minSdk 23
         targetSdk 33
-        versionCode 54
-        versionName "0.5.2"
+        versionCode 55
+        versionName "0.6.0"
         setProperty("archivesBaseName", "s3-manager-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/java/asgardius/page/s3manager/Uploader.java b/app/src/main/java/asgardius/page/s3manager/Uploader.java
index 56e1590..1f42e46 100644
--- a/app/src/main/java/asgardius/page/s3manager/Uploader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Uploader.java
@@ -142,6 +142,12 @@ public class Uploader extends AppCompatActivity {
                                     //s3client.createBucket(bucket, location);
                                     //System.out.println(fkey);
                                     if (isfolder) {
+                                        if(prefix.endsWith("/")) {
+                                            prefix = fprefix.getText().toString();
+                                        } else {
+                                            prefix = fprefix.getText().toString().concat("/");
+                                        }
+                                        fprefix.setEnabled(false);
                                         document = DocumentFile.fromTreeUri(getApplicationContext(), fileuri);
                                         DocumentFile[] filelist = document.listFiles();
                                         ArrayList<String> filepath = new ArrayList<String>();
@@ -171,27 +177,16 @@ public class Uploader extends AppCompatActivity {
                                                             treelevel++;
                                                             fileindex.add(0);
                                                         } else {
-                                                            System.out.println(String.join("/", filepath));
+                                                            ufile = readContentToFile(filelist[fileindex.get(treelevel)].getUri());
+                                                            putS3Object(bucket, prefix+String.join("/", filepath), ufile);
                                                             filepath.remove(treelevel);
-                                                            if(filelist[fileindex.get(treelevel)].length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
-                                                                System.out.println((filelist[fileindex.get(treelevel)].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+" parts");
-                                                            } else {
-                                                                System.out.println(((filelist[fileindex.get(treelevel)].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1)+" parts");
-                                                            }
                                                             fileindex.set(treelevel, fileindex.get(treelevel)+1);
                                                         }
                                                     }
                                                 }
-                                                //document = document.getParentFile();
-                                                //filelist = document.listFiles();
-                                                //treelevel--;
                                             } else {
-                                                System.out.println(String.join("/", filepath));
-                                                if(filelist[i].length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
-                                                    System.out.println((filelist[i].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+" parts");
-                                                } else {
-                                                    System.out.println(((filelist[i].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1)+" parts");
-                                                }
+                                                ufile = readContentToFile(filelist[i].getUri());
+                                                putS3Object(bucket, prefix+String.join("/", filepath), ufile);
                                             }
                                             filepath.clear();
                                             fileindex.clear();
diff --git a/fastlane/metadata/android/en-US/changelogs/54.txt b/fastlane/metadata/android/en-US/changelogs/54.txt
deleted file mode 100644
index a22183b..0000000
--- a/fastlane/metadata/android/en-US/changelogs/54.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* UI fixes
-* Copy file name to clipboard
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/55.txt b/fastlane/metadata/android/en-US/changelogs/55.txt
new file mode 100644
index 0000000..c2c0bed
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/55.txt
@@ -0,0 +1,3 @@
+* UI fixes
+* Copy file name to clipboard
+* Folder upload function added
\ No newline at end of file