asgardius/s3music
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

download progress

Browse source
This commit is contained in:
Page Asgardius 2022-09-24 16:07:05 -07:00
parent 38442e5c54
commit 38ffd5f5f7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/asgardius/page/s3manager/Downloader.java
View file

@ -46,7 +46,7 @@ public class Downloader extends AppCompatActivity {
boolean started = false; boolean started = false;
boolean cancel = false; boolean cancel = false;
long filesize = 0; long filesize = 0;
long transfered; long transfered = 0;
private WifiManager.WifiLock mWifiLock; private WifiManager.WifiLock mWifiLock;
private PowerManager.WakeLock mWakeLock; private PowerManager.WakeLock mWakeLock;
private PowerManager powerManager; private PowerManager powerManager;
@ -110,7 +110,7 @@ public class Downloader extends AppCompatActivity {
//s3client.createBucket(bucket, location); //s3client.createBucket(bucket, location);
//System.out.println(fkey); //System.out.println(fkey);
object = s3client.getObject(bucket, prefix+filename); object = s3client.getObject(bucket, prefix+filename);
filesize = object.getObjectMetadata().getContentLength(); filesize = (object.getObjectMetadata().getContentLength())/1024;
writeContentToFile(fileuri); writeContentToFile(fileuri);
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
@ -125,7 +125,7 @@ public class Downloader extends AppCompatActivity {
mWakeLock.release(); mWakeLock.release();
//System.out.println("WakeLock released"); //System.out.println("WakeLock released");
} }
simpleProgressBar.setVisibility(View.INVISIBLE); simpleProgressBar.setProgress(100);
fileDownload.setText(getResources().getString(R.string.download_success)); fileDownload.setText(getResources().getString(R.string.download_success));
fileDownload.setEnabled(false); fileDownload.setEnabled(false);
//simpleProgressBar.setVisibility(View.INVISIBLE); //simpleProgressBar.setVisibility(View.INVISIBLE);
@ -149,7 +149,6 @@ public class Downloader extends AppCompatActivity {
mWakeLock.release(); mWakeLock.release();
//System.out.println("WakeLock released"); //System.out.println("WakeLock released");
} }
simpleProgressBar.setVisibility(View.INVISIBLE);
if (cancel) { if (cancel) {
fileDownload.setText(getResources().getString(R.string.download_canceled)); fileDownload.setText(getResources().getString(R.string.download_canceled));
} else { } else {
@ -167,13 +166,12 @@ public class Downloader extends AppCompatActivity {
@Override @Override
public void run() { public void run() {
simpleProgressBar.setVisibility(View.VISIBLE);
try { try {
//Your code goes here //Your code goes here
while (!cancel && fileDownload.isEnabled()) { while (fileDownload.isEnabled()) {
try { try {
if (filesize != 0) { if (filesize != 0) {
System.out.println("file size: "+Long.toString(filesize)); simpleProgressBar.setProgress((int)((transfered*100)/filesize));
} }
Thread.sleep(500); Thread.sleep(500);
} catch (Exception e) { } catch (Exception e) {
@ -252,6 +250,7 @@ public class Downloader extends AppCompatActivity {
byte[] buffer = new byte[1024]; byte[] buffer = new byte[1024];
for (int len; (len = in.read(buffer)) != -1; ) { for (int len; (len = in.read(buffer)) != -1; ) {
out.write(buffer, 0, len); out.write(buffer, 0, len);
transfered ++;
} }
} }
} }

5
app/src/main/res/layout/activity_downloader.xml
View file

@ -28,12 +28,13 @@
<ProgressBar <ProgressBar
android:id="@+id/simpleProgressBar" android:id="@+id/simpleProgressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:indeterminate="true" android:indeterminate="false"
android:max="100" android:max="100"
android:padding="20dp" android:padding="20dp"
android:progress="50" android:progress="0"
android:visibility="invisible" android:visibility="invisible"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />