download progress handler template
This commit is contained in:
parent
c83f48ec3e
commit
38442e5c54
4 changed files with 221 additions and 167 deletions
|
|
@ -5,7 +5,6 @@ import static android.content.ContentValues.TAG;
|
|||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.DownloadManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -17,9 +16,7 @@ import android.provider.MediaStore;
|
|||
import android.util.Log;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.amazonaws.auth.AWSCredentials;
|
||||
|
|
@ -29,11 +26,7 @@ import com.amazonaws.services.s3.AmazonS3;
|
|||
import com.amazonaws.services.s3.AmazonS3Client;
|
||||
import com.amazonaws.services.s3.S3ClientOptions;
|
||||
import com.amazonaws.services.s3.model.S3Object;
|
||||
import com.google.android.material.snackbar.Snackbar;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
|
|
@ -48,8 +41,12 @@ public class Downloader extends AppCompatActivity {
|
|||
ProgressBar simpleProgressBar;
|
||||
Intent intent;
|
||||
Button fileDownload;
|
||||
Thread downloadFile;
|
||||
Thread downloadFile, downloadProgress;
|
||||
S3Object object;
|
||||
boolean started = false;
|
||||
boolean cancel = false;
|
||||
long filesize = 0;
|
||||
long transfered;
|
||||
private WifiManager.WifiLock mWifiLock;
|
||||
private PowerManager.WakeLock mWakeLock;
|
||||
private PowerManager powerManager;
|
||||
|
|
@ -85,9 +82,15 @@ public class Downloader extends AppCompatActivity {
|
|||
@Override
|
||||
public void onClick(View view) {
|
||||
//buttonaction
|
||||
if (started) {
|
||||
cancel = true;
|
||||
downloadFile.interrupt();
|
||||
//simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
} else {
|
||||
started = true;
|
||||
simpleProgressBar.setVisibility(View.VISIBLE);
|
||||
fileDownload.setEnabled(false);
|
||||
fileDownload.setText(getResources().getString(R.string.download_in_progress));
|
||||
//fileDownload.setEnabled(false);
|
||||
fileDownload.setText(getResources().getString(R.string.cancel_download));
|
||||
//Acquiring WakeLock and WifiLock if not held
|
||||
if (!mWifiLock.isHeld()) {
|
||||
mWifiLock.acquire();
|
||||
|
|
@ -107,6 +110,7 @@ public class Downloader extends AppCompatActivity {
|
|||
//s3client.createBucket(bucket, location);
|
||||
//System.out.println(fkey);
|
||||
object = s3client.getObject(bucket, prefix+filename);
|
||||
filesize = object.getObjectMetadata().getContentLength();
|
||||
writeContentToFile(fileuri);
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
|
|
@ -123,7 +127,7 @@ public class Downloader extends AppCompatActivity {
|
|||
}
|
||||
simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
fileDownload.setText(getResources().getString(R.string.download_success));
|
||||
Toast.makeText(getApplicationContext(),getResources().getString(R.string.download_success), Toast.LENGTH_SHORT).show();
|
||||
fileDownload.setEnabled(false);
|
||||
//simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
});
|
||||
|
|
@ -146,8 +150,12 @@ public class Downloader extends AppCompatActivity {
|
|||
//System.out.println("WakeLock released");
|
||||
}
|
||||
simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
if (cancel) {
|
||||
fileDownload.setText(getResources().getString(R.string.download_canceled));
|
||||
} else {
|
||||
fileDownload.setText(getResources().getString(R.string.download_failed));
|
||||
Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
fileDownload.setEnabled(false);
|
||||
}
|
||||
});
|
||||
//Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
|
||||
|
|
@ -155,7 +163,43 @@ public class Downloader extends AppCompatActivity {
|
|||
}
|
||||
}
|
||||
});
|
||||
downloadProgress = new Thread(new Runnable() {
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
simpleProgressBar.setVisibility(View.VISIBLE);
|
||||
try {
|
||||
//Your code goes here
|
||||
while (!cancel && fileDownload.isEnabled()) {
|
||||
try {
|
||||
if (filesize != 0) {
|
||||
System.out.println("file size: "+Long.toString(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();
|
||||
}
|
||||
}
|
||||
});
|
||||
downloadFile.start();
|
||||
downloadProgress.start();
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import android.net.Uri;
|
|||
import android.net.wifi.WifiManager;
|
||||
import android.os.Bundle;
|
||||
import android.os.PowerManager;
|
||||
import android.os.storage.StorageManager;
|
||||
import android.provider.MediaStore;
|
||||
import android.util.Log;
|
||||
import android.view.View;
|
||||
|
|
@ -59,6 +58,7 @@ public class Uploader extends AppCompatActivity {
|
|||
Intent intent;
|
||||
Button fileUpload;
|
||||
Thread uploadFile;
|
||||
boolean started = false;
|
||||
private static final long MAX_SINGLE_PART_UPLOAD_BYTES = 5 * 1024 * 1024;
|
||||
private WifiManager.WifiLock mWifiLock;
|
||||
private PowerManager.WakeLock mWakeLock;
|
||||
|
|
@ -97,6 +97,13 @@ public class Uploader extends AppCompatActivity {
|
|||
@Override
|
||||
public void onClick(View view) {
|
||||
//buttonaction
|
||||
if (started) {
|
||||
started = false;
|
||||
uploadFile.interrupt();
|
||||
//simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
} else {
|
||||
started = true;
|
||||
simpleProgressBar.setVisibility(View.VISIBLE);
|
||||
if (fileuri == null && folder == null) {
|
||||
Toast.makeText(Uploader.this, getResources().getString(R.string.no_file_selected), Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
|
|
@ -109,9 +116,8 @@ public class Uploader extends AppCompatActivity {
|
|||
mWakeLock.acquire();
|
||||
//System.out.println("WakeLock acquired");
|
||||
}
|
||||
simpleProgressBar.setVisibility(View.VISIBLE);
|
||||
fileUpload.setEnabled(false);
|
||||
fileUpload.setText(getResources().getString(R.string.upload_in_progress));
|
||||
//eUpload.setEnabled(false);
|
||||
fileUpload.setText(getResources().getString(R.string.cancel_upload));
|
||||
uploadFile = new Thread(new Runnable() {
|
||||
|
||||
@Override
|
||||
|
|
@ -149,7 +155,8 @@ public class Uploader extends AppCompatActivity {
|
|||
//simpleProgressBar.setProgress(100);
|
||||
simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
fileUpload.setText(getResources().getString(R.string.upload_success));
|
||||
Toast.makeText(getApplicationContext(),getResources().getString(R.string.upload_success), Toast.LENGTH_SHORT).show();
|
||||
fileUpload.setEnabled(false);
|
||||
//Toast.makeText(getApplicationContext(),getResources().getString(R.string.upload_success), Toast.LENGTH_SHORT).show();
|
||||
//simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
}
|
||||
});
|
||||
|
|
@ -172,9 +179,9 @@ public class Uploader extends AppCompatActivity {
|
|||
//System.out.println("WakeLock released");
|
||||
}
|
||||
simpleProgressBar.setVisibility(View.INVISIBLE);
|
||||
fileUpload.setEnabled(true);
|
||||
//fileUpload.setEnabled(true);
|
||||
fileUpload.setText(getResources().getString(R.string.retry));
|
||||
Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
|
||||
//Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
|
||||
}
|
||||
});
|
||||
//Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
|
||||
|
|
@ -202,6 +209,7 @@ public class Uploader extends AppCompatActivity {
|
|||
}*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<string name="bucket_name_empty">Se requiere un nombre para el bucket</string>
|
||||
<string name="file_share">Compartir archivo</string>
|
||||
<string name="download_file">Descargar archivo</string>
|
||||
<string name="download_in_progress">Descarga en proceso</string>
|
||||
<string name="cancel_download">Cancelar descarga</string>
|
||||
<string name="download_success">Archivo descargado exitosamente</string>
|
||||
<string name="upload_file_tobucket">Subir archivo en este bucket</string>
|
||||
<string name="upload_folder_tobucket">Subir carpeta en este bucket</string>
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
<string name="upload_prefix">Prefijo del objeto</string>
|
||||
<string name="no_file_selected">Favor de seleccionar un archivo</string>
|
||||
<string name="upload_success">Archivo subido exitosamente</string>
|
||||
<string name="upload_in_progress">Subida en proceso</string>
|
||||
<string name="cancel_upload">Cancelar subida</string>
|
||||
<string name="retry">Reintentar</string>
|
||||
<string name="download_failed">Descarga fallida</string>
|
||||
<string name="success">Éxito</string>
|
||||
|
|
@ -84,4 +84,5 @@
|
|||
<string name="bucket_size">Tamaño del bucket</string>
|
||||
<string name="file_count">Archivos</string>
|
||||
<string name="null_expiration_date">Debe establecer una fecha de expiración para compartir archivos</string>
|
||||
<string name="download_canceled">Descarga cancelada</string>
|
||||
</resources>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<string name="file_share">Share file</string>
|
||||
<string name="file_external">Open in</string>
|
||||
<string name="download_file">Download file</string>
|
||||
<string name="download_in_progress">Download in progress</string>
|
||||
<string name="cancel_download">Cancel download</string>
|
||||
<string name="download_success">File downloaded successfully</string>
|
||||
<string name="upload_file_tobucket">Upload file to this bucket</string>
|
||||
<string name="upload_folder_tobucket">Upload folder to this bucket</string>
|
||||
|
|
@ -37,9 +37,10 @@
|
|||
<string name="upload_prefix">Object prefix</string>
|
||||
<string name="no_file_selected">Please select a file</string>
|
||||
<string name="upload_success">File uploaded successfully</string>
|
||||
<string name="upload_in_progress">Upload in progress</string>
|
||||
<string name="cancel_upload">Cancel Upload</string>
|
||||
<string name="retry">Retry</string>
|
||||
<string name="download_failed">Download failed</string>
|
||||
<string name="download_canceled">Download canceled</string>
|
||||
<string name="success">Success</string>
|
||||
<string name="object_info">Properties</string>
|
||||
<string name="file_size">File Size</string>
|
||||
|
|
|
|||
Loading…
Reference in a new issue