new release

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

.idea/gradle.xml

@@ -4,16 +4,26 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
+        <option name="externalProjectPath" value="/data/2/asgardius/StudioProjects/s3manager" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
-            <option value="$PROJECT_DIR$" />
+            <option value="/data/2/asgardius/StudioProjects/s3manager" />
-            <option value="$PROJECT_DIR$/app" />
+            <option value="/data/2/asgardius/StudioProjects/s3manager/app" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
+      </GradleProjectSettings>
+      <GradleProjectSettings>
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="modules">
+          <set>
+            <option value="/data/2/asgardius/StudioProjects/s3manager" />
+            <option value="/data/2/asgardius/StudioProjects/s3manager/app" />
+          </set>
+        </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

.idea/migrations.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="/data/2/asgardius/StudioProjects/s3manager" />
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -28,7 +27,8 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

.idea/other.xml

@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="direct_access_persist.xml">
+    <option name="deviceSelectionList">
+      <list>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="27" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="F01L" />
+          <option name="id" value="F01L" />
+          <option name="manufacturer" value="FUJITSU" />
+          <option name="name" value="F-01L" />
+          <option name="screenDensity" value="360" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1280" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="28" />
+          <option name="brand" value="DOCOMO" />
+          <option name="codename" value="SH-01L" />
+          <option name="id" value="SH-01L" />
+          <option name="manufacturer" value="SHARP" />
+          <option name="name" value="AQUOS sense2 SH-01L" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2160" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a51" />
+          <option name="id" value="a51" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy A51" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="b0q" />
+          <option name="id" value="b0q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S22 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="32" />
+          <option name="brand" value="google" />
+          <option name="codename" value="bluejay" />
+          <option name="id" value="bluejay" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="crownqlteue" />
+          <option name="id" value="crownqlteue" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Note9" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2220" />
+          <option name="screenY" value="1080" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="dm3q" />
+          <option name="id" value="dm3q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S23 Ultra" />
+          <option name="screenDensity" value="600" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3088" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix" />
+          <option name="id" value="felix" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="felix_camera" />
+          <option name="id" value="felix_camera" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Fold (Camera-enabled)" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="2208" />
+          <option name="screenY" value="1840" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="gts8uwifi" />
+          <option name="id" value="gts8uwifi" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Tab S8 Ultra" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1848" />
+          <option name="screenY" value="2960" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="husky" />
+          <option name="id" value="husky" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8 Pro" />
+          <option name="screenDensity" value="390" />
+          <option name="screenX" value="1008" />
+          <option name="screenY" value="2244" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="java" />
+          <option name="id" value="java" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="G20" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1600" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="lynx" />
+          <option name="id" value="lynx" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="31" />
+          <option name="brand" value="google" />
+          <option name="codename" value="oriole" />
+          <option name="id" value="oriole" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 6" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="panther" />
+          <option name="id" value="panther" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 7" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="q5q" />
+          <option name="id" value="q5q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy Z Fold5" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1812" />
+          <option name="screenY" value="2176" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="r11" />
+          <option name="id" value="r11" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Watch" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="384" />
+          <option name="screenY" value="384" />
+          <option name="type" value="WEAR_OS" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="30" />
+          <option name="brand" value="google" />
+          <option name="codename" value="redfin" />
+          <option name="id" value="redfin" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 5" />
+          <option name="screenDensity" value="440" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="google" />
+          <option name="codename" value="shiba" />
+          <option name="id" value="shiba" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="33" />
+          <option name="brand" value="google" />
+          <option name="codename" value="tangorpro" />
+          <option name="id" value="tangorpro" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel Tablet" />
+          <option name="screenDensity" value="320" />
+          <option name="screenX" value="1600" />
+          <option name="screenY" value="2560" />
+        </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="29" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="x1q" />
+          <option name="id" value="x1q" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="Galaxy S20" />
+          <option name="screenDensity" value="480" />
+          <option name="screenX" value="1440" />
+          <option name="screenY" value="3200" />
+        </PersistentDeviceSelectionData>
+      </list>
+    </option>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="/data/2/asgardius/StudioProjects/s3manager" vcs="Git" />
+  </component>
+</project>

README.md

@@ -2,8 +2,6 @@
 
 File Explorer to manage servers compatible with S3 Object Storage Protocol
 
-
-
 Current feature list
 
 * Audio and Video playback (opus, ogg, oga, mp3, m4a, flac, mka, mkv, mp4, m4v, webm)
@@ -36,13 +34,9 @@ This app is a work in progress, so it have some bugs that need to be fixed
 
 You need to setup a pdf.js server to use pdf viewer. Just download latest version from official website and upload to any web server with ssl on same root domain than S3 server (can be same subdomain or a different one). Then set url to pdfjs root folder like https://example.com/pdfjs-dist
 
-[<img src="app-store-badges/fdroid.png"
-    alt="Get it on F-Droid"
-    height="80">](https://f-droid.org/packages/asgardius.page.s3manager/)
-
 [<img src="app-store-badges/play-store.png"
     alt="Get it on Google Play"
-    height="80">](https://play.google.com/store/apps/details?id=asgardius.page.s3manager)
+    height="80">](https://play.google.com/store/apps/details?id=asgardius.page.s3managermk2)
 
 F-droid release may take a few days to get updated [More info here](https://www.f-droid.org/en/docs/FAQ_-_App_Developers/#ive-published-a-new-release-why-is-it-not-in-the-repository)
 
@@ -50,7 +44,7 @@ F-droid release may take a few days to get updated [More info here](https://www.
 
 You can get help at https://forum.asgardius.company/t/s3-manager
 
-You can find app documentation at https://wiki.asgardius.company/shelves/asgardius-s3-manager-english (english) or https://wiki.asgardius.company/shelves/asgardius-s3-manager-espanol (spanish)
+You can find app documentation at https://wiki-en.asgardius.company/index.php?title=Asgardius_S3_Manager_Documentation (english) or https://wiki-es.asgardius.company/index.php?title=Documentacion_Asgardius_S3_Manager (spanish)
 
 Supported languages
 
@@ -67,7 +61,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 **

app/build.gradle

@@ -6,11 +6,11 @@ android {
     compileSdk 33
 
     defaultConfig {
-        applicationId "asgardius.page.s3manager"
+        applicationId "asgardius.page.s3managermk2"
         minSdk 21
-        targetSdk 33
+        targetSdk 34
-        versionCode 79
+        versionCode 2
-        versionName "0.9.3"
+        versionName "0.11.1"
         setProperty("archivesBaseName", "s3-manager-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,6 +29,7 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'asgardius.page.s3managermk2'
 }
 
 dependencies {
@@ -36,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.4"
+    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.64.0"
+    def aws_version = "2.76.1"
     implementation "com.amazonaws:aws-android-sdk-s3:$aws_version"
     implementation ("com.amazonaws:aws-android-sdk-mobile-client:$aws_version") { transitive = true }
     // END AWS DEPENDENCIES

app/src/androidTest/java/asgardius/page/s3managermk2/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.content.Context;
 

app/src/main/AndroidManifest.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    android:installLocation="auto"
-    package="asgardius.page.s3manager" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
         android:name="android.permission.READ_PHONE_STATE"
         tools:node="remove" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:allowBackup="true"
@@ -59,6 +58,7 @@
         <activity
             android:name=".Downloader"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:documentLaunchMode="always"
             android:exported="false" />
         <activity
             android:name=".CreateBucket"
@@ -68,19 +68,23 @@
         <activity
             android:name=".Uploader"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:documentLaunchMode="always"
             android:exported="false" />
         <activity
             android:name=".ImageViewer"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false"
+            android:documentLaunchMode="always"
             android:hardwareAccelerated="false" />
         <activity
             android:name=".TextViewer"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:documentLaunchMode="always"
             android:exported="false" />
         <activity
             android:name=".WebBrowser"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:documentLaunchMode="always"
             android:exported="false" />
         <activity
             android:name=".AccountAdd"
@@ -105,6 +109,7 @@
             android:exported="false"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
+            android:documentLaunchMode="always"
             android:supportsPictureInPicture="true" />
         <activity
             android:name=".MainActivity"

app/src/main/assets/about.htm

@@ -9,14 +9,14 @@
 <H3>Created by Page Asgardius</H3>
 <H3>Libraries used in this app</H3>
 <ul>
-    <li>Amazon Web Services SDK 2.64.0</li>
+    <li>Amazon Web Services SDK 2.76.1</li>
-    <li>ExoPlayer 2.18.4</li>
+    <li>ExoPlayer 2.19.1</li>
     <li>ZoomLayout 1.9.0</li>
     <li>Adwaita Icon Theme for GNOME 43</li>
     <li>pdf.js</li>
 </ul>
 <H3>This software released under GNU General Public License 3</H3>
-<p>You can find source code at https://patrice.asgardius.company/gitea/asgardius/s3manager
+<p>You can find source code at https://git.asgardius.company/asgardius/s3manager
 <br>
     You need to setup a pdf.js server to use pdf viewer. You can use https://office.asgardius.company/pdfjs or setup your own.
     <br>

app/src/main/java/asgardius/page/s3managermk2/AccountAdd.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;

app/src/main/java/asgardius/page/s3managermk2/Adapter.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/asgardius/page/s3managermk2/BucketPolicy.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.os.Bundle;
 import android.view.View;

app/src/main/java/asgardius/page/s3managermk2/BucketSelect.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;

app/src/main/java/asgardius/page/s3managermk2/CorsConfig.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.os.Bundle;
 import android.view.View;

app/src/main/java/asgardius/page/s3managermk2/CreateBucket.java

@@ -1,6 +1,5 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/asgardius/page/s3managermk2/Downloader.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import static android.content.ContentValues.TAG;
 

app/src/main/java/asgardius/page/s3managermk2/ImageViewer.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.annotation.SuppressLint;
 import android.graphics.drawable.Drawable;

app/src/main/java/asgardius/page/s3managermk2/MainActivity.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.content.DialogInterface;
 import android.content.Intent;

app/src/main/java/asgardius/page/s3managermk2/MyDbHelper.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;

app/src/main/java/asgardius/page/s3managermk2/ObjectInfo.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.os.Bundle;
 import android.view.View;

app/src/main/java/asgardius/page/s3managermk2/ObjectPolicy.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;

app/src/main/java/asgardius/page/s3managermk2/ObjectSelect.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
@@ -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<S3ObjectSummary> 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("/");

app/src/main/java/asgardius/page/s3managermk2/PolicyCheck.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;

app/src/main/java/asgardius/page/s3managermk2/RecyclerTouchListener.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.content.Context;
 import android.view.GestureDetector;

app/src/main/java/asgardius/page/s3managermk2/SdcardCheck.java

@@ -0,0 +1,21 @@
+package asgardius.page.s3managermk2;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+public class SdcardCheck {
+    public static boolean isInstalledOnSdCard(Context context) {
+
+        PackageManager pm = context.getPackageManager();
+        try {
+            PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0);
+            ApplicationInfo ai = pi.applicationInfo;
+            return (ai.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) == ApplicationInfo.FLAG_EXTERNAL_STORAGE;
+        } catch (PackageManager.NameNotFoundException e) {
+            // ignore
+        }
+        return false;
+    }
+}

app/src/main/java/asgardius/page/s3managermk2/Settings.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -11,17 +11,15 @@ import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 
 import java.io.File;
 
-import asgardius.page.s3manager.databinding.ActivitySettingsBinding;
+import asgardius.page.s3managermk2.databinding.ActivitySettingsBinding;
 
 public class Settings extends AppCompatActivity {
 
@@ -115,6 +113,7 @@ public class Settings extends AppCompatActivity {
                 try {
                     standaloneDatabaseProvider = new StandaloneDatabaseProvider(getApplicationContext());
                     SimpleCache.delete(new File(getApplicationContext().getFilesDir(), "media"), standaloneDatabaseProvider);
+                    SimpleCache.delete(new File(getApplicationContext().getExternalFilesDirs(null)[getApplicationContext().getExternalFilesDirs(null).length-1], "media"), standaloneDatabaseProvider);
                     standaloneDatabaseProvider.close();
                     Toast.makeText(getApplicationContext(),getResources().getString(R.string.clearcache_ok), Toast.LENGTH_SHORT).show();
                 } catch (Exception e) {

app/src/main/java/asgardius/page/s3managermk2/Share.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AppCompatActivity;
 

app/src/main/java/asgardius/page/s3managermk2/TextViewer.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.os.Build;
 import android.os.Bundle;

app/src/main/java/asgardius/page/s3managermk2/Uploader.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import static android.content.ContentValues.TAG;
 

app/src/main/java/asgardius/page/s3managermk2/VideoPlayer.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import android.app.AppOpsManager;
 import android.app.NotificationChannel;
@@ -127,10 +127,17 @@ public class VideoPlayer extends AppCompatActivity {
         mediaSessionConnector.setPlayer(player);
         mediaSession.setActive(true);
         evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize);
+        if(SdcardCheck.isInstalledOnSdCard(this)) {
+            simpleCache = new SimpleCache(
+                    new File(this.getExternalFilesDirs(null)[this.getExternalFilesDirs(null).length-1], "media"),
+                    evictor,
+                    standaloneDatabaseProvider);
+        } else {
             simpleCache = new SimpleCache(
                     new File(this.getFilesDir(), "media"),
                     evictor,
                     standaloneDatabaseProvider);
+        }
         playerView.setPlayer(player);
         control = new StyledPlayerView.ControllerVisibilityListener() {
             @Override
@@ -156,19 +163,8 @@ public class VideoPlayer extends AppCompatActivity {
         playerNotificationManager.setPlayer(player);
         if (isplaylist) {
             for (int i = 0; i < queue.size(); i++) {
-                if (names.get(i).endsWith(".m3u8")) {
                 MediaItem mediaItem = MediaItem.fromUri(Share.URLify(queue.get(i)));
                 player.addMediaItem(mediaItem);
-                } else {
-                    mediaSource = new ProgressiveMediaSource.Factory(
-                            new CacheDataSource.Factory()
-                                    .setCache(simpleCache)
-                                    .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
-                                            .setUserAgent("S3 Manager"))
-                                    .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                    ).createMediaSource(MediaItem.fromUri(Share.URLify(queue.get(i))));
-                    player.addMediaSource(mediaSource);
-                }
             }
             getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
             player.prepare();
@@ -178,19 +174,8 @@ public class VideoPlayer extends AppCompatActivity {
                 System.out.println("Playing m3u file");
             }
         } else {
-            if (title.endsWith(".m3u8")) {
             MediaItem mediaItem = MediaItem.fromUri(Share.URLify(videoURL));
             player.setMediaItem(mediaItem);
-            } else {
-                mediaSource = new ProgressiveMediaSource.Factory(
-                        new CacheDataSource.Factory()
-                                .setCache(simpleCache)
-                                .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
-                                        .setUserAgent("S3 Manager"))
-                                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                ).createMediaSource(MediaItem.fromUri(Share.URLify(videoURL)));
-                player.setMediaSource(mediaSource);
-            }
             player.prepare();
         }
         // Start the playback.
@@ -382,36 +367,14 @@ public class VideoPlayer extends AppCompatActivity {
         if (isplaylist) {
             player.clearMediaItems();
             for (int i = 0; i < queue.size(); i++) {
-                if (names.get(i).endsWith(".m3u8")) {
                 MediaItem mediaItem = MediaItem.fromUri(queue.get(i));
                 player.addMediaItem(mediaItem);
-                } else {
-                    mediaSource = new ProgressiveMediaSource.Factory(
-                            new CacheDataSource.Factory()
-                                    .setCache(simpleCache)
-                                    .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
-                                            .setUserAgent("S3 Manager"))
-                                    .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                    ).createMediaSource(MediaItem.fromUri(Uri.parse(queue.get(i))));
-                    player.addMediaSource(mediaSource);
-                }
             }
             player.prepare();
             player.seekTo(names.indexOf(title), 0);
         } else {
-            if (title.endsWith(".m3u8")) {
             MediaItem mediaItem = MediaItem.fromUri(videoURL);
             player.setMediaItem(mediaItem);
-            } else {
-                mediaSource = new ProgressiveMediaSource.Factory(
-                        new CacheDataSource.Factory()
-                                .setCache(simpleCache)
-                                .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
-                                        .setUserAgent("S3 Manager"))
-                                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                ).createMediaSource(MediaItem.fromUri(Uri.parse(videoURL)));
-                player.setMediaSource(mediaSource);
-            }
             player.prepare();
         }
         // Start the playback.

app/src/main/java/asgardius/page/s3managermk2/WebBrowser.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AppCompatActivity;
 

app/src/main/java/asgardius/page/s3managermk2/list_item.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AppCompatActivity;
 

app/src/main/res/layout/activity_settings.xml

@@ -20,7 +20,8 @@
                 android:layout_height="wrap_content"
                 android:text="@string/videocache"
                 android:textAlignment="center"
-                android:textSize="25sp"/>
+                android:textSize="25sp"
+                android:visibility="gone" />
 
             <EditText
                 android:id="@+id/videocache"
@@ -29,13 +30,15 @@
                 android:focusable="true"
                 android:hint="@string/videocache"
                 android:inputType="number"
-                android:textColorHint="?attr/colorOnSecondary"/>
+                android:textColorHint="?attr/colorOnSecondary"
+                android:visibility="gone" />
 
             <Button
                 android:id="@+id/clearcache"
                 android:layout_width="match_parent"
                 android:layout_height="70dp"
-                android:text="@string/clearcache" />
+                android:text="@string/clearcache"
+                android:visibility="gone" />
 
             <TextView
                 android:layout_width="match_parent"

app/src/test/java/asgardius/page/s3managermk2/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import org.junit.Test;
 

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 '7.4.2' apply false
+    id 'com.android.application' version '8.5.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.library' version '8.5.2' apply false
 }
 
 task clean(type: Delete) {

fastlane/metadata/android/en-US/changelogs/80.txt

@@ -0,0 +1 @@
+* Libraries updated

fastlane/metadata/android/en-US/changelogs/83.txt

@@ -0,0 +1 @@
+* Upgrade libraries

fastlane/metadata/android/en-US/changelogs/85.txt

@@ -0,0 +1 @@
+* Allow move app to SD Card

fastlane/metadata/android/en-US/changelogs/86.txt

@@ -0,0 +1,2 @@
+* Dependencies upgraded
+* Fixed large file list being truncate

fastlane/metadata/android/en-US/full_description.txt

@@ -46,7 +46,7 @@ Known supported providers
 
 <li>Amazon Web Services</li>
 <li>Scaleway Elements</li>
-<li>Wasabi Cloud</li>
+<li>Wasabi Cloud (Provider broke access control intentionally since March 13 2023)</li>
 <li>Backblaze B2</li>
 <li>Cloudflare R2 (partial)</li>
 <li>MinIO **</li>
@@ -60,9 +60,7 @@ Known not supported providers
 ** Extra steps required (read documentation)
 
 Please report all issues at https://forum.asgardius.company/t/s3-manager
-
+https://wiki-es.asgardius.company/index.php?title=Documentacion_Asgardius_S3_Manager
-You can find app documentation at https://wiki.asgardius.company/shelves/asgardius-s3-manager-english (english) or https://wiki.asgardius.company/shelves/asgardius-s3-manager-espanol (spanish)
+You can find app documentation at https://wiki-en.asgardius.company/index.php?title=Asgardius_S3_Manager_Documentation (english) or https://wiki-es.asgardius.company/index.php?title=Documentacion_Asgardius_S3_Manager (spanish)
-
-This app has nonfreenet antifeature because its compatibility list.
 
 You can use MinIO or Garage to have a FOSS selfhosted server to use with this app

gradle.properties

@@ -19,3 +19,5 @@ android.useAndroidX=true
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 27 12:12:23 MST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME