From a9ea4337c1088f8b2370cc3060a6dbc4950ced56 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Sun, 11 Sep 2022 13:13:49 -0700 Subject: [PATCH] new release --- README.md | 4 ++ app/build.gradle | 4 +- .../page/s3manager/ObjectSelect.java | 40 +++++++++++++------ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index cba0277..241f8fc 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,10 @@ Current feature list * Webpage viewer (htm, html) * Multiple account support * Open object in external web browser +* Create buckets +* Delete buckets +* Delete files +* Delete folders Known supported providers diff --git a/app/build.gradle b/app/build.gradle index 4b3c507..01fb8a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 24 targetSdk 32 - versionCode 5 - versionName "0.1.3" + versionCode 6 + versionName "0.1.4" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java index 1d51e42..d9a16a3 100644 --- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java +++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java @@ -210,24 +210,40 @@ public class ObjectSelect extends AppCompatActivity { explorer(Name.get(position).toString()); } else if (Img.get(position).equals(R.drawable.imagefile)) { //load media file - GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); - URL objectURL = s3client.generatePresignedUrl(request); - imageviewer(objectURL.toString()); + try { + GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); + URL objectURL = s3client.generatePresignedUrl(request); + imageviewer(objectURL.toString()); + } catch (Exception e) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + } } else if (Img.get(position).equals(R.drawable.textfile)) { //load media file - GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); - URL objectURL = s3client.generatePresignedUrl(request); - textviewer(objectURL.toString()); + try { + GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); + URL objectURL = s3client.generatePresignedUrl(request); + textviewer(objectURL.toString()); + } catch (Exception e) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + } } else if (Img.get(position).equals(R.drawable.webpage)) { //load media file - GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); - URL objectURL = s3client.generatePresignedUrl(request); - webbrowser(objectURL.toString()); + try { + GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); + URL objectURL = s3client.generatePresignedUrl(request); + webbrowser(objectURL.toString()); + } catch (Exception e) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + } } else if (Img.get(position).equals(R.drawable.audiofile) || Img.get(position).equals(R.drawable.videofile)) { //load media file - GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); - URL objectURL = s3client.generatePresignedUrl(request); - videoplayer(objectURL.toString()); + try { + GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()); + URL objectURL = s3client.generatePresignedUrl(request); + videoplayer(objectURL.toString()); + } catch (Exception e) { + Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show(); + } } else { Toast.makeText(ObjectSelect.this, getResources().getString(R.string.unsupported_file), Toast.LENGTH_SHORT).show(); }