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,15 +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="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="Android Studio default JDK" 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

@@ -1,9 +1,7 @@
-# s3manager
+# Asgardius S3 Manager
 
 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)
@@ -18,11 +16,15 @@ Current feature list
 * Delete folders
 * File upload
 * File download
+* Download folder content
+* Upload folder content
 * pdf file reader using user provided pdf.js server
 * file sharing links
 * get object info
 * get bucket info
 * Set CORS policy
+* Set bucket as public or private
+* Set object as public or private
 
 Planned feature list
 
@@ -32,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)
 
@@ -46,6 +44,8 @@ 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-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
 
 * English
@@ -61,10 +61,15 @@ Known supported providers
 
 * Amazon Web Services
 * Scaleway Elements
-* Oracle Cloud (partial)
+* Wasabi Cloud (Provider broke access control intentionally since March 13 2023)
-* Wasabi Cloud
+* Backblaze B2
-* MinIO
+* Cloudflare R2 (partial)
+* MinIO **
+* Garage **
 
 Known not supported providers
 
-* Google Cloud
+* Google Cloud (Not compatible with S3v4)
+* Oracle Cloud (compatibility issues with S3v4)
+
+** Extra steps required (read documentation)

app/build.gradle

@@ -6,11 +6,11 @@ android {
     compileSdk 33
 
     defaultConfig {
-        applicationId "asgardius.page.s3manager"
+        applicationId "asgardius.page.s3managermk2"
-        minSdk 23
+        minSdk 21
-        targetSdk 33
+        targetSdk 34
-        versionCode 62
+        versionCode 2
-        versionName "0.7.1"
+        versionName "0.11.1"
         setProperty("archivesBaseName", "s3-manager-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,24 +29,25 @@ android {
     buildFeatures {
         viewBinding true
     }
+    namespace 'asgardius.page.s3managermk2'
 }
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    def exoplayer_version = "2.18.2"
+    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.60.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
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }

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"
@@ -19,11 +18,18 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AsgardiusS3Manager"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        android:usesCleartextTraffic="true" >
+        <activity
+            android:name=".ObjectPolicy"
+            android:exported="false" />
+        <activity
+            android:name=".BucketPolicy"
+            android:exported="false" />
         <activity
             android:name=".CorsConfig"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false">
+            android:exported="false" >
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -32,7 +38,7 @@
             android:name=".Settings"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false"
-            android:label="@string/settings">
+            android:label="@string/settings" >
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -40,7 +46,7 @@
         <activity
             android:name=".ObjectInfo"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false">
+            android:exported="false" >
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -52,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"
@@ -61,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:hardwareAccelerated="false"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false" />
+            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"
@@ -98,11 +109,12 @@
             android:exported="false"
             android:launchMode="singleTask"
             android:resizeableActivity="true"
+            android:documentLaunchMode="always"
             android:supportsPictureInPicture="true" />
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="true">
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

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.60.0</li>
+    <li>Amazon Web Services SDK 2.76.1</li>
-    <li>ExoPlayer 2.18.2</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,8 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
-
-import static com.amazonaws.regions.Regions.US_EAST_1;
-
-import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
@@ -12,6 +8,8 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Region;
@@ -21,7 +19,6 @@ import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.Bucket;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class AccountAdd extends AppCompatActivity {
@@ -90,11 +87,6 @@ public class AccountAdd extends AppCompatActivity {
                     style = "0";
                 }
                 MyDbHelper dbHelper = new MyDbHelper(AccountAdd.this);
-                if (alias.equals("") && endpoint.equals("") && username.equals(getResources().getString(R.string.access_key))) {
-                    endpoint = getResources().getString(R.string.endpoint_url);
-                    alias = "Google Test";
-                    pdfendpoint = getResources().getString(R.string.pdf_reader);
-                }
                 SQLiteDatabase db = dbHelper.getWritableDatabase();
                 if (alias.equals("") || endpoint.equals("") || username.equals("") || password.equals("")) {
                     Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountadd_null), Toast.LENGTH_SHORT).show();
@@ -108,6 +100,9 @@ public class AccountAdd extends AppCompatActivity {
                         if (location.equals("")) {
                             location = "us-east-1";
                         }
+                        if(endpoint.endsWith("/")) {
+                            endpoint = endpoint.substring(0, endpoint.length()-1);
+                        }
                         if (edit) {
                             db.execSQL("UPDATE account SET id=\""+alias+"\", endpoint=\""+endpoint+"\", username=\""+username+"\", password=\""+password+"\", region=\""+location+"\", pdfendpoint=\""+pdfendpoint+"\", style=\""+style+"\" WHERE id=\""+id+"\"");
                             Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountsave_success), Toast.LENGTH_SHORT).show();
@@ -133,10 +128,6 @@ public class AccountAdd extends AppCompatActivity {
                 username = aupick.getText().toString();
                 password = appick.getText().toString();
                 location = arpick.getText().toString();
-                if (alias.equals("") && endpoint.equals("") && username.equals(getResources().getString(R.string.access_key))) {
-                    endpoint = getResources().getString(R.string.endpoint_url);
-                    alias = "Google Test";
-                }
                 if (alias.equals("") || endpoint.equals("") || username.equals("") || password.equals("")) {
                     Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountadd_null), Toast.LENGTH_SHORT).show();
                 } else if (endpoint.startsWith("http://")) {
@@ -150,10 +141,14 @@ public class AccountAdd extends AppCompatActivity {
                         public void run() {
                             try  {
                                 //Your code goes here
-                                if (location.equals("")) {
+                                if (endpoint.contains(getResources().getString(R.string.aws_endpoint)) || location.equals("")) {
-                                    location = "us-east-1";
-                                }
                                     region = Region.getRegion("us-east-1");
+                                } else {
+                                    region = Region.getRegion(location);
+                                }
+                                if(endpoint.endsWith("/")) {
+                                    endpoint = endpoint.substring(0, endpoint.length()-1);
+                                }
                                 S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
                                 s3ClientOptions.setPathStyleAccess(pathstyle.isChecked());
                                 myCredentials = new BasicAWSCredentials(username, password);

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;
@@ -7,10 +7,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.ArrayList;
-import asgardius.page.s3manager.BucketSelect;
 
 public class Adapter extends RecyclerView.Adapter<Adapter.ViewHolder>{
     ArrayList Img, Name;

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

@@ -0,0 +1,192 @@
+package asgardius.page.s3managermk2;
+
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.regions.Region;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.S3ClientOptions;
+
+public class BucketPolicy extends AppCompatActivity {
+    String username, password, endpoint, bucket, location;
+    Region region;
+    S3ClientOptions s3ClientOptions;
+    AWSCredentials myCredentials;
+    AmazonS3 s3client;
+    boolean style, publicbucket;
+    ProgressBar simpleProgressBar;
+    TextView permission;
+    Button setpublic, setprivate;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_bucket_policy);
+        simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
+        permission = (TextView) findViewById(R.id.permission);
+        endpoint = getIntent().getStringExtra("endpoint");
+        username = getIntent().getStringExtra("username");
+        password = getIntent().getStringExtra("password");
+        bucket = getIntent().getStringExtra("bucket");
+        style = getIntent().getBooleanExtra("style", false);
+        location = getIntent().getStringExtra("region");
+        getSupportActionBar().setTitle(bucket+"/");
+        region = Region.getRegion(location);
+        s3ClientOptions = S3ClientOptions.builder().build();
+        myCredentials = new BasicAWSCredentials(username, password);
+        try {
+            s3client = new AmazonS3Client(myCredentials, region);
+        } catch (Exception e) {
+            Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
+        }
+        s3client.setEndpoint(endpoint);
+        s3ClientOptions.setPathStyleAccess(style);
+        s3client.setS3ClientOptions(s3ClientOptions);
+        setprivate = (Button)findViewById(R.id.set_private);
+        setpublic = (Button)findViewById(R.id.set_public);
+        Thread getPolicy = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    String policy = s3client.getBucketPolicy(bucket).getPolicyText();
+                    publicbucket = policy.contains("arn:aws:s3:::"+bucket+"/*") && policy.contains("s3:GetObject");
+                    //System.out.println(policy);
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            //Your code goes here
+                            if(publicbucket){
+                                permission.setText(getResources().getString(R.string.public_bucket));
+                            } else {
+                                permission.setText(getResources().getString(R.string.custom_policy));
+                                setpublic.setVisibility(View.VISIBLE);
+                            }
+                            setprivate.setVisibility(View.VISIBLE);
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            if(e.toString().contains("NoSuchBucketPolicy")) {
+                                permission.setText(getResources().getString(R.string.private_bucket));
+                                setpublic.setVisibility(View.VISIBLE);
+                                simpleProgressBar.setVisibility(View.INVISIBLE);
+                            }
+                            else {
+                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                                finish();
+                            }
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        getPolicy.start();
+        setpublic.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view) {
+                //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
+                setPublic();
+            }
+        });
+        setprivate.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view) {
+                //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
+                setPrivate();
+            }
+        });
+    }
+    private void setPublic() {
+        Thread setPublic = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    String policy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:GetBucketLocation\",\"s3:ListBucket\"],\"Resource\":[\"arn:aws:s3:::"
+                            +bucket+"\"]},{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:GetObject\"],\"Resource\":[\"arn:aws:s3:::"+bucket+"/*\"]}]}";
+                    s3client.setBucketPolicy(bucket, policy);
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        setPublic.start();
+    }
+
+    private void setPrivate() {
+        Thread setPrivate = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    s3client.deleteBucketPolicy(bucket);
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        setPrivate.start();
+    }
+}

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

@@ -1,10 +1,11 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import android.app.Activity;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -38,7 +39,7 @@ public class BucketSelect extends AppCompatActivity {
     ArrayList Name;
     ArrayList Img;
     RecyclerView recyclerView;
-    String username, password, endpoint, prefix, location, file, pdfendpoint;
+    String username, password, endpoint, prefix, location, pdfendpoint;
     boolean style, isplaylist;
     Region region;
     S3ClientOptions s3ClientOptions;
@@ -63,7 +64,11 @@ public class BucketSelect extends AppCompatActivity {
         isplaylist = getIntent().getBooleanExtra("isplaylist", false);
         prefix = "";
         setContentView(R.layout.activity_bucket_select);
+        if (endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
             region = Region.getRegion("us-east-1");
+        } else {
+            region = Region.getRegion(location);
+        }
         s3ClientOptions = S3ClientOptions.builder().build();
         s3ClientOptions.setPathStyleAccess(style);
         myCredentials = new BasicAWSCredentials(username, password);
@@ -184,6 +189,8 @@ public class BucketSelect extends AppCompatActivity {
                                 copyName(Name.get(position).toString());
                             } else if (menuItem.getTitle() == getResources().getString(R.string.cors_config)) {
                                 corsConfig(Name.get(position).toString());
+                            } else if (menuItem.getTitle() == getResources().getString(R.string.bucket_policy)) {
+                                policyConfig(Name.get(position).toString());
                             } else if (menuItem.getTitle() == getResources().getString(R.string.file_del)) {
                                 //Toast.makeText(BucketSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
                                 delete(prefix + Name.get(position).toString());
@@ -298,7 +305,7 @@ public class BucketSelect extends AppCompatActivity {
 
                                         @Override
                                         public void run() {
-                                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                         }
                                     });
                                     //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -353,7 +360,8 @@ public class BucketSelect extends AppCompatActivity {
         intent.putExtra("password", password);
         intent.putExtra("region", location);
         intent.putExtra("style", style);
-        startActivity(intent);
+        //startActivity(intent);
+        ((Activity) this).startActivityForResult(intent, 25);
     }
 
     private void download(String bucket) {
@@ -382,6 +390,18 @@ public class BucketSelect extends AppCompatActivity {
         startActivity(intent);
     }
 
+    private void policyConfig(String bucket) {
+        Intent intent = new Intent(this, BucketPolicy.class);
+        intent.putExtra("endpoint", endpoint);
+        intent.putExtra("username", username);
+        intent.putExtra("password", password);
+        intent.putExtra("bucket", bucket);
+        intent.putExtra("region", location);
+        intent.putExtra("style", style);
+        intent.putExtra("pdfendpoint", pdfendpoint);
+        startActivity(intent);
+    }
+
     public void copyName (String name) {
         ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
         ClipData clip = ClipData.newPlainText("name", name);
@@ -390,4 +410,15 @@ public class BucketSelect extends AppCompatActivity {
             Toast.makeText(getApplicationContext(),getResources().getString(R.string.copy_ok), Toast.LENGTH_SHORT).show();
         }
     }
+
+    public void onActivityResult(int requestCode, int resultCode, final Intent resultData) {
+        // The ACTION_OPEN_DOCUMENT intent was sent with the request code OPEN_DIRECTORY_REQUEST_CODE.
+        // If the request code seen here doesn't match, it's the response to some other intent,
+        // and the below code shouldn't run at all.
+        super.onActivityResult(requestCode, resultCode, resultData);
+        if(requestCode == 25 && resultCode == 25)  {
+            recreate();
+        }
+    }
+
 }

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

@@ -1,13 +1,14 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
-
-import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Region;
@@ -16,9 +17,6 @@ import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.BucketCrossOriginConfiguration;
 import com.amazonaws.services.s3.model.CORSRule;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -26,12 +24,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CorsConfig extends AppCompatActivity {
-    String username, password, endpoint, bucket, location, title;
+    String username, password, endpoint, bucket, location;
     URI pdfendpoint;
     Region region;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
     AmazonS3 s3client;
+    ProgressBar simpleProgressBar;
     BucketCrossOriginConfiguration bucketcors;
     boolean style;
     boolean allorigins, pdfcompatible, found = false;
@@ -43,8 +42,8 @@ public class CorsConfig extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_cors_config);
+        simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
         endpoint = getIntent().getStringExtra("endpoint");
-        title = getIntent().getStringExtra("title");
         username = getIntent().getStringExtra("username");
         password = getIntent().getStringExtra("password");
         bucket = getIntent().getStringExtra("bucket");
@@ -66,7 +65,7 @@ public class CorsConfig extends AppCompatActivity {
         try {
             s3client = new AmazonS3Client(myCredentials, region);
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
         }
         s3client.setEndpoint(endpoint);
         s3ClientOptions.setPathStyleAccess(style);
@@ -98,6 +97,7 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
                             if (allorigins) {
                                 origins.setText(getResources().getString(R.string.cors_all));
                                 deletecors.setVisibility(View.VISIBLE);
@@ -124,7 +124,7 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                         }
                     });
                     //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -137,6 +137,7 @@ public class CorsConfig extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
                 setAllowall();
             }
         });
@@ -144,6 +145,7 @@ public class CorsConfig extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
                 setAllowpdf();
             }
         });
@@ -151,12 +153,13 @@ public class CorsConfig extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
                 setDeletecors();
             }
         });
     }
 
-    public void setAllowall() {
+    private void setAllowall() {
         Thread addAll = new Thread(new Runnable() {
 
             @Override
@@ -175,7 +178,7 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.cors_ok), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
                             finish();
                         }
                     });
@@ -186,7 +189,8 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.cors_error), Toast.LENGTH_SHORT).show();
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
                         }
                     });
                     //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -196,7 +200,7 @@ public class CorsConfig extends AppCompatActivity {
         addAll.start();
     }
 
-    public void setAllowpdf() {
+    private void setAllowpdf() {
         Thread addPdf = new Thread(new Runnable() {
 
             @Override
@@ -215,7 +219,7 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.cors_ok), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
                             finish();
                         }
                     });
@@ -226,7 +230,8 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.cors_error), Toast.LENGTH_SHORT).show();
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
                         }
                     });
                     //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -236,7 +241,7 @@ public class CorsConfig extends AppCompatActivity {
         addPdf.start();
     }
 
-    public void setDeletecors() {
+    private void setDeletecors() {
         Thread delCors = new Thread(new Runnable() {
 
             @Override
@@ -249,7 +254,7 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.cors_ok), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
                             finish();
                         }
                     });
@@ -260,7 +265,8 @@ public class CorsConfig extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.cors_error), Toast.LENGTH_SHORT).show();
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
                         }
                     });
                     //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();

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

@@ -1,9 +1,5 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
 
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.content.Intent;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -11,19 +7,14 @@ import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Region;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
-import com.amazonaws.services.s3.model.DeleteObjectsRequest;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
-
-import java.util.ArrayList;
-import java.util.List;
 
 public class CreateBucket extends AppCompatActivity {
     String username, password, endpoint, bucket, location;
@@ -75,8 +66,10 @@ public class CreateBucket extends AppCompatActivity {
                                     @Override
                                     public void run() {
                                         // Sending reference and data to Adapter
+                                        setResult(25);
                                         Toast.makeText(getApplicationContext(),getResources().getString(R.string.create_bucket_success), Toast.LENGTH_SHORT).show();
-                                        mainmenu();
+                                        finish();
+                                        //mainmenu();
 
                                     }
                                 });
@@ -89,7 +82,7 @@ public class CreateBucket extends AppCompatActivity {
 
                                     @Override
                                     public void run() {
-                                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                     }
                                 });
                                 //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -106,12 +99,12 @@ public class CreateBucket extends AppCompatActivity {
 
     }
 
-    private void mainmenu() {
+    /*private void mainmenu() {
 
         Intent intent = new Intent(this, MainActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.putExtra("EXIT", true);
         startActivity(intent);
 
-    }
+    }*/
 }

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;
 
@@ -288,6 +288,19 @@ public class Downloader extends AppCompatActivity {
     }
 
     @Override
+
+    public void onDestroy() {
+        if (!mWifiLock.isHeld()) {
+            mWifiLock.acquire();
+            //System.out.println("WifiLock acquired");
+        }
+        if (!mWakeLock.isHeld()) {
+            mWakeLock.acquire();
+            //System.out.println("WakeLock acquired");
+        }
+        super.onDestroy();
+    }
+
     public void onActivityResult(int requestCode, int resultCode, final Intent resultData) {
         // The ACTION_OPEN_DOCUMENT intent was sent with the request code OPEN_DIRECTORY_REQUEST_CODE.
         // If the request code seen here doesn't match, it's the response to some other intent,

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

@@ -1,22 +1,20 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
-
-import androidx.appcompat.app.AppCompatActivity;
 
 import android.annotation.SuppressLint;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
-import android.widget.ImageView;
+import android.view.WindowManager;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.otaliastudios.zoom.ZoomImageView;
 
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
 import java.net.URL;
-import java.util.stream.Collectors;
 
 public class ImageViewer extends AppCompatActivity {
     String videoURL, title;
@@ -71,7 +69,7 @@ public class ImageViewer extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                             finish();
                         }
                     });
@@ -80,6 +78,9 @@ public class ImageViewer extends AppCompatActivity {
             }
         });
         imgread.start();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
         iv.setOnTouchListener((v, event) -> {
 
             if (event.getAction() == MotionEvent.ACTION_DOWN) {

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,26 +1,23 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
-
-import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 import android.view.View;
-import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.amazonaws.auth.AWSCredentials;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.regions.Region;
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
-import com.amazonaws.services.s3.model.Bucket;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class ObjectInfo extends AppCompatActivity {
@@ -67,7 +64,7 @@ public class ObjectInfo extends AppCompatActivity {
         try {
             s3client = new AmazonS3Client(myCredentials, region);
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
         }
         s3client.setEndpoint(endpoint);
         s3ClientOptions.setPathStyleAccess(style);
@@ -140,7 +137,7 @@ public class ObjectInfo extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                         }
                     });
                     //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();

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

@@ -0,0 +1,260 @@
+package asgardius.page.s3managermk2;
+
+import androidx.appcompat.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicAWSCredentials;
+import com.amazonaws.regions.Region;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3Client;
+import com.amazonaws.services.s3.S3ClientOptions;
+
+public class ObjectPolicy extends AppCompatActivity {
+    String username, password, endpoint, bucket, location, filename, title, policy;
+    Region region;
+    S3ClientOptions s3ClientOptions;
+    AWSCredentials myCredentials;
+    AmazonS3 s3client;
+    boolean style, publicbucket, publicobject, parent;
+    ProgressBar simpleProgressBar;
+    TextView permission;
+    Button setpublic, setprivate;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_object_policy);
+        simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
+        permission = (TextView) findViewById(R.id.permission);
+        endpoint = getIntent().getStringExtra("endpoint");
+        filename = getIntent().getStringExtra("filename");
+        username = getIntent().getStringExtra("username");
+        password = getIntent().getStringExtra("password");
+        bucket = getIntent().getStringExtra("bucket");
+        title = getIntent().getStringExtra("title");
+        style = getIntent().getBooleanExtra("style", false);
+        location = getIntent().getStringExtra("region");
+        getSupportActionBar().setTitle(title);
+        region = Region.getRegion(location);
+        s3ClientOptions = S3ClientOptions.builder().build();
+        myCredentials = new BasicAWSCredentials(username, password);
+        try {
+            s3client = new AmazonS3Client(myCredentials, region);
+        } catch (Exception e) {
+            Toast.makeText(getApplicationContext(), e.toString(), Toast.LENGTH_SHORT).show();
+        }
+        s3client.setEndpoint(endpoint);
+        s3ClientOptions.setPathStyleAccess(style);
+        s3client.setS3ClientOptions(s3ClientOptions);
+        setprivate = (Button)findViewById(R.id.set_private);
+        setpublic = (Button)findViewById(R.id.set_public);
+        Thread getPolicy = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    policy = s3client.getBucketPolicy(bucket).getPolicyText();
+                    publicbucket = policy.contains("arn:aws:s3:::"+bucket+"/*") && policy.contains("s3:GetObject");
+                    publicobject = false;
+                    parent = true;
+                    if(!publicbucket && policy.contains("s3:GetObject")) {
+                        if((policy.contains("\"arn:aws:s3:::"+bucket+"/"+filename+"\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+filename+"*\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+filename+"**\"")) && policy.contains("s3:GetObject")) {
+                            publicobject = true;
+                            parent = false;
+                        } else {
+                            String[] path = filename.split("/");
+                            String filepath = "";
+                            for (int i = 0; i < path.length-1; i++) {
+                                filepath = filepath+path[i]+"/";
+                                //System.out.println(filepath);
+                                if(policy.contains("\"arn:aws:s3:::"+bucket+"/"+filepath+"*\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+filepath+"**\"")) {
+                                    publicobject = true;
+                                    i = path.length;
+                                }
+                            }
+                        }
+                    }
+                    //System.out.println(policy);
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            //Your code goes here
+                            if(publicbucket){
+                                permission.setText(getResources().getString(R.string.public_object));
+                                setprivate.setEnabled(false);
+                                setprivate.setText(getResources().getString(R.string.parent_policy));
+                                setprivate.setVisibility(View.VISIBLE);
+                            }else if(publicobject) {
+                                permission.setText(getResources().getString(R.string.public_object));
+                                if(parent) {
+                                    setprivate.setEnabled(false);
+                                    setprivate.setText(getResources().getString(R.string.parent_policy));
+                                }
+                                setprivate.setVisibility(View.VISIBLE);
+                            }else {
+                                permission.setText(getResources().getString(R.string.private_object));
+                                setpublic.setVisibility(View.VISIBLE);
+                            }
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            if(e.toString().contains("NoSuchBucketPolicy")) {
+                                permission.setText(getResources().getString(R.string.private_object));
+                                setpublic.setVisibility(View.VISIBLE);
+                                simpleProgressBar.setVisibility(View.INVISIBLE);
+                            }
+                            else {
+                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                                finish();
+                            }
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        getPolicy.start();
+        setpublic.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view) {
+                //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
+                setPublic();
+            }
+        });
+        setprivate.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view) {
+                //buttonaction
+                simpleProgressBar.setVisibility(View.VISIBLE);
+                setPrivate();
+            }
+        });
+    }
+
+    private void setPublic() {
+        Thread setPublic = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    if(policy == null) {
+                        if(filename.endsWith("/")) {
+                            policy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:GetObject\"],\"Resource\":[\"arn:aws:s3:::"+bucket+"/"+filename+"*\"]}]}";
+                        } else {
+                            policy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Principal\":{\"AWS\":[\"*\"]},\"Action\":[\"s3:GetObject\"],\"Resource\":[\"arn:aws:s3:::"+bucket+"/"+filename+"\"]}]}";
+                        }
+                    } else if(policy.endsWith("]}]}")) {
+                        if(filename.endsWith("/")) {
+                            policy = policy.substring(0, policy.length()-4)+",\"arn:aws:s3:::"+bucket+"/"+filename+"*\"]}]}";
+                        } else {
+                            policy = policy.substring(0, policy.length()-4)+",\"arn:aws:s3:::"+bucket+"/"+filename+"\"]}]}";
+                        }
+                    } else {
+                        if(filename.endsWith("/")) {
+                            policy = policy.substring(0, policy.length()-3)+",\"arn:aws:s3:::"+bucket+"/"+filename+"*\"}]}";
+                        } else {
+                            policy = policy.substring(0, policy.length()-3)+",\"arn:aws:s3:::"+bucket+"/"+filename+"\"}]}";
+                        }
+                    }
+                    s3client.setBucketPolicy(bucket, policy);
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        setPublic.start();
+    }
+
+    private void setPrivate() {
+        Thread setPrivate = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    String newpolicy = null;
+                    if(policy.contains(",\"arn:aws:s3:::"+bucket+"/"+filename+"*\"")) {
+                        newpolicy = policy.replace(",\"arn:aws:s3:::"+bucket+"/"+filename+"*\"", "");
+                        s3client.setBucketPolicy(bucket, newpolicy);
+                    } else if(policy.contains(",\"arn:aws:s3:::"+bucket+"/"+filename+"**\"")) {
+                        newpolicy = policy.replace(",\"arn:aws:s3:::"+bucket+"/"+filename+"**\"", "");
+                        s3client.setBucketPolicy(bucket, newpolicy);
+                    } else if(policy.contains(",\"arn:aws:s3:::"+bucket+"/"+filename+"\"")) {
+                        newpolicy = policy.replace(",\"arn:aws:s3:::"+bucket+"/"+filename+"\"", "");
+                        s3client.setBucketPolicy(bucket, newpolicy);
+                    } else if(policy.contains("\"arn:aws:s3:::"+bucket+"/"+filename+"*\",")) {
+                        newpolicy = policy.replace("\"arn:aws:s3:::"+bucket+"/"+filename+"*\",", "");
+                        s3client.setBucketPolicy(bucket, newpolicy);
+                    } else if(policy.contains("\"arn:aws:s3:::"+bucket+"/"+filename+"**\",")) {
+                        newpolicy = policy.replace("\"arn:aws:s3:::"+bucket+"/"+filename+"**\",", "");
+                        s3client.setBucketPolicy(bucket, newpolicy);
+                    } else if(policy.contains("\"arn:aws:s3:::"+bucket+"/"+filename+"\",")) {
+                        newpolicy = policy.replace("\"arn:aws:s3:::"+bucket+"/"+filename+"\",", "");
+                        s3client.setBucketPolicy(bucket, newpolicy);
+                    } else {
+                        s3client.deleteBucketPolicy(bucket);
+                    }
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_ok), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.policy_error), Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        setPrivate.start();
+    }
+}

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;
@@ -30,6 +30,8 @@ import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3ObjectSummary;
 
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -44,7 +46,7 @@ public class ObjectSelect extends AppCompatActivity {
     ArrayList Img;
     //ArrayList object;
     RecyclerView recyclerView;
-    String username, password, endpoint, bucket, prefix, location, pdfendpoint, query;
+    String username, password, endpoint, bucket, prefix, location, pdfendpoint, query, policy;
     boolean style, isplaylist;
     String[] filename;
     Region region;
@@ -79,7 +81,7 @@ public class ObjectSelect extends AppCompatActivity {
         try {
             s3client = new AmazonS3Client(myCredentials, region);
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
         }
         s3client.setEndpoint(endpoint);
         s3ClientOptions.setPathStyleAccess(style);
@@ -125,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) {
@@ -151,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("/");
@@ -192,7 +196,7 @@ public class ObjectSelect extends AppCompatActivity {
                         else if (Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".opus") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".ogg")
                                 || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".oga") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".mp3")
                                 || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".m4a") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".flac")
-                                || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".mka")) {
+                                || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".mka") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".m3u")) {
                             Img.add(R.drawable.audiofile);
                         }
                         else if(Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".mp4") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".mkv")
@@ -232,7 +236,7 @@ public class ObjectSelect extends AppCompatActivity {
                             Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                         }
                     });
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                    //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                     finish();
                 }
             }
@@ -253,7 +257,7 @@ public class ObjectSelect extends AppCompatActivity {
                         URL objectURL = s3client.generatePresignedUrl(request);
                         imageViewer(objectURL.toString(), Name.get(position).toString());
                     } catch (Exception e) {
-                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                     }
                 } /*else if (Img.get(position).equals(R.drawable.textfile)) {
                     //load media file
@@ -262,7 +266,7 @@ public class ObjectSelect extends AppCompatActivity {
                         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();
+                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                     }
                 }*/ else if (Img.get(position).equals(R.drawable.webpage) || Img.get(position).equals(R.drawable.ptextfile)) {
                     //load media file
@@ -271,7 +275,7 @@ public class ObjectSelect extends AppCompatActivity {
                         URL objectURL = s3client.generatePresignedUrl(request);
                         webBrowser(objectURL.toString(), Name.get(position).toString());
                     } catch (Exception e) {
-                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                     }
                 } else if (Img.get(position).equals(R.drawable.pdffile)) {
                     //load media file
@@ -307,10 +311,10 @@ public class ObjectSelect extends AppCompatActivity {
 
                                     @Override
                                     public void run() {
-                                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                     }
                                 });
-                                //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                 finish();
                             }
                         }
@@ -321,7 +325,8 @@ public class ObjectSelect extends AppCompatActivity {
                         pdfread.start();
                     }
                 } else if (Img.get(position).equals(R.drawable.audiofile) || Img.get(position).equals(R.drawable.videofile)) {
-                    if (isplaylist) {
+                    simpleProgressBar.setVisibility(View.VISIBLE);
+                    if (isplaylist && !Name.get(position).toString().toLowerCase(Locale.ROOT).endsWith(".m3u")) {
                         videoPlayer(null, Name.get(position).toString());
                     } else {
                         Thread mediaread = new Thread(new Runnable() {
@@ -337,15 +342,21 @@ public class ObjectSelect extends AppCompatActivity {
                                     mycal.add(Calendar.HOUR, videotime);
                                     //System.out.println("Expiration date: " + mycal.getTime());
                                     expiration = mycal.getTime();
-                                    GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()).withExpiration(expiration);;
+                                    try {
-                                    URL objectURL = s3client.generatePresignedUrl(request);
+                                        policy = s3client.getBucketPolicy(bucket).getPolicyText();
+                                    } catch (Exception e) {
+                                        policy = null;
+                                    }
+                                    String objectURL = PolicyCheck.getFileKey(s3client, bucket, prefix + Name.get(position).toString(), expiration, policy);
+                                    /*GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString()).withExpiration(expiration);;
+                                    URL objectURL = s3client.generatePresignedUrl(request);*/
 
                                     runOnUiThread(new Runnable() {
 
                                         @Override
                                         public void run() {
                                             // Sending reference and data to Adapter
-                                            videoPlayer(objectURL.toString(), Name.get(position).toString());
+                                            videoPlayer(objectURL, Name.get(position).toString());
                                         }
                                     });
                                     //System.out.println("tree "+treelevel);
@@ -357,10 +368,10 @@ public class ObjectSelect extends AppCompatActivity {
 
                                         @Override
                                         public void run() {
-                                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                         }
                                     });
-                                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                    //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
                             }
@@ -396,6 +407,8 @@ public class ObjectSelect extends AppCompatActivity {
                             } else if (menuItem.getTitle() == getResources().getString(R.string.download_folder)) {
                                 //Toast.makeText(ObjectSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
                                 download(Name.get(position).toString(), true);
+                            } else if (menuItem.getTitle() == getResources().getString(R.string.bucket_policy)) {
+                                policyConfig(prefix + Name.get(position).toString(), Name.get(position).toString());
                             } else if (menuItem.getTitle() == getResources().getString(R.string.create_link)) {
                                 share( Name.get(position).toString(), Img.get(position).equals(R.drawable.audiofile) || Img.get(position).equals(R.drawable.videofile));
                             } else if (menuItem.getTitle() == getResources().getString(R.string.object_info)) {
@@ -428,6 +441,8 @@ public class ObjectSelect extends AppCompatActivity {
                             if (menuItem.getTitle() == getResources().getString(R.string.download_file)) {
                                 //Toast.makeText(ObjectSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
                                 download(Name.get(position).toString(), false);
+                            } else if (menuItem.getTitle() == getResources().getString(R.string.bucket_policy)) {
+                                policyConfig(prefix + Name.get(position).toString(), Name.get(position).toString());
                             } else if (menuItem.getTitle() == getResources().getString(R.string.upload_file_here)) {
                                 //Toast.makeText(ObjectSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
                                 upload(false);
@@ -460,7 +475,55 @@ public class ObjectSelect extends AppCompatActivity {
     }
 
     private void videoPlayer(String url, String title) {
-        if (isplaylist) {
+        if (title.toLowerCase(Locale.ROOT).endsWith(".m3u")) {
+            Thread mediaread = new Thread(new Runnable() {
+
+                @Override
+                public void run() {
+                    try  {
+                        //load media file
+                        ArrayList<String> links = getPlaylist(url);
+                        ArrayList<String> medialist = new ArrayList<String>();
+                        for (int i = 0; i < links.size(); i++) {
+                            medialist.add(links.get(i).toString());
+                        }
+
+                        runOnUiThread(new Runnable() {
+
+                            @Override
+                            public void run() {
+                                // Sending reference and data to Adapter
+                                //videoPlayer(objectURL.toString(), Name.get(position).toString());
+                                Intent intent = new Intent(getApplicationContext(), VideoPlayer.class);
+                                intent.putExtra("video_url", url);
+                                intent.putExtra("title", title);
+                                intent.putExtra("videocache", videocache);
+                                intent.putExtra("buffersize", buffersize);
+                                intent.putExtra("isplaylist", true);
+                                intent.putExtra("queue", links);
+                                intent.putExtra("names", medialist);
+                                simpleProgressBar.setVisibility(View.INVISIBLE);
+                                startActivity(intent);
+                            }
+                        });
+                        //System.out.println("tree "+treelevel);
+                        //System.out.println("prefix "+prefix);
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        runOnUiThread(new Runnable() {
+
+                            @Override
+                            public void run() {
+                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                            }
+                        });
+                    }
+                }
+            });
+            mediaread.start();
+        }
+        else if (isplaylist) {
             Thread mediaread = new Thread(new Runnable() {
 
                 @Override
@@ -479,6 +542,7 @@ public class ObjectSelect extends AppCompatActivity {
 
                             @Override
                             public void run() {
+                                if(links != null) {
                                     // Sending reference and data to Adapter
                                     //videoPlayer(objectURL.toString(), Name.get(position).toString());
                                     Intent intent = new Intent(getApplicationContext(), VideoPlayer.class);
@@ -489,8 +553,10 @@ public class ObjectSelect extends AppCompatActivity {
                                     intent.putExtra("isplaylist", isplaylist);
                                     intent.putExtra("queue", links);
                                     intent.putExtra("names", medialist);
+                                    simpleProgressBar.setVisibility(View.INVISIBLE);
                                     startActivity(intent);
                                 }
+                            }
                         });
                         //System.out.println("tree "+treelevel);
                         //System.out.println("prefix "+prefix);
@@ -501,7 +567,7 @@ public class ObjectSelect extends AppCompatActivity {
 
                             @Override
                             public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                             }
                         });
                     }
@@ -515,10 +581,12 @@ public class ObjectSelect extends AppCompatActivity {
             intent.putExtra("videocache", videocache);
             intent.putExtra("buffersize", buffersize);
             intent.putExtra("isplaylist", isplaylist);
+            simpleProgressBar.setVisibility(View.INVISIBLE);
             startActivity(intent);
         }
 
     }
+
     private void textViewer(String url) {
 
         Intent intent = new Intent(this, TextViewer.class);
@@ -679,10 +747,10 @@ public class ObjectSelect extends AppCompatActivity {
 
                                         @Override
                                         public void run() {
-                                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                         }
                                     });
-                                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                    //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
                             }
@@ -732,6 +800,20 @@ public class ObjectSelect extends AppCompatActivity {
         startActivity(intent);
     }
 
+    private void policyConfig(String filename, String title) {
+        Intent intent = new Intent(this, ObjectPolicy.class);
+        intent.putExtra("endpoint", endpoint);
+        intent.putExtra("username", username);
+        intent.putExtra("password", password);
+        intent.putExtra("bucket", bucket);
+        intent.putExtra("filename", filename);
+        intent.putExtra("region", location);
+        intent.putExtra("style", style);
+        intent.putExtra("title", title);
+        intent.putExtra("pdfendpoint", pdfendpoint);
+        startActivity(intent);
+    }
+
     public void copyName (String name) {
         ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
         ClipData clip;
@@ -756,9 +838,32 @@ public class ObjectSelect extends AppCompatActivity {
         //System.out.println("Expiration date: " + mycal.getTime());
         expiration = mycal.getTime();
         for (int i = 0; i < medialist.size(); i++) {
-            GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix+medialist.get(i)).withExpiration(expiration);;
+            //GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix+medialist.get(i)).withExpiration(expiration);;
-            links.add(s3client.generatePresignedUrl(request).toString());
+            //links.add(s3client.generatePresignedUrl(request).toString());
+            links.add(PolicyCheck.getFileKey(s3client, bucket, prefix+medialist.get(i), expiration, policy));
         }
         return links;
     }
+
+    public ArrayList<String> getPlaylist(String playlist) {
+        ArrayList<String> links = new ArrayList<String>();
+        try {
+            BufferedReader br = new BufferedReader(new InputStreamReader((new URL(playlist).openStream())));
+            String strLine;
+
+//Read File Line By Line
+            while ((strLine = br.readLine()) != null)   {
+                // Print the content on the console - do what you want to do
+                if(!strLine.startsWith("#")) {
+                    links.add(strLine);
+                }
+            }
+
+//Close the input stream
+            return links;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 }

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

@@ -0,0 +1,46 @@
+package asgardius.page.s3managermk2;
+
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
+
+import java.util.Date;
+
+public class PolicyCheck {
+    public static String getFileKey(AmazonS3 s3client, String bucket, String object, Date expiration, String policy) {
+        try {
+            Boolean publicobject;
+            String fileKey = null;
+            publicobject = false;
+            if(policy.contains("arn:aws:s3:::"+bucket+"/*") && policy.contains("s3:GetObject")) {
+                publicobject = true;
+            } else if(policy.contains("s3:GetObject")) {
+                if((policy.contains("\"arn:aws:s3:::"+bucket+"/"+object+"\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+object+"*\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+object+"**\"")) && policy.contains("s3:GetObject")) {
+                    publicobject = true;
+                } else {
+                    String[] path = object.split("/");
+                    String filepath = "";
+                    for (int i = 0; i < path.length-1; i++) {
+                        filepath = filepath+path[i]+"/";
+                        //System.out.println(filepath);
+                        if(policy.contains("\"arn:aws:s3:::"+bucket+"/"+filepath+"*\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+filepath+"**\"")) {
+                            publicobject = true;
+                            i = path.length;
+                        }
+                    }
+                }
+            }
+            if(publicobject) {
+                fileKey = s3client.getUrl(bucket, object).toString();
+            } else {
+                GeneratePresignedUrlRequest request;
+                request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
+                fileKey = s3client.generatePresignedUrl(request).toString();
+            }
+            return fileKey;
+        } catch (Exception e) {
+            GeneratePresignedUrlRequest request;
+            request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
+            return s3client.generatePresignedUrl(request).toString();
+        }
+    }
+}

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;
@@ -13,9 +13,13 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
+import com.google.android.exoplayer2.upstream.cache.SimpleCache;
 import com.google.android.material.switchmaterial.SwitchMaterial;
 
-import asgardius.page.s3manager.databinding.ActivitySettingsBinding;
+import java.io.File;
+
+import asgardius.page.s3managermk2.databinding.ActivitySettingsBinding;
 
 public class Settings extends AppCompatActivity {
 
@@ -24,13 +28,13 @@ public class Settings extends AppCompatActivity {
     SQLiteDatabase db;
     String videocache, videotime, buffersize, playlisttime;
     EditText vcachepick, vtimepick, bsizepick, ptimepick;
-    Button saveprefs, about;
+    Button saveprefs, about, clearcache;
     SwitchMaterial isplaylist;
+    StandaloneDatabaseProvider standaloneDatabaseProvider;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         binding = ActivitySettingsBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
         vcachepick = (EditText)findViewById(R.id.videocache);
@@ -73,6 +77,7 @@ public class Settings extends AppCompatActivity {
                         playlisttime = (cursor.getString(0));
                     }
                     db.close();
+
                     runOnUiThread(new Runnable() {
 
                         @SuppressLint("SetTextI18n")
@@ -100,6 +105,26 @@ public class Settings extends AppCompatActivity {
         });
         getprefs.start();
 
+        clearcache = (Button)findViewById(R.id.clearcache);
+        clearcache.setOnClickListener(new View.OnClickListener(){
+            @Override
+            public void onClick(View view) {
+                //buttonaction
+                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) {
+                    e.printStackTrace();
+                    Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
+                }
+                //This launch account add screen
+                //addaccount(false);
+            }
+        });
+
         //This is to add new user account
         saveprefs = (Button)findViewById(R.id.saveprefs);
         saveprefs.setOnClickListener(new View.OnClickListener(){
@@ -117,7 +142,7 @@ public class Settings extends AppCompatActivity {
                         Toast.makeText(getApplicationContext(),getResources().getString(R.string.not_zero), Toast.LENGTH_SHORT).show();
                     } else if (Integer.parseInt(buffersize) <= 2000) {
                         Toast.makeText(getApplicationContext(),getResources().getString(R.string.buffersize_error), Toast.LENGTH_SHORT).show();
-                    }  else if (Integer.parseInt(videotime) > 168) {
+                    }  else if (Integer.parseInt(videotime) > 168 || Integer.parseInt(playlisttime) > 168) {
                         Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
                     } else {
                         db = dbHelper.getWritableDatabase();
@@ -153,6 +178,12 @@ public class Settings extends AppCompatActivity {
         });
     }
 
+    @Override
+
+    public void onDestroy() {
+        super.onDestroy();
+    }
+
     private void aboutPage () {
 
         Intent intent = new Intent(this, WebBrowser.class);
@@ -163,7 +194,6 @@ public class Settings extends AppCompatActivity {
     }
 
     private void mainmenu() {
-
         Intent intent = new Intent(this, MainActivity.class);
         intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         intent.putExtra("EXIT", true);

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;
 
@@ -13,6 +13,8 @@ import android.os.Bundle;
 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;
@@ -33,8 +35,10 @@ import java.util.Date;
 import java.util.List;
 
 public class Share extends AppCompatActivity {
-    String username, password, endpoint, bucket, object, location, title, objectlist;
+    String username, password, endpoint, bucket, object, location, title, objectlist, policy;
-    boolean mediafile, style;
+    boolean mediafile, style, publicobject;
+    TextView expirationtext;
+    ProgressBar simpleProgressBar;
     Region region;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
@@ -84,6 +88,8 @@ public class Share extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_share);
+        simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
+        expirationtext = (TextView) findViewById(R.id.expirationtext);
         mycal = Calendar.getInstance();
         datepick = (EditText)findViewById(R.id.Date);
         hourpick = (EditText)findViewById(R.id.Hour);
@@ -109,56 +115,96 @@ public class Share extends AppCompatActivity {
         try {
             s3client = new AmazonS3Client(myCredentials, region);
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
         }
         s3client.setEndpoint(endpoint);
         s3ClientOptions.setPathStyleAccess(style);
         s3client.setS3ClientOptions(s3ClientOptions);
+        Thread getPolicy = new Thread(new Runnable() {
+
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    policy = s3client.getBucketPolicy(bucket).getPolicyText();
+                    publicobject = false;
+                    if(policy.contains("arn:aws:s3:::"+bucket+"/*") && policy.contains("s3:GetObject")) {
+                        publicobject = true;
+                    } else if(policy.contains("s3:GetObject")) {
+                        if((policy.contains("\"arn:aws:s3:::"+bucket+"/"+object+"\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+object+"*\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+object+"**\"")) && policy.contains("s3:GetObject")) {
+                            publicobject = true;
+                        } else {
+                            String[] path = object.split("/");
+                            String filepath = "";
+                            for (int i = 0; i < path.length-1; i++) {
+                                filepath = filepath+path[i]+"/";
+                                //System.out.println(filepath);
+                                if(policy.contains("\"arn:aws:s3:::"+bucket+"/"+filepath+"*\"") || policy.contains("\"arn:aws:s3:::"+bucket+"/"+filepath+"**\"")) {
+                                    publicobject = true;
+                                    i = path.length;
+                                }
+                            }
+                        }
+                    }
+                    //System.out.println(policy);
+
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            //Your code goes here
+                            if(publicobject){
+                                expirationtext.setText(getResources().getString(R.string.expiration_not_required));
+
+                            } else {
+                                datepick.setEnabled(true);
+                                hourpick.setEnabled(true);
+                                minutepick.setEnabled(true);
+                                expirationtext.setText(getResources().getString(R.string.expiration_time));
+                            }
                             if(object == null || object.endsWith("/")) {
                                 copylinks.setVisibility(View.VISIBLE);
                                 savelinks.setVisibility(View.VISIBLE);
                             } else {
                                 share.setVisibility(View.VISIBLE);
+                                copylinks.setVisibility(View.VISIBLE);
                             }
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                        }
+                    });
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            publicobject = false;
+                            datepick.setEnabled(true);
+                            hourpick.setEnabled(true);
+                            minutepick.setEnabled(true);
+                            expirationtext.setText(getResources().getString(R.string.expiration_time));
+                            if(object == null || object.endsWith("/")) {
+                                copylinks.setVisibility(View.VISIBLE);
+                                savelinks.setVisibility(View.VISIBLE);
+                            } else {
+                                share.setVisibility(View.VISIBLE);
+                                copylinks.setVisibility(View.VISIBLE);
+                            }
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                }
+            }
+        });
+        getPolicy.start();
         share.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
                 //buttonaction
                 try {
-                    if (datepick.getText().toString().equals("")) {
+                    sharefile();
-                        date = 0;
-                    } else {
-                        date = Integer.parseInt(datepick.getText().toString());
-                    }
-                    if (hourpick.getText().toString().equals("")) {
-                        hour = 0;
-                    } else {
-                        hour = Integer.parseInt(hourpick.getText().toString());
-                    }
-                    if (minutepick.getText().toString().equals("")) {
-                        minute = 0;
-                    } else {
-                        minute = Integer.parseInt(minutepick.getText().toString());
-                    }
-                    expiration = new Date();
-                    //System.out.println("today is " + mycal.getTime());
-                    mycal.setTime(expiration);
-                    if (date == 0 && hour == 0 && minute == 0) {
-                        if (mediafile) {
-                            mycal.add(Calendar.HOUR, videotime);
-                        } else {
-                            mycal.add(Calendar.MINUTE, 15);
-                        }
-                    } else {
-                        mycal.add(Calendar.DATE, date);
-                        mycal.add(Calendar.HOUR, hour);
-                        mycal.add(Calendar.MINUTE, minute);
-                    }
-                    //System.out.println("Expiration date: " + mycal.getTime());
-                    expiration = mycal.getTime();
-                    //System.out.println(expiration);
-                    request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
-                    objectURL = s3client.generatePresignedUrl(request);
                     //System.out.println(URLify(objectURL.toString()));
                     Intent shareIntent = new Intent(Intent.ACTION_SEND);
                     shareIntent.setType("text/plain");
@@ -174,19 +220,23 @@ public class Share extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 //buttonaction
+                if(object == null || object.endsWith("/")) {
+                    simpleProgressBar.setVisibility(View.VISIBLE);
+                }
                 Thread copyLinks = new Thread(new Runnable() {
 
                     @Override
                     public void run() {
                         try  {
                             //load media file
+                            if(object == null || object.endsWith("/")) {
                                 getLinks();
-
                                 runOnUiThread(new Runnable() {
 
                                     @Override
                                     public void run() {
                                         // Sending reference and data to Adapter
+                                        simpleProgressBar.setVisibility(View.INVISIBLE);
                                         ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
                                         ClipData clip;
                                         clip = ClipData.newPlainText("name", objectlist);
@@ -196,6 +246,24 @@ public class Share extends AppCompatActivity {
                                         }
                                     }
                                 });
+                            } else {
+                                sharefile();
+                                runOnUiThread(new Runnable() {
+
+                                    @Override
+                                    public void run() {
+                                        // Sending reference and data to Adapter
+                                        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                                        ClipData clip;
+                                        clip = ClipData.newPlainText("name", URLify(objectURL.toString()));
+                                        clipboard.setPrimaryClip(clip);
+                                        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+                                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.copy_ok), Toast.LENGTH_SHORT).show();
+                                        }
+                                    }
+                                });
+                            }
+
                             //System.out.println("tree "+treelevel);
                             //System.out.println("prefix "+prefix);
 
@@ -205,6 +273,7 @@ public class Share extends AppCompatActivity {
 
                                 @Override
                                 public void run() {
+                                    simpleProgressBar.setVisibility(View.INVISIBLE);
                                     Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
                                 }
                             });
@@ -303,21 +372,61 @@ public class Share extends AppCompatActivity {
         objectlist = "";
         List<S3ObjectSummary> objects = result.getObjectSummaries();
         for (S3ObjectSummary os : objects) {
-            request = new GeneratePresignedUrlRequest(bucket, os.getKey()).withExpiration(expiration);
+            objectlist = objectlist+PolicyCheck.getFileKey(s3client, bucket, os.getKey(), expiration, policy)+"\n";
-            objectlist = objectlist+s3client.generatePresignedUrl(request).toString()+"\n";
         }
         while (result.isTruncated()) {
             result = s3client.listNextBatchOfObjects (result);
             objects = result.getObjectSummaries();
             for (S3ObjectSummary os : objects) {
-                request = new GeneratePresignedUrlRequest(bucket, os.getKey()).withExpiration(expiration);
+                objectlist = objectlist+PolicyCheck.getFileKey(s3client, bucket, os.getKey(), expiration, policy)+"\n";
-                objectlist = objectlist+s3client.generatePresignedUrl(request).toString()+"\n";
             }
 
         }
     }
 
+    private void sharefile() {
+        if(publicobject) {
+            objectURL = s3client.getUrl(bucket, object);
+        } else {
+            if (datepick.getText().toString().equals("")) {
+                date = 0;
+            } else {
+                date = Integer.parseInt(datepick.getText().toString());
+            }
+            if (hourpick.getText().toString().equals("")) {
+                hour = 0;
+            } else {
+                hour = Integer.parseInt(hourpick.getText().toString());
+            }
+            if (minutepick.getText().toString().equals("")) {
+                minute = 0;
+            } else {
+                minute = Integer.parseInt(minutepick.getText().toString());
+            }
+            expiration = new Date();
+            //System.out.println("today is " + mycal.getTime());
+            mycal.setTime(expiration);
+            if (date == 0 && hour == 0 && minute == 0) {
+                if (mediafile) {
+                    mycal.add(Calendar.HOUR, videotime);
+                } else {
+                    mycal.add(Calendar.MINUTE, 15);
+                }
+            } else {
+                mycal.add(Calendar.DATE, date);
+                mycal.add(Calendar.HOUR, hour);
+                mycal.add(Calendar.MINUTE, minute);
+            }
+            //System.out.println("Expiration date: " + mycal.getTime());
+            expiration = mycal.getTime();
+            //System.out.println(expiration);
+            request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
+            objectURL = s3client.generatePresignedUrl(request);
+        }
+    }
+
     private void savelinks() {
+        simpleProgressBar.setVisibility(View.VISIBLE);
         Thread saveLinks = new Thread(new Runnable() {
 
             @Override
@@ -333,6 +442,7 @@ public class Share extends AppCompatActivity {
                         @Override
                         public void run() {
                             // Sending reference and data to Adapter
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
                             Toast.makeText(getApplicationContext(),getResources().getString(R.string.save_ok), Toast.LENGTH_SHORT).show();
                         }
                     });
@@ -345,6 +455,7 @@ public class Share extends AppCompatActivity {
 
                         @Override
                         public void run() {
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
                             Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
                         }
                     });

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

@@ -1,6 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
-
-import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -9,18 +7,11 @@ import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import com.amazonaws.services.s3.model.ListObjectsRequest;
+import androidx.appcompat.app.AppCompatActivity;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
 
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
 import java.util.stream.Collectors;
 
 public class TextViewer extends AppCompatActivity {
@@ -66,11 +57,11 @@ public class TextViewer extends AppCompatActivity {
 
                             @Override
                             public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                                 finish();
                             }
                         });
-                        //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                        //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
                         finish();
                     }
                 }

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;
 
@@ -351,6 +351,19 @@ public class Uploader extends AppCompatActivity {
 
     @SuppressLint("SetTextI18n")
     @Override
+
+    public void onDestroy() {
+        if (!mWifiLock.isHeld()) {
+            mWifiLock.acquire();
+            //System.out.println("WifiLock acquired");
+        }
+        if (!mWakeLock.isHeld()) {
+            mWakeLock.acquire();
+            //System.out.println("WakeLock acquired");
+        }
+        super.onDestroy();
+    }
+
     public void onActivityResult(int requestCode, int resultCode, final Intent resultData) {
         // The ACTION_OPEN_DOCUMENT intent was sent with the request code OPEN_DIRECTORY_REQUEST_CODE.
         // If the request code seen here doesn't match, it's the response to some other intent,

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;
@@ -17,6 +17,7 @@ import android.support.v4.media.session.MediaSessionCompat;
 import android.util.Rational;
 import android.view.Display;
 import android.view.View;
+import android.view.WindowManager;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -28,6 +29,7 @@ import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.PlaybackException;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Tracks;
 import com.google.android.exoplayer2.audio.AudioAttributes;
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
@@ -35,7 +37,6 @@ import com.google.android.exoplayer2.source.ProgressiveMediaSource;
 import com.google.android.exoplayer2.ui.PlayerNotificationManager;
 import com.google.android.exoplayer2.ui.StyledPlayerView;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
@@ -81,6 +82,9 @@ public class VideoPlayer extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_video_player);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            getWindow().getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
         if(Build.VERSION.SDK_INT >=Build.VERSION_CODES.O){
 
             NotificationChannel channel= new NotificationChannel("playback","Video Playback", NotificationManager.IMPORTANCE_DEFAULT);
@@ -123,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.getCacheDir(), "media"),
+                    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
@@ -152,36 +163,19 @@ 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)));
-                    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);
-                }
             }
+            getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
             player.prepare();
+            try {
                 player.seekTo(names.indexOf(title), 0);
-        } else {
+            }catch (Exception e) {
-            if (title.endsWith(".m3u8")) {
+                System.out.println("Playing m3u file");
-                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);
             }
+        } else {
+            MediaItem mediaItem = MediaItem.fromUri(Share.URLify(videoURL));
+            player.setMediaItem(mediaItem);
             player.prepare();
         }
         // Start the playback.
@@ -195,20 +189,22 @@ public class VideoPlayer extends AppCompatActivity {
                 if(success) {
                     player.pause();
                 } else {
-                    if (cause instanceof HttpDataSource.HttpDataSourceException) {
                     // An HTTP error occurred.
                     //System.out.println("Playback error F");
-                        Toast.makeText(getApplicationContext(), getResources().getString(R.string.media_conn_fail), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getApplicationContext(), Objects.requireNonNull(error.getCause()).toString(), Toast.LENGTH_SHORT).show();
-                    } else {
-                        // An HTTP error occurred.
-                        //System.out.println("Playback error F");
-                        Toast.makeText(getApplicationContext(), getResources().getString(R.string.media_wrong_type), Toast.LENGTH_SHORT).show();
-                    }
                     player.release();
                     finish();
                 }
             }
 
+            @Override
+            public void onTracksChanged(Tracks tracks) {
+                if(isplaylist) {
+                    getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
+                }
+                Player.Listener.super.onTracksChanged(tracks);
+            }
+
 
         });
 
@@ -227,9 +223,6 @@ public class VideoPlayer extends AppCompatActivity {
                         mWakeLock.acquire();
                         //System.out.println("WakeLock acquired");
                     }
-                    if(isplaylist) {
-                        getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
-                    }
                 } else if (state == 2) {
                     // Buffering.
                     //Acquiring WakeLock and WifiLock if not held
@@ -241,9 +234,6 @@ public class VideoPlayer extends AppCompatActivity {
                         mWakeLock.acquire();
                         //System.out.println("WakeLock acquired");
                     }
-                    if(isplaylist) {
-                        getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
-                    }
                 } else {
                     //Player inactive
                     //Releasing WifiLock and WakeLock if held
@@ -268,6 +258,7 @@ public class VideoPlayer extends AppCompatActivity {
         // Set the IMMERSIVE flag.
         // Set the content to appear under the system bars so that the content
         // doesn't resize when the system bars hide and show.
+        Objects.requireNonNull(getSupportActionBar()).hide();
         View decorView = getWindow().getDecorView();
         decorView.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_STABLE
@@ -282,6 +273,7 @@ public class VideoPlayer extends AppCompatActivity {
         View decorView = getWindow().getDecorView();
         decorView.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+        Objects.requireNonNull(getSupportActionBar()).show();
     }
 
 
@@ -330,14 +322,22 @@ public class VideoPlayer extends AppCompatActivity {
     @Override
 
     public void onDestroy() {
+        if (mWifiLock.isHeld()) {
+            mWifiLock.release();
+            //System.out.println("WifiLock acquired");
+        }
+        if (mWakeLock.isHeld()) {
+            mWakeLock.release();
+            //System.out.println("WakeLock acquired");
+        }
         mediaSessionConnector.setPlayer(null);
-        deleteCache(this, standaloneDatabaseProvider);
+        //deleteCache(this, standaloneDatabaseProvider);
-        standaloneDatabaseProvider.close();
         mediaSession.setActive(false);
         playerNotificationManager.setPlayer(null);
         player.release();
         playerView.setPlayer(null);
         simpleCache.release();
+        standaloneDatabaseProvider.close();
         super.onDestroy();
     }
 
@@ -347,6 +347,7 @@ public class VideoPlayer extends AppCompatActivity {
         if (!playerView.getUseController()) {
             playerView.setUseController(true);
         }
+        hideSystemBars();
     }
 
     public void onUserLeaveHint() {
@@ -366,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.
@@ -421,9 +400,9 @@ public class VideoPlayer extends AppCompatActivity {
         super.onStop();
     }
 
-    static void deleteCache(Context context, StandaloneDatabaseProvider database) {
+    /*static void deleteCache(Context context, StandaloneDatabaseProvider database) {
         SimpleCache.delete(new File(context.getCacheDir(), "media"), database);
-    }
+    }*/
 
     public void onBackPressed() {
         try {

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_bucket_policy.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".BucketPolicy">
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="MissingConstraints">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/permission"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="center"
+                android:textSize="25sp"/>
+
+            <Button
+                android:id="@+id/set_public"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:text="@string/set_public"
+                android:visibility="gone" />
+
+            <Button
+                android:id="@+id/set_private"
+                android:layout_width="match_parent"
+                android:layout_height="70dp"
+                android:text="@string/set_private"
+                android:visibility="gone" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <ProgressBar
+        android:id="@+id/simpleProgressBar"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:max="100"
+        android:progress="50"
+        android:padding="20dp"
+        tools:ignore="MissingConstraints"
+        android:indeterminate="true" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -9,7 +9,8 @@
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        tools:ignore="MissingConstraints">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -47,4 +48,14 @@
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+    <ProgressBar
+        android:id="@+id/simpleProgressBar"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:max="100"
+        android:progress="50"
+        android:padding="20dp"
+        tools:ignore="MissingConstraints"
+        android:indeterminate="true" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -53,6 +53,9 @@
 
             </LinearLayout>
 
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
     <ProgressBar
         android:id="@+id/simpleProgressBar"
         android:layout_width="fill_parent"
@@ -64,7 +67,4 @@
         android:visibility="invisible"
         tools:ignore="MissingConstraints" />
 
-        </LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-
-</LinearLayout>

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/black"
     tools:context=".ImageViewer">
 
     <com.otaliastudios.zoom.ZoomImageView

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -7,6 +7,12 @@
     android:orientation="vertical"
     tools:context=".ObjectInfo">
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        tools:ignore="MissingConstraints">
+
     <TextView
         android:id="@+id/size_info"
         android:layout_width="match_parent"
@@ -28,6 +34,8 @@
         android:textAlignment="center"
         android:textSize="25sp" />
 
+    </LinearLayout>
+
     <ProgressBar
         android:id="@+id/simpleProgressBar"
         android:layout_width="fill_parent"
@@ -38,4 +46,4 @@
         tools:ignore="MissingConstraints"
         android:indeterminate="true" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ObjectPolicy">
+
+  <androidx.core.widget.NestedScrollView
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      tools:ignore="MissingConstraints">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+      <TextView
+          android:id="@+id/permission"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:textAlignment="center"
+          android:textSize="25sp"/>
+
+      <Button
+          android:id="@+id/set_public"
+          android:layout_width="match_parent"
+          android:layout_height="70dp"
+          android:text="@string/set_public"
+          android:visibility="gone" />
+
+      <Button
+          android:id="@+id/set_private"
+          android:layout_width="match_parent"
+          android:layout_height="70dp"
+          android:text="@string/set_private"
+          android:visibility="gone" />
+
+    </LinearLayout>
+  </androidx.core.widget.NestedScrollView>
+
+  <ProgressBar
+      android:id="@+id/simpleProgressBar"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:max="100"
+      android:progress="50"
+      android:padding="20dp"
+      tools:ignore="MissingConstraints"
+      android:indeterminate="true" />
+
+  </androidx.constraintlayout.widget.ConstraintLayout>

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,7 +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:visibility="gone" />
 
             <TextView
                 android:layout_width="match_parent"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
@@ -9,7 +9,8 @@
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        tools:ignore="MissingConstraints">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -17,9 +18,9 @@
             android:orientation="vertical">
 
             <TextView
+                android:id="@+id/expirationtext"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/expiration_time"
                 android:textAlignment="center"
                 android:textSize="25sp" />
 
@@ -38,6 +39,7 @@
                     android:layout_height="48dp"
                     android:layout_weight="1"
                     android:focusable="true"
+                    android:enabled="false"
                     android:hint="@string/share_date"
                     android:maxLength="1"
                     android:inputType="date"
@@ -50,6 +52,7 @@
                     android:layout_height="48dp"
                     android:layout_weight="1"
                     android:focusable="true"
+                    android:enabled="false"
                     android:hint="@string/share_hour"
                     android:maxLength="2"
                     android:inputType="date"
@@ -62,6 +65,7 @@
                     android:layout_height="48dp"
                     android:layout_weight="1"
                     android:focusable="true"
+                    android:enabled="false"
                     android:hint="@string/share_minute"
                     android:maxLength="2"
                     android:inputType="date"
@@ -97,4 +101,14 @@
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 
-</LinearLayout>
+    <ProgressBar
+        android:id="@+id/simpleProgressBar"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:max="100"
+        android:progress="50"
+        android:padding="20dp"
+        tools:ignore="MissingConstraints"
+        android:indeterminate="true" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/bucket_menu.xml

@@ -33,6 +33,10 @@
         android:id="@+id/cors_config"
         android:title="@string/cors_config" />
 
+    <item
+        android:id="@+id/acl_config"
+        android:title="@string/bucket_policy" />
+
     <item
         android:id="@+id/deletefolder"
         android:title="@string/file_del" />

app/src/main/res/menu/folder_menu.xml

@@ -25,6 +25,10 @@
         android:id="@+id/copy_name"
         android:title="@string/copy_name" />
 
+    <item
+        android:id="@+id/acl_config"
+        android:title="@string/bucket_policy" />
+
     <item
         android:id="@+id/deletefolder"
         android:title="@string/file_del" />

app/src/main/res/menu/object_menu.xml

@@ -25,6 +25,10 @@
         android:id="@+id/copy_name"
         android:title="@string/copy_name" />
 
+    <item
+        android:id="@+id/acl_config"
+        android:title="@string/bucket_policy" />
+
     <item
         android:id="@+id/deletefile"
         android:title="@string/file_del" />

app/src/main/res/values-es/strings.xml

@@ -62,15 +62,8 @@
     <string name="accountsave_success">Cuenta editada exitosamente</string>
     <string name="nosslwarning">No se permiten las conexiones sin SSL</string>
     <string name="invalid_url">La URL del endpoint debe iniciar con https://</string>
-    <string name="explorer_test_button">Probar explorador de archivos</string>
     <string name="unsupported_file">Tipo de archivo no soportado</string>
-    <string name="test_server_button">Conectar al servidor de pruebas</string>
-    <string name="media_conn_fail">No se pudo obtener el archivo remoto</string>
-    <string name="media_wrong_type">Archivo multimedia inválido</string>
-    <string name="media_list_fail">No se pudo conectar al servidor</string>
     <string name="about_button">Acerca de esta app</string>
-    <string name="dummy_button">Botón de prueba</string>
-    <string name="dummy_content">Contenido de prueba</string>
     <string name="accountadd_pdfendpoint">servidor pdfjs</string>
     <string name="pdf_reader_notready">Necesita configurar un servidor pdf.js</string>
     <string name="share_date">D</string>
@@ -110,8 +103,8 @@
     <string name="allow_all">Permitir todo</string>
     <string name="allow_pdf">Permitir pdf</string>
     <string name="delete_cors">Eliminar CORS</string>
-    <string name="cors_error">No se pudo cambiar la política CORS</string>
+    <string name="policy_error">No se pudo cambiar la política</string>
-    <string name="cors_ok">Política CORS cambiada exitosamente</string>
+    <string name="policy_ok">Política cambiada exitosamente</string>
     <string name="download_bucket">Descargar contenido del bucket</string>
     <string name="download_folder">Descargar contenido de la carpeta</string>
     <string name="batch_download_success">Archivos descargados exitosamente</string>
@@ -122,4 +115,16 @@
     <string name="save_links">Guardar enlaces en archivo</string>
     <string name="copy_links">Copiar enlaces al potapapeles</string>
     <string name="save_ok">Archivo guardado exitosamente</string>
+    <string name="bucket_policy">Permisos de acceso</string>
+    <string name="public_bucket">Bucket público</string>
+    <string name="private_bucket">Bucket privado</string>
+    <string name="public_object">Objeto público</string>
+    <string name="private_object">Objeto privado</string>
+    <string name="custom_policy">Política personalizada</string>
+    <string name="set_public">Establecer como público</string>
+    <string name="set_private">Establecer como privado</string>
+    <string name="parent_policy">Política establecida por carpeta padre</string>
+    <string name="expiration_not_required">Fecha de expiración no requerida</string>
+    <string name="clearcache">Limpiar Cache de Video</string>
+    <string name="clearcache_ok">Cache limpiada exitosamente</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,9 +1,8 @@
 <resources>
     <string name="app_name" translatable="false">S3 Manager</string>
-    <string name="endpoint_url" translatable="false">https://s3.asgardius.company</string>
+    <string name="aws_endpoint" translatable="false">.amazonaws.com</string>
     <string name="pdf_reader" translatable="false">https://office.asgardius.company/pdfjs</string>
     <string name="pdf_reader_notready">You need to setup a pdf.js server</string>
-    <string name="access_key" translatable="false">google</string>
     <string name="account_list">Account list</string>
     <string name="bucket_list">Bucket list</string>
     <string name="object_list">Object list</string>
@@ -86,15 +85,8 @@
     <string name="accountsave_success">Account edited successfully</string>
     <string name="nosslwarning">Connections without SSL are not allowed</string>
     <string name="invalid_url">Endpoint URL must start with https://</string>
-    <string name="explorer_test_button">File Explorer Test</string>
     <string name="unsupported_file">Unsupported file type</string>
-    <string name="test_server_button">Connect to test server</string>
-    <string name="media_conn_fail">Cannot retrieve remote file</string>
-    <string name="media_wrong_type">Invalid media file</string>
-    <string name="media_list_fail">Cannot connect to server</string>
     <string name="about_button">About this app</string>
-    <string name="dummy_button">Dummy Button</string>
-    <string name="dummy_content">DUMMY\nCONTENT</string>
     <string name="settings">Settings</string>
     <string name="save_settings">Save settings</string>
     <string name="videocache">Max media cache size (in MiB)</string>
@@ -116,8 +108,8 @@
     <string name="allow_all">Allow all</string>
     <string name="allow_pdf">Allow pdf</string>
     <string name="delete_cors">Delete CORS</string>
-    <string name="cors_error">Cannot change CORS policy</string>
+    <string name="policy_error">Cannot change policy</string>
-    <string name="cors_ok">CORS policy changed successfully</string>
+    <string name="policy_ok">Policy changed successfully</string>
     <string name="copy_name">Copy name to clipboard</string>
     <string name="copy_ok">Copied to clipboard</string>
     <string name="upload_calculate">Calculating folder size</string>
@@ -125,4 +117,16 @@
     <string name="save_links">Save links to file</string>
     <string name="save_ok">File saved successfully</string>
     <string name="copy_links">Copy links to clipboard</string>
+    <string name="bucket_policy">Access permissions</string>
+    <string name="public_bucket">Public bucket</string>
+    <string name="private_bucket">Private bucket</string>
+    <string name="public_object">Public object</string>
+    <string name="private_object">Private object</string>
+    <string name="custom_policy">Custom policy</string>
+    <string name="set_public">Set as public</string>
+    <string name="set_private">Set as private</string>
+    <string name="parent_policy">Policy set by parent folder</string>
+    <string name="expiration_not_required">Expiration date not required</string>
+    <string name="clearcache">Clear Video Cache</string>
+    <string name="clearcache_ok">Cache clean successfully</string>
 </resources>

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

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

@@ -0,0 +1 @@
+* Fix app setting validation

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

@@ -0,0 +1 @@
+* UI fixes

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

@@ -0,0 +1 @@
+* UI fixes

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

@@ -0,0 +1 @@
+* UI fixes

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

@@ -0,0 +1 @@
+* UI fixes

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

@@ -0,0 +1,2 @@
+* UI fixes
+* Better support for notched devices

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

@@ -0,0 +1 @@
+* Set bucket as public or private

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

@@ -0,0 +1 @@
+* Set object as public or private

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

@@ -0,0 +1,3 @@
+* Check policy per object at creating share links
+* Cache reuse for public media files
+* Button to remove media cache inside ths app

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

@@ -0,0 +1 @@
+* Fix wakelock not being released at closing video player

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

@@ -0,0 +1 @@
+* M3U Playlist support

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

@@ -0,0 +1 @@
+* Fix UI issue at media player screen

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

@@ -14,11 +14,15 @@ Current feature list
 <li>Delete folders</li>
 <li>File upload</li>
 <li>File download</li>
+<li>Download folder content</li>
+<li>Upload folder content</li>
 <li>pdf file reader using user provided pdf.js server</li>
 <li>file sharing links</li>
 <li>get object info</li>
 <li>get bucket info</li>
 <li>Set CORS policy</li>
+<li>Set bucket as public or private</li>
+<li>Set object as public or private</li>
 
 Planned feature list
 
@@ -42,16 +46,21 @@ Known supported providers
 
 <li>Amazon Web Services</li>
 <li>Scaleway Elements</li>
-<li>Oracle Cloud (partial)</li>
+<li>Wasabi Cloud (Provider broke access control intentionally since March 13 2023)</li>
-<li>Wasabi Cloud</li>
+<li>Backblaze B2</li>
-<li>MinIO</li>
+<li>Cloudflare R2 (partial)</li>
+<li>MinIO **</li>
+<li>Garage **</li>
 
 Known not supported providers
 
-<li>Google Cloud</li>
+<li>Google Cloud (Not compatible with S3v4)</li>
+<li>Oracle Cloud (compatibility issues with S3v4)</li>
+
+** 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-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
-
-You can use MinIO 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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME