From 493c17643e8d53d9552532cd17a0637d7593f6a7 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Sat, 24 Sep 2022 17:36:31 -0700
Subject: [PATCH] upload progress

---
 .../asgardius/page/s3manager/Downloader.java  |  9 ----
 .../asgardius/page/s3manager/Uploader.java    | 49 +++++++++++++++++--
 app/src/main/res/layout/activity_uploader.xml |  5 +-
 3 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/asgardius/page/s3manager/Downloader.java b/app/src/main/java/asgardius/page/s3manager/Downloader.java
index 2a46594..8044323 100644
--- a/app/src/main/java/asgardius/page/s3manager/Downloader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Downloader.java
@@ -179,15 +179,6 @@ public class Downloader extends AppCompatActivity {
                                     }
                                 }
 
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        //simpleProgressBar.setProgress(100);
-                                    }
-                                });
-                                //System.out.println("tree "+treelevel);
-                                //System.out.println("prefix "+prefix);
-
                             } catch (Exception e) {
                                 e.printStackTrace();
                                 //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/asgardius/page/s3manager/Uploader.java b/app/src/main/java/asgardius/page/s3manager/Uploader.java
index 38cff49..73191d1 100644
--- a/app/src/main/java/asgardius/page/s3manager/Uploader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Uploader.java
@@ -57,8 +57,9 @@ public class Uploader extends AppCompatActivity {
     File ufile;
     Intent intent;
     Button fileUpload;
-    Thread uploadFile;
+    Thread uploadFile, uploadProgress;
     boolean started = false;
+    long transfered = 0;
     private static final long MAX_SINGLE_PART_UPLOAD_BYTES = 5 * 1024 * 1024;
     private WifiManager.WifiLock mWifiLock;
     private PowerManager.WakeLock mWakeLock;
@@ -103,6 +104,8 @@ public class Uploader extends AppCompatActivity {
                     //simpleProgressBar.setVisibility(View.INVISIBLE);
                 } else {
                     started = true;
+                    transfered = 0;
+                    //simpleProgressBar.setProgress(0);
                     simpleProgressBar.setVisibility(View.VISIBLE);
                     if (fileuri == null && folder == null) {
                         Toast.makeText(Uploader.this, getResources().getString(R.string.no_file_selected), Toast.LENGTH_SHORT).show();
@@ -152,9 +155,10 @@ public class Uploader extends AppCompatActivity {
                                                 mWakeLock.release();
                                                 //System.out.println("WakeLock released");
                                             }
-                                            //simpleProgressBar.setProgress(100);
-                                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                                            simpleProgressBar.setProgress(100);
+                                            //simpleProgressBar.setVisibility(View.INVISIBLE);
                                             fileUpload.setText(getResources().getString(R.string.upload_success));
+                                            started = false;
                                             fileUpload.setEnabled(false);
                                             //Toast.makeText(getApplicationContext(),getResources().getString(R.string.upload_success), Toast.LENGTH_SHORT).show();
                                             //simpleProgressBar.setVisibility(View.INVISIBLE);
@@ -178,7 +182,8 @@ public class Uploader extends AppCompatActivity {
                                                 mWakeLock.release();
                                                 //System.out.println("WakeLock released");
                                             }
-                                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                                            started = false;
+                                            //simpleProgressBar.setVisibility(View.INVISIBLE);
                                             //fileUpload.setEnabled(true);
                                             fileUpload.setText(getResources().getString(R.string.retry));
                                             //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -189,8 +194,43 @@ public class Uploader extends AppCompatActivity {
                                 }
                             }
                         });
+                        uploadProgress = new Thread(new Runnable() {
+
+                            @Override
+                            public void run() {
+                                try  {
+                                    //Your code goes here
+                                    while (started) {
+                                        try {
+                                            if (filesize != 0) {
+                                                //simpleProgressBar.setProgress((int)((transfered*100)/filesize));
+                                                simpleProgressBar.setProgress((int)((transfered*100)/filesize));
+                                            }
+                                            Thread.sleep(500);
+                                        } catch (Exception e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+
+                                    runOnUiThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            //simpleProgressBar.setProgress(100);
+                                        }
+                                    });
+                                    //System.out.println("tree "+treelevel);
+                                    //System.out.println("prefix "+prefix);
+
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                    //finish();
+                                }
+                            }
+                        });
                         //simpleProgressBar.setVisibility(View.VISIBLE);
                         uploadFile.start();
+                        uploadProgress.start();
                     /*while (progress <= 99) {
                         System.out.println("Upload in progress");
                         if (upload != null) {
@@ -327,6 +367,7 @@ public class Uploader extends AppCompatActivity {
             partETags.add(uploadResult.getPartETag());
 
             fileOffset += partSize;
+            transfered = fileOffset;
         }
 
         // Complete the multipart upload.
diff --git a/app/src/main/res/layout/activity_uploader.xml b/app/src/main/res/layout/activity_uploader.xml
index b74b7ae..44b3194 100644
--- a/app/src/main/res/layout/activity_uploader.xml
+++ b/app/src/main/res/layout/activity_uploader.xml
@@ -46,12 +46,13 @@
 
     <ProgressBar
         android:id="@+id/simpleProgressBar"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:indeterminate="true"
+        android:indeterminate="false"
         android:max="100"
         android:padding="20dp"
-        android:progress="50"
+        android:progress="0"
         android:visibility="invisible"
         tools:ignore="MissingConstraints" />