From dbfcb1e9f1a6eeccd29519607ea9da89fad8af64 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Thu, 7 Dec 2023 05:43:46 -0700 Subject: [PATCH] new release --- .idea/misc.xml | 2 +- README.md | 2 +- app/build.gradle | 8 +++--- app/src/main/assets/about.htm | 4 +-- .../page/s3manager/ObjectSelect.java | 28 ++++++++++--------- build.gradle | 4 +-- .../metadata/android/en-US/changelogs/86.txt | 2 ++ .../android/en-US/full_description.txt | 2 +- 8 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/86.txt diff --git a/.idea/misc.xml b/.idea/misc.xml index 6f98af3..05f13e4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -27,7 +27,7 @@ - + diff --git a/README.md b/README.md index 81f3fb0..9b0c0e4 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ Known supported providers * Amazon Web Services * Scaleway Elements -* Wasabi Cloud +* Wasabi Cloud (Provider broke access control intentionally since March 13 2023) * Backblaze B2 * Cloudflare R2 (partial) * MinIO ** diff --git a/app/build.gradle b/app/build.gradle index e448e19..a67ab27 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "asgardius.page.s3manager" minSdk 21 targetSdk 33 - versionCode 85 - versionName "0.10.0" + versionCode 86 + versionName "0.10.1" setProperty("archivesBaseName", "s3-manager-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -37,13 +37,13 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - def exoplayer_version = "2.18.7" + def exoplayer_version = "2.19.1" implementation "com.google.android.exoplayer:exoplayer:$exoplayer_version" implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version" implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation"com.otaliastudios:zoomlayout:1.9.0" // BEGIN AWS DEPENDENCIES - def aws_version = "2.71.0" + def aws_version = "2.73.0" implementation "com.amazonaws:aws-android-sdk-s3:$aws_version" implementation ("com.amazonaws:aws-android-sdk-mobile-client:$aws_version") { transitive = true } // END AWS DEPENDENCIES diff --git a/app/src/main/assets/about.htm b/app/src/main/assets/about.htm index 81c46a7..192d017 100644 --- a/app/src/main/assets/about.htm +++ b/app/src/main/assets/about.htm @@ -9,8 +9,8 @@

Created by Page Asgardius

Libraries used in this app

    -
  • Amazon Web Services SDK 2.71.0
    • -
  • ExoPlayer 2.18.7
    • +
  • Amazon Web Services SDK 2.73.0
    • +
  • ExoPlayer 2.19.1
  • ZoomLayout 1.9.0
  • Adwaita Icon Theme for GNOME 43
  • pdf.js
    • diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java index 32a0c65..365ed1a 100644 --- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java +++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java @@ -127,19 +127,6 @@ public class ObjectSelect extends AppCompatActivity { //i++; } - while (result.isTruncated()) { - result = s3client.listNextBatchOfObjects (result); - od = result.getCommonPrefixes(); - for (String os : od) { - filename = os.split("/"); - if (filename.length == treelevel+1) { - object.add(filename[treelevel]+"/"); - } - - //i++; - } - - } //This get file list List ob = result.getObjectSummaries(); for (S3ObjectSummary os : ob) { @@ -153,8 +140,23 @@ public class ObjectSelect extends AppCompatActivity { //i++; } + + //Get next batch while (result.isTruncated()) { result = s3client.listNextBatchOfObjects (result); + + //This get folder list + od = result.getCommonPrefixes(); + for (String os : od) { + filename = os.split("/"); + if (filename.length == treelevel+1) { + object.add(filename[treelevel]+"/"); + } + + //i++; + } + + //This get file list ob = result.getObjectSummaries(); for (S3ObjectSummary os : ob) { filename = os.getKey().split("/"); diff --git a/build.gradle b/build.gradle index 8c91de5..5f4fc7d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.2' apply false - id 'com.android.library' version '8.0.2' apply false + id 'com.android.application' version '8.1.4' apply false + id 'com.android.library' version '8.1.4' apply false } task clean(type: Delete) { diff --git a/fastlane/metadata/android/en-US/changelogs/86.txt b/fastlane/metadata/android/en-US/changelogs/86.txt new file mode 100644 index 0000000..d02ee7d --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/86.txt @@ -0,0 +1,2 @@ +* Dependencies upgraded +* Fixed large file list being truncate diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 6c1573f..f011b5b 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -46,7 +46,7 @@ Known supported providers
  • Amazon Web Services
  • Scaleway Elements
    • -
  • Wasabi Cloud
    • +
  • Wasabi Cloud (Provider broke access control intentionally since March 13 2023)
  • Backblaze B2
  • Cloudflare R2 (partial)
  • MinIO **