diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..ac93b0d
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/4.7_WXGA_API_24.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-09-17T22:23:51.793318Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..a2d7c21 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d2381bc..8b5abe5 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,7 +28,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index 815f6ae..b9dae05 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,11 @@
-# Asgardius S3 Manager
+# s3manager
 
 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)
-* Picture preview (jpg, jpeg, png, gif, webp)
+* Audio and Video playback (opus, ogg, oga, mp3, m4a, flac, mka, mkv, mp4,, m4v, webm)
+* Picture preview (jpg, jpeg, png, gif)
 * Plain text file preview (txt, md)
 * Webpage viewer (htm, html)
 * Multiple account support
@@ -18,40 +16,16 @@ 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
 
-* Nothing for now
+* file sharing links
 
 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)
-
-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)
-
-[Steps to joining to Google Play Alpha testing channel are available here](https://forum.asgardius.company/d/1-asgardius-s3-manager-testing)
-
-You can get help at https://forum.asgardius.company/t/s3-manager
-
-You can find app documentation at https://wiki.asgardius.company/shelves/asgardius-s3-manager-english (english) or https://wiki.asgardius.company/shelves/asgardius-s3-manager-espanol (spanish)
-
 Supported languages
 
 * English
@@ -61,21 +35,14 @@ Knnown issues
 
 * Object listing can be slow on buckets with a lot of objects (4000+)
 * Slow user interface on some low-end devices
-* Running screen restarts after toggling system dark mode
 
 Known supported providers
 
 * Amazon Web Services
 * Scaleway Elements
-* Wasabi Cloud
-* Backblaze B2
-* Cloudflare R2 (partial)
-* MinIO **
-* Garage **
+* Oracle Cloud (partial)
+* MinIO
 
 Known not supported providers
 
-* Google Cloud (Not compatible with S3v4)
-* Oracle Cloud (compatibility issues with S3v4)
-
-** Extra steps required (read documentation)
\ No newline at end of file
+* Google Cloud
\ No newline at end of file
diff --git a/app-store-badges/fdroid.png b/app-store-badges/fdroid.png
deleted file mode 100644
index afa603c..0000000
Binary files a/app-store-badges/fdroid.png and /dev/null differ
diff --git a/app-store-badges/play-store.png b/app-store-badges/play-store.png
deleted file mode 100644
index c77b746..0000000
Binary files a/app-store-badges/play-store.png and /dev/null differ
diff --git a/app/build.gradle b/app/build.gradle
index ec19964..5d43582 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,14 +3,14 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 32
 
     defaultConfig {
         applicationId "asgardius.page.s3manager"
-        minSdk 21
+        minSdk 24
         targetSdk 33
-        versionCode 80
-        versionName "0.9.4"
+        versionCode 12
+        versionName "0.1.10"
         setProperty("archivesBaseName", "s3-manager-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -33,20 +33,17 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    def exoplayer_version = "2.18.6"
-    implementation "com.google.android.exoplayer:exoplayer:$exoplayer_version"
-    implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer_version"
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.exoplayer:exoplayer:2.18.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation"com.otaliastudios:zoomlayout:1.9.0"
     // BEGIN AWS DEPENDENCIES
-    def aws_version = "2.66.0"
+    def aws_version = "2.53.0"
     implementation "com.amazonaws:aws-android-sdk-s3:$aws_version"
     implementation ("com.amazonaws:aws-android-sdk-mobile-client:$aws_version") { transitive = true }
     // END AWS DEPENDENCIES
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 8a0dc3d..481bb43 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -14,8 +14,8 @@
 
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
--keepattributes SourceFile,LineNumberTable
+#-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
--renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 61364e1..894774b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="asgardius.page.s3manager" >
+    package="asgardius.page.s3manager">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission
@@ -18,97 +18,59 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AsgardiusS3Manager"
-        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" >
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
-        <activity
-            android:name=".Settings"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false"
-            android:label="@string/settings" >
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
-        <activity
-            android:name=".ObjectInfo"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false" >
-            <meta-data
-                android:name="android.app.lib_name"
-                android:value="" />
-        </activity>
+        tools:targetApi="31">
         <activity
             android:name=".Share"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".Downloader"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false" />
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
+            android:exported="false"
+            android:label="@string/download_file" />
         <activity
             android:name=".CreateBucket"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false"
             android:label="@string/create_bucket" />
         <activity
             android:name=".Uploader"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false" />
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
+            android:exported="false"
+            android:label="@string/upload_button" />
         <activity
             android:name=".ImageViewer"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
-            android:exported="false"
-            android:hardwareAccelerated="false" />
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
+            android:exported="false" />
         <activity
             android:name=".TextViewer"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".WebBrowser"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".AccountAdd"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".ObjectSelect"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".list_item"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
             android:exported="false" />
         <activity
             android:name=".BucketSelect"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
             android:exported="false"
             android:label="@string/bucket_list" />
         <activity
             android:name=".VideoPlayer"
-            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout|uiMode|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
             android:exported="false"
-            android:launchMode="singleTask"
-            android:resizeableActivity="true"
-            android:supportsPictureInPicture="true" />
+            android:theme="@style/Theme.AsgardiusS3Manager.Fullscreen" />
         <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" />
 
diff --git a/app/src/main/assets/about.htm b/app/src/main/assets/about.htm
index a02a065..37ada69 100644
--- a/app/src/main/assets/about.htm
+++ b/app/src/main/assets/about.htm
@@ -9,16 +9,15 @@
 <H3>Created by Page Asgardius</H3>
 <H3>Libraries used in this app</H3>
 <ul>
-    <li>Amazon Web Services SDK 2.66.0</li>
-    <li>ExoPlayer 2.18.6</li>
-    <li>ZoomLayout 1.9.0</li>
+    <li>Amazon Web Services SDK 2.53.0</li>
+    <li>ExoPlayer 2.18.1</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
 <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.
+    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 in some cases). Then set url to pdfjs root folder like https://example.com/pdfjs-dist
     <br>
 You can find technical support on official forum https://forum.asgardius.company/t/s3-manager</p>
 </Body>
diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
index 3350038..6c4de51 100644
--- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
+++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
@@ -1,5 +1,9 @@
 package asgardius.page.s3manager;
 
+import static com.amazonaws.regions.Regions.US_EAST_1;
+
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.content.Intent;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
@@ -8,8 +12,6 @@ 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;
@@ -17,14 +19,13 @@ 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.google.android.material.switchmaterial.SwitchMaterial;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class AccountAdd extends AppCompatActivity {
     EditText aapick, aupick, appick, aepick, arpick, pdfpick;
-    SwitchMaterial pathstyle;
-    String alias, username, password, endpoint, id, location, pdfendpoint, style;
+    String alias, username, password, endpoint, id, location, pdfendpoint;
     AWSCredentials myCredentials;
     AmazonS3 s3client;
     Region region;
@@ -40,7 +41,6 @@ public class AccountAdd extends AppCompatActivity {
         arpick = (EditText)findViewById(R.id.region);
         aupick = (EditText)findViewById(R.id.username);
         appick = (EditText)findViewById(R.id.password);
-        pathstyle = (SwitchMaterial) findViewById(R.id.pathstyle);
         Button register = (Button)findViewById(R.id.addaccount);
         Button accounttest = (Button)findViewById(R.id.testaccount);
         edit = getIntent().getBooleanExtra("edit", false);
@@ -53,14 +53,9 @@ public class AccountAdd extends AppCompatActivity {
             password = getIntent().getStringExtra("password");
             location = getIntent().getStringExtra("region");
             pdfendpoint = getIntent().getStringExtra("pdfendpoint");
-            if (getIntent().getBooleanExtra("style", false)) {
-                pathstyle.setChecked(true);
-            } else {
-                pathstyle.setChecked(false);
-            }
             aapick.setText(id);
-            aepick.setText(endpoint);
             //aapick.setEnabled(false);
+            aepick.setText(endpoint);
             aupick.setText(username);
             appick.setText(password);
             arpick.setText(location);
@@ -81,12 +76,12 @@ public class AccountAdd extends AppCompatActivity {
                 location = arpick.getText().toString();
                 username = aupick.getText().toString();
                 password = appick.getText().toString();
-                if (pathstyle.isChecked()) {
-                    style = "1";
-                } else {
-                    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();
@@ -100,14 +95,11 @@ 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+"\"");
+                            db.execSQL("UPDATE account SET id=\""+id+"\", endpoint=\""+endpoint+"\", username=\""+username+"\", password=\""+password+"\", region=\""+location+"\", pdfendpoint=\""+pdfendpoint+"\" WHERE id=\""+id+"\"");
                             Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountsave_success), Toast.LENGTH_SHORT).show();
                         } else {
-                            db.execSQL("INSERT INTO account VALUES (\""+alias+"\", \""+endpoint+"\", \""+username+"\", \""+password+"\", \""+location+"\", \""+pdfendpoint+"\", \""+style+"\")");
+                            db.execSQL("INSERT INTO account VALUES (\""+alias+"\", \""+endpoint+"\", \""+username+"\", \""+password+"\", \""+location+"\", \""+pdfendpoint+"\")");
                             Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountadd_success), Toast.LENGTH_SHORT).show();
                         }
                         mainmenu();
@@ -128,6 +120,10 @@ 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://")) {
@@ -141,16 +137,14 @@ public class AccountAdd extends AppCompatActivity {
                         public void run() {
                             try  {
                                 //Your code goes here
-                                if (endpoint.contains(getResources().getString(R.string.aws_endpoint)) || location.equals("")) {
-                                    region = Region.getRegion("us-east-1");
-                                } else {
-                                    region = Region.getRegion(location);
-                                }
-                                if(endpoint.endsWith("/")) {
-                                    endpoint = endpoint.substring(0, endpoint.length()-1);
+                                if (location.equals("")) {
+                                    location = "us-east-1";
                                 }
+                                region = Region.getRegion("us-east-1");
                                 S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
-                                s3ClientOptions.setPathStyleAccess(pathstyle.isChecked());
+                                if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+                                    s3ClientOptions.setPathStyleAccess(true);
+                                }
                                 myCredentials = new BasicAWSCredentials(username, password);
                                 s3client = new AmazonS3Client(myCredentials, region);
                                 s3client.setEndpoint(endpoint);
@@ -173,7 +167,7 @@ public class AccountAdd extends AppCompatActivity {
 
                                     @Override
                                     public void run() {
-                                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                                     }
                                 });
                             }
diff --git a/app/src/main/java/asgardius/page/s3manager/Adapter.java b/app/src/main/java/asgardius/page/s3manager/Adapter.java
index 4631f78..4d0e91a 100644
--- a/app/src/main/java/asgardius/page/s3manager/Adapter.java
+++ b/app/src/main/java/asgardius/page/s3manager/Adapter.java
@@ -7,11 +7,10 @@ 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;
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketPolicy.java b/app/src/main/java/asgardius/page/s3manager/BucketPolicy.java
deleted file mode 100644
index 033f708..0000000
--- a/app/src/main/java/asgardius/page/s3manager/BucketPolicy.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package asgardius.page.s3manager;
-
-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();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index 2da8bbc..60e4e28 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -1,16 +1,16 @@
 package asgardius.page.s3manager;
 
+import static android.media.MediaExtractor.MetricsConstants.MIME_TYPE;
+import static com.amazonaws.regions.Regions.US_EAST_1;
+
 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;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
@@ -26,6 +26,7 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.Bucket;
+import com.amazonaws.services.s3.model.DeleteObjectRequest;
 import com.amazonaws.services.s3.model.DeleteObjectsRequest;
 import com.amazonaws.services.s3.model.ListObjectsRequest;
 import com.amazonaws.services.s3.model.ObjectListing;
@@ -39,14 +40,13 @@ public class BucketSelect extends AppCompatActivity {
     ArrayList Name;
     ArrayList Img;
     RecyclerView recyclerView;
-    String username, password, endpoint, prefix, location, pdfendpoint;
-    boolean style, isplaylist;
+    String username, password, endpoint, prefix, location, file, pdfendpoint;
+    int treelevel;
     Region region;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
     AmazonS3 s3client;
     ProgressBar simpleProgressBar;
-    int videocache, videotime, buffersize, treelevel, playlisttime;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,21 +56,13 @@ public class BucketSelect extends AppCompatActivity {
         password = getIntent().getStringExtra("password");
         location = getIntent().getStringExtra("region");
         pdfendpoint = getIntent().getStringExtra("pdfendpoint");
-        style = getIntent().getBooleanExtra("style", false);
-        videocache = getIntent().getIntExtra("videocache", 40);
-        videotime = getIntent().getIntExtra("videotime", 1);
-        playlisttime = getIntent().getIntExtra("playlisttime", 1);
-        buffersize = getIntent().getIntExtra("buffersize", 2000);
-        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);
-        }
+        region = Region.getRegion("us-east-1");
         s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(style);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         myCredentials = new BasicAWSCredentials(username, password);
         s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
@@ -127,7 +119,7 @@ public class BucketSelect extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            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(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -165,17 +157,7 @@ public class BucketSelect extends AppCompatActivity {
                             //Toast.makeText(MainActivity.this, "You Clicked " + menuItem.getTitle(), Toast.LENGTH_SHORT).show();
                             if (menuItem.getTitle() == getResources().getString(R.string.upload_file_tobucket)) {
                                 //Toast.makeText(BucketSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
-                                upload(Name.get(position).toString(), false);
-
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.upload_folder_tobucket)) {
-                                //Toast.makeText(BucketSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
-                                upload(Name.get(position).toString(), true);
-
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.create_link)) {
-                                share(Name.get(position).toString());
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.download_bucket)) {
-                                //Toast.makeText(BucketSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
-                                download(Name.get(position).toString());
+                                upload(Name.get(position).toString());
 
                             } else if (menuItem.getTitle() == getResources().getString(R.string.create_bucket)) {
                                 //upload();
@@ -183,14 +165,6 @@ public class BucketSelect extends AppCompatActivity {
                                 //System.out.println(file);
                                 //Toast.makeText(BucketSelect.this, intent.getData().toString(), Toast.LENGTH_SHORT).show();
 
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.object_info)) {
-                                objectInfo(Name.get(position).toString());
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.copy_name)) {
-                                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());
@@ -217,29 +191,6 @@ public class BucketSelect extends AppCompatActivity {
         intent.putExtra("treelevel", treelevel);
         intent.putExtra("region", location);
         intent.putExtra("pdfendpoint", pdfendpoint);
-        intent.putExtra("style", style);
-        intent.putExtra("videocache", videocache);
-        intent.putExtra("videotime", videotime);
-        intent.putExtra("buffersize", buffersize);
-        intent.putExtra("playlisttime", playlisttime);
-        intent.putExtra("isplaylist", isplaylist);
-        startActivity(intent);
-
-    }
-
-    private void share(String bucket) {
-
-        Intent intent = new Intent(this, Share.class);
-        //treelevel ++;
-        intent.putExtra("endpoint", endpoint);
-        intent.putExtra("username", username);
-        intent.putExtra("password", password);
-        intent.putExtra("bucket", bucket);
-        intent.putExtra("title", bucket);
-        intent.putExtra("region", location);
-        intent.putExtra("videotime", videotime);
-        intent.putExtra("playlisttime", playlisttime);
-        intent.putExtra("style", style);
         startActivity(intent);
 
     }
@@ -247,7 +198,7 @@ public class BucketSelect extends AppCompatActivity {
     private void delete(String bucket) {
         AlertDialog.Builder builder = new AlertDialog.Builder(BucketSelect.this);
         builder.setCancelable(true);
-        builder.setTitle(bucket);
+        builder.setTitle(getResources().getString(R.string.file_del));
         builder.setMessage(getResources().getString(R.string.bucket_del_confirm));
         builder.setPositiveButton(android.R.string.ok,
                 new DialogInterface.OnClickListener() {
@@ -260,31 +211,31 @@ public class BucketSelect extends AppCompatActivity {
                             public void run() {
                                 try  {
                                     //Your code goes here
-                                    ListObjectsRequest orequest = new ListObjectsRequest().withBucketName(bucket).withMaxKeys(1000);
+                                    ListObjectsRequest orequest = new ListObjectsRequest().withBucketName(bucket).withMaxKeys(8000);
                                     //List<S3Object> objects = (List<S3Object>) s3client.listObjects(bucket, "/");
                                     ObjectListing result = s3client.listObjects(orequest);
                                     ArrayList<String> objectl = new ArrayList<String>();
                                     List<S3ObjectSummary> objects = result.getObjectSummaries();
-                                    for (S3ObjectSummary os : objects) {
-                                        objectl.add(os.getKey());
+                                    boolean nextbatch = false;
+                                    while (result.isTruncated() || !nextbatch) {
+                                        if (nextbatch) {
+                                            result = s3client.listNextBatchOfObjects (result);
+                                            objects = result.getObjectSummaries();
+                                        } else {
+                                            nextbatch = true;
+                                        }
+                                        for (S3ObjectSummary os : objects) {
+                                            objectl.add(os.getKey());
+
+                                            //i++;
+                                        }
+
                                     }
+                                    //System.out.println(object);
                                     if (objectl.size() >= 1) {
                                         DeleteObjectsRequest deleteObjectsRequest = new DeleteObjectsRequest(bucket).withKeys(objectl.toArray(new String[0]));
                                         s3client.deleteObjects(deleteObjectsRequest);
                                     }
-                                    while (result.isTruncated()) {
-                                        objectl = new ArrayList<String>();
-                                        result = s3client.listNextBatchOfObjects (result);
-                                        objects = result.getObjectSummaries();
-                                        for (S3ObjectSummary os : objects) {
-                                            objectl.add(os.getKey());
-                                            //i++;
-                                        }
-                                        DeleteObjectsRequest deleteObjectsRequest = new DeleteObjectsRequest(bucket).withKeys(objectl.toArray(new String[0]));
-                                        s3client.deleteObjects(deleteObjectsRequest);
-
-                                    }
-                                    //System.out.println("bucket items: " + objectl.size());
                                     s3client.deleteBucket(bucket);
                                     runOnUiThread(new Runnable() {
 
@@ -305,7 +256,7 @@ public class BucketSelect extends AppCompatActivity {
 
                                         @Override
                                         public void run() {
-                                            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(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -326,7 +277,7 @@ public class BucketSelect extends AppCompatActivity {
         dialog.show();
     }
 
-    private void upload(String bucket, boolean isfolder) {
+    private void upload(String bucket) {
         Intent intent = new Intent(this, Uploader.class);
         intent.putExtra("endpoint", endpoint);
         intent.putExtra("username", username);
@@ -334,91 +285,16 @@ public class BucketSelect extends AppCompatActivity {
         intent.putExtra("bucket", bucket);
         intent.putExtra("prefix", prefix);
         intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        intent.putExtra("isfolder", isfolder);
         startActivity(intent);
     }
 
-    private void objectInfo(String bucket) {
-
-        Intent intent = new Intent(this, ObjectInfo.class);
-        //treelevel ++;
-        intent.putExtra("endpoint", endpoint);
-        intent.putExtra("username", username);
-        intent.putExtra("password", password);
-        intent.putExtra("bucket", bucket);
-        intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        startActivity(intent);
-
-    }
-
     private void newBucket() {
         Intent intent = new Intent(this, CreateBucket.class);
         intent.putExtra("endpoint", endpoint);
         intent.putExtra("username", username);
         intent.putExtra("password", password);
         intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        //startActivity(intent);
-        ((Activity) this).startActivityForResult(intent, 25);
-    }
-
-    private void download(String bucket) {
-
-        Intent intent = new Intent(this, Downloader.class);
-        intent.putExtra("endpoint", endpoint);
-        intent.putExtra("username", username);
-        intent.putExtra("password", password);
-        intent.putExtra("prefix", prefix);
-        intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        intent.putExtra("bucket", bucket);
-        intent.putExtra("isfolder", true);
         startActivity(intent);
     }
 
-    private void corsConfig(String bucket) {
-        Intent intent = new Intent(this, CorsConfig.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);
-    }
-
-    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);
-        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();
-        }
-    }
-
-    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();
-        }
-    }
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java b/app/src/main/java/asgardius/page/s3manager/CorsConfig.java
deleted file mode 100644
index cba45f3..0000000
--- a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package asgardius.page.s3manager;
-
-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;
-import com.amazonaws.services.s3.model.BucketCrossOriginConfiguration;
-import com.amazonaws.services.s3.model.CORSRule;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class CorsConfig extends AppCompatActivity {
-    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;
-    TextView origins;
-    Button allowall, allowpdf, deletecors;
-    BucketCrossOriginConfiguration corsconfig;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_cors_config);
-        simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
-        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");
-        allowall = (Button)findViewById(R.id.allow_all);
-        allowpdf = (Button)findViewById(R.id.allow_pdf);
-        deletecors = (Button)findViewById(R.id.delete_cors);
-        try {
-            pdfendpoint = new URI(getIntent().getStringExtra("pdfendpoint"));
-        } catch (URISyntaxException e) {
-            e.printStackTrace();
-        }
-        getSupportActionBar().setTitle(bucket+"/");
-        region = Region.getRegion(location);
-        s3ClientOptions = S3ClientOptions.builder().build();
-        myCredentials = new BasicAWSCredentials(username, password);
-        origins = (TextView) findViewById(R.id.origins);
-        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);
-        Thread getCors = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    bucketcors = s3client.getBucketCrossOriginConfiguration(bucket);
-                    if (bucketcors != null) {
-                        List<CORSRule> corsRules = bucketcors.getRules();
-                        if (!corsRules.isEmpty()) {
-                            found = true;
-                            for (CORSRule rule: corsRules) {
-                                //System.out.println("allowOrigins: "+rule.getAllowedOrigins());
-                                //System.out.println("AllowedMethod: "+rule.getAllowedMethods());
-                                if (rule.getAllowedOrigins().toString().equals("[*]")) {
-                                    allorigins = true;
-                                } else if (rule.getAllowedOrigins().toString().contains("https://"+pdfendpoint.getHost())) {
-                                    pdfcompatible = true;
-                                }
-                            }
-                        }
-                    }
-
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            simpleProgressBar.setVisibility(View.INVISIBLE);
-                            if (allorigins) {
-                                origins.setText(getResources().getString(R.string.cors_all));
-                                deletecors.setVisibility(View.VISIBLE);
-                            } else if (pdfcompatible) {
-                                origins.setText(getResources().getString(R.string.cors_pdf));
-                                deletecors.setVisibility(View.VISIBLE);
-                                allowall.setVisibility(View.VISIBLE);
-                            } else if (found) {
-                                origins.setText(getResources().getString(R.string.cors_npdf));
-                                deletecors.setVisibility(View.VISIBLE);
-                                allowpdf.setVisibility(View.VISIBLE);
-                                allowall.setVisibility(View.VISIBLE);
-                            } else {
-                                origins.setText(getResources().getString(R.string.cors_none));
-                                allowall.setVisibility(View.VISIBLE);
-                                allowpdf.setVisibility(View.VISIBLE);
-                            }
-                        }
-                    });
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                        }
-                    });
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            }
-        });
-        getCors.start();
-        allowall.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view) {
-                //buttonaction
-                simpleProgressBar.setVisibility(View.VISIBLE);
-                setAllowall();
-            }
-        });
-        allowpdf.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view) {
-                //buttonaction
-                simpleProgressBar.setVisibility(View.VISIBLE);
-                setAllowpdf();
-            }
-        });
-        deletecors.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view) {
-                //buttonaction
-                simpleProgressBar.setVisibility(View.VISIBLE);
-                setDeletecors();
-            }
-        });
-    }
-
-    private void setAllowall() {
-        Thread addAll = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    List<CORSRule.AllowedMethods> allowMethods = new ArrayList<>();
-                    allowMethods.add(CORSRule.AllowedMethods.GET);
-                    List<String> allowOrigins = new ArrayList<>();
-                    allowOrigins.add("*");
-                    CORSRule corsRules = new CORSRule().withAllowedMethods(allowMethods).withAllowedOrigins(allowOrigins);
-                    corsconfig = new BucketCrossOriginConfiguration().withRules(corsRules);
-                    s3client.setBucketCrossOriginConfiguration(bucket, corsconfig);
-
-                    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();
-                }
-            }
-        });
-        addAll.start();
-    }
-
-    private void setAllowpdf() {
-        Thread addPdf = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    List<CORSRule.AllowedMethods> allowMethods = new ArrayList<>();
-                    allowMethods.add(CORSRule.AllowedMethods.GET);
-                    List<String> allowOrigins = new ArrayList<>();
-                    allowOrigins.add("https://"+pdfendpoint.getHost());
-                    CORSRule corsRules = new CORSRule().withAllowedMethods(allowMethods).withAllowedOrigins(allowOrigins);
-                    corsconfig = new BucketCrossOriginConfiguration().withRules(corsRules);
-                    s3client.setBucketCrossOriginConfiguration(bucket, corsconfig);
-
-                    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();
-                }
-            }
-        });
-        addPdf.start();
-    }
-
-    private void setDeletecors() {
-        Thread delCors = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    s3client.deleteBucketCrossOriginConfiguration(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();
-                }
-            }
-        });
-        delCors.start();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java b/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
index d8c7831..5a41e9d 100644
--- a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
+++ b/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
@@ -1,6 +1,9 @@
 package asgardius.page.s3manager;
 
+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;
@@ -8,18 +11,22 @@ 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;
-    boolean style;
     EditText bname;
     Region region;
     S3ClientOptions s3ClientOptions;
@@ -35,10 +42,11 @@ public class CreateBucket extends AppCompatActivity {
         username = getIntent().getStringExtra("username");
         password = getIntent().getStringExtra("password");
         location = getIntent().getStringExtra("region");
-        style = getIntent().getBooleanExtra("style", false);
         region = Region.getRegion("us-east-1");
         s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(style);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         myCredentials = new BasicAWSCredentials(username, password);
         s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
@@ -67,10 +75,8 @@ 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();
-                                        finish();
-                                        //mainmenu();
+                                        mainmenu();
 
                                     }
                                 });
@@ -83,7 +89,7 @@ public class CreateBucket extends AppCompatActivity {
 
                                     @Override
                                     public void run() {
-                                        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(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
@@ -100,12 +106,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);
 
-    }*/
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/Downloader.java b/app/src/main/java/asgardius/page/s3manager/Downloader.java
index ea6aa21..db3a0ca 100644
--- a/app/src/main/java/asgardius/page/s3manager/Downloader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Downloader.java
@@ -3,9 +3,9 @@ package asgardius.page.s3manager;
 import static android.content.ContentValues.TAG;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.documentfile.provider.DocumentFile;
 
 import android.app.Activity;
+import android.app.DownloadManager;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -17,7 +17,9 @@ import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.amazonaws.auth.AWSCredentials;
@@ -26,38 +28,28 @@ 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.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
 import com.amazonaws.services.s3.model.S3Object;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
+import com.google.android.material.snackbar.Snackbar;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Downloader extends AppCompatActivity {
     String username, password, endpoint, bucket, filename, prefix, location;
-    Uri fileuri, filepath;
+    Uri fileuri;
     Region region;
-    String[] folder;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
     AmazonS3 s3client;
     ProgressBar simpleProgressBar;
-    ListObjectsRequest orequest;
     Intent intent;
     Button fileDownload;
-    Thread downloadFile, downloadProgress;
+    Thread downloadFile;
     S3Object object;
-    DocumentFile document;
-    boolean started = false;
-    boolean cancel = false;
-    boolean style, isfolder;
-    long filesize = 0;
-    long objectsize;
-    long transfered = 0;
     private WifiManager.WifiLock mWifiLock;
     private PowerManager.WakeLock mWakeLock;
     private PowerManager powerManager;
@@ -76,19 +68,14 @@ public class Downloader extends AppCompatActivity {
         password = getIntent().getStringExtra("password");
         bucket = getIntent().getStringExtra("bucket");
         location = getIntent().getStringExtra("region");
-        style = getIntent().getBooleanExtra("style", false);
-        isfolder = getIntent().getBooleanExtra("isfolder", false);
         prefix = getIntent().getStringExtra("prefix");
-        if(isfolder) {
-            getSupportActionBar().setTitle(getResources().getString(R.string.download_files));
-        } else {
-            getSupportActionBar().setTitle(getResources().getString(R.string.download_file));
-        }
         simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
         fileDownload = (Button)findViewById(R.id.filedownload);
         region = Region.getRegion(location);
         s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(style);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         myCredentials = new BasicAWSCredentials(username, password);
         s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
@@ -98,209 +85,95 @@ public class Downloader extends AppCompatActivity {
             @Override
             public void onClick(View view) {
                 //buttonaction
-                if (started) {
-                    cancel = true;
-                    downloadFile.interrupt();
-                    //simpleProgressBar.setVisibility(View.INVISIBLE);
-                } else {
-                    downloadFile();
-                }
-            }
-
-        });
-    }
-
-    private void downloadFile () {
-        started = true;
-        simpleProgressBar.setVisibility(View.VISIBLE);
-        //fileDownload.setEnabled(false);
-        fileDownload.setText(getResources().getString(R.string.cancel_download));
-        //Acquiring WakeLock and WifiLock if not held
-        if (!mWifiLock.isHeld()) {
-            mWifiLock.acquire();
-            //System.out.println("WifiLock acquired");
-        }
-        if (!mWakeLock.isHeld()) {
-            mWakeLock.acquire();
-            //System.out.println("WakeLock acquired");
-        }
-        downloadFile = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
                 simpleProgressBar.setVisibility(View.VISIBLE);
-                try  {
-                    //Your code goes here
-                    //s3client.createBucket(bucket, location);
-                    //System.out.println(fkey);
-                    if (isfolder) {
-                        if (prefix == null) {
-                            orequest = new ListObjectsRequest().withBucketName(bucket).withMaxKeys(1000);
-                        } else {
-                            orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(prefix).withMaxKeys(1000);
-                        }
-                        ArrayList<String> objectlist = new ArrayList<String>();
-                        ObjectListing result = s3client.listObjects(orequest);
-                        List<S3ObjectSummary> objects = result.getObjectSummaries();
-                        for (S3ObjectSummary os : objects) {
-                            objectlist.add(os.getKey());
-                            objectsize = os.getSize();
-                            if (objectsize%1024 == 0) {
-                                filesize = filesize+(objectsize/1024);
-                            } else {
-                                filesize = filesize+(objectsize/1024)+1;
-                            }
-                        }
-                        while (result.isTruncated()) {
-                            result = s3client.listNextBatchOfObjects (result);
-                            objects = result.getObjectSummaries();
-                            for (S3ObjectSummary os : objects) {
-                                objectlist.add(os.getKey());
-                                objectsize = os.getSize();
-                                if (objectsize%1024 == 0) {
-                                    filesize = filesize+(objectsize/1024);
-                                } else {
-                                    filesize = filesize+(objectsize/1024)+1;
-                                }
-                            }
-
-                        }
-                        for (String os : objectlist) {
-                            document = DocumentFile.fromTreeUri(getApplicationContext(), fileuri);
-                            object = s3client.getObject(bucket, os);
-                            if (os.replace(prefix, "").contains("/")) {
-                                folder = os.replace(prefix, "").split("/");
-                                for (int i = 0; i < folder.length-1; i++) {
-                                    DocumentFile subfolder = document.findFile(folder[i].replace("/", ""));
-                                    if (subfolder != null) {
-                                        document = subfolder;
-                                    } else {
-                                        document = document.createDirectory(folder[i].replace("/", ""));
-                                    }
-                                }
-                                filepath = document.createFile(null, folder[folder.length-1]).getUri();
-                            } else {
-                                filepath = document.createFile(null, os.replace(prefix, "")).getUri();
-                            }
-                            writeContentToFile(filepath, object);
-                        }
-                    } else {
-                        object = s3client.getObject(bucket, prefix+filename);
-                        filesize = (object.getObjectMetadata().getContentLength())/1024;
-                        writeContentToFile(fileuri, object);
-                    }
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            //simpleProgressBar.setProgress(100);
-                            //Releasing WifiLock and WakeLock if held
-                            if (mWifiLock.isHeld()) {
-                                mWifiLock.release();
-                                //System.out.println("WifiLock released");
-                            }
-                            if (mWakeLock.isHeld()) {
-                                mWakeLock.release();
-                                //System.out.println("WakeLock released");
-                            }
-                            simpleProgressBar.setProgress(100);
-                            if (isfolder) {
-                                fileDownload.setText(getResources().getString(R.string.batch_download_success));
-                            } else {
-                                fileDownload.setText(getResources().getString(R.string.download_success));
-                            }
-                            fileDownload.setEnabled(false);
-                            //simpleProgressBar.setVisibility(View.INVISIBLE);
-                        }
-                    });
-                    //System.out.println("tree "+treelevel);
-                    //System.out.println("prefix "+prefix);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            //Releasing WifiLock and WakeLock if held
-                            if (mWifiLock.isHeld()) {
-                                mWifiLock.release();
-                                //System.out.println("WifiLock released");
-                            }
-                            if (mWakeLock.isHeld()) {
-                                mWakeLock.release();
-                                //System.out.println("WakeLock released");
-                            }
-                            if (cancel) {
-                                fileDownload.setText(getResources().getString(R.string.download_canceled));
-                            } else {
-                                fileDownload.setText(getResources().getString(R.string.download_failed));
-                            }
-                            fileDownload.setEnabled(false);
-                        }
-                    });
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    //finish();
+                fileDownload.setEnabled(false);
+                fileDownload.setText(getResources().getString(R.string.download_in_progress));
+                //Acquiring WakeLock and WifiLock if not held
+                if (!mWifiLock.isHeld()) {
+                    mWifiLock.acquire();
+                    //System.out.println("WifiLock acquired");
                 }
-            }
-        });
-        downloadProgress = new Thread(new Runnable() {
+                if (!mWakeLock.isHeld()) {
+                    mWakeLock.acquire();
+                    //System.out.println("WakeLock acquired");
+                }
+                downloadFile = new Thread(new Runnable() {
+
+                    @Override
+                    public void run() {
+                        simpleProgressBar.setVisibility(View.VISIBLE);
+                        try  {
+                            //Your code goes here
+                            //s3client.createBucket(bucket, location);
+                            //System.out.println(fkey);
+                            object = s3client.getObject(bucket, prefix+filename);
+                            writeContentToFile(fileuri);
+                            runOnUiThread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    //simpleProgressBar.setProgress(100);
+                                    //Releasing WifiLock and WakeLock if held
+                                    if (mWifiLock.isHeld()) {
+                                        mWifiLock.release();
+                                        //System.out.println("WifiLock released");
+                                    }
+                                    if (mWakeLock.isHeld()) {
+                                        mWakeLock.release();
+                                        //System.out.println("WakeLock released");
+                                    }
+                                    simpleProgressBar.setVisibility(View.INVISIBLE);
+                                    fileDownload.setText(getResources().getString(R.string.download_success));
+                                    Toast.makeText(getApplicationContext(),getResources().getString(R.string.download_success), Toast.LENGTH_SHORT).show();
+                                    //simpleProgressBar.setVisibility(View.INVISIBLE);
+                                }
+                            });
+                            //System.out.println("tree "+treelevel);
+                            //System.out.println("prefix "+prefix);
 
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    while (fileDownload.isEnabled()) {
-                        try {
-                            if (filesize != 0) {
-                                simpleProgressBar.setProgress((int)((transfered*100)/filesize));
-                            }
-                            Thread.sleep(500);
                         } catch (Exception e) {
                             e.printStackTrace();
+                            runOnUiThread(new Runnable() {
+
+                                @Override
+                                public void run() {
+                                    //Releasing WifiLock and WakeLock if held
+                                    if (mWifiLock.isHeld()) {
+                                        mWifiLock.release();
+                                        //System.out.println("WifiLock released");
+                                    }
+                                    if (mWakeLock.isHeld()) {
+                                        mWakeLock.release();
+                                        //System.out.println("WakeLock released");
+                                    }
+                                    simpleProgressBar.setVisibility(View.INVISIBLE);
+                                    fileDownload.setText(getResources().getString(R.string.download_failed));
+                                    Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                }
+                            });
+                            //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                            //finish();
                         }
                     }
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    //finish();
-                }
+                });
+                downloadFile.start();
             }
+
         });
-        downloadFile.start();
-        downloadProgress.start();
     }
 
     private void performFileSearch(String messageTitle) {
         //uri = Uri.parse("content://com.android.externalstorage.documents/document/home");
         intent = new Intent();
-        if (isfolder) {
-            intent.setAction(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        } else {
-            intent.setAction(Intent.ACTION_CREATE_DOCUMENT);
-            //intent.addCategory(Intent.CATEGORY_OPENABLE);
-            //intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-            //intent.putExtra("android.provider.extra.INITIAL_URI", uri);
-            intent.putExtra(Intent.EXTRA_TITLE, filename);
-            intent.setType("*/*");
-        }
+        intent.setAction(Intent.ACTION_CREATE_DOCUMENT);
+        //intent.addCategory(Intent.CATEGORY_OPENABLE);
+        //intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+        //intent.putExtra("android.provider.extra.INITIAL_URI", uri);
+        intent.putExtra(Intent.EXTRA_TITLE, filename);
+        intent.setType("*/*");
         ((Activity) this).startActivityForResult(intent, 50);
     }
 
     @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,
@@ -314,7 +187,6 @@ public class Downloader extends AppCompatActivity {
                 if (resultData != null && resultData.getData() != null) {
                     fileuri = resultData.getData();
                     System.out.println(fileuri.toString());
-                    downloadFile();
                     //System.out.println("File selected successfully");
                     //System.out.println("content://com.android.externalstorage.documents"+file.getPath());
                 } else {
@@ -328,7 +200,7 @@ public class Downloader extends AppCompatActivity {
         }
     }
 
-    private void writeContentToFile(Uri uri, S3Object object) throws IOException {
+    private void writeContentToFile(Uri uri) throws IOException {
         try (
                 final InputStream in = object.getObjectContent();
                 final OutputStream out = getContentResolver().openOutputStream(uri);
@@ -336,7 +208,6 @@ public class Downloader extends AppCompatActivity {
             byte[] buffer = new byte[1024];
             for (int len; (len = in.read(buffer)) != -1; ) {
                 out.write(buffer, 0, len);
-                transfered ++;
             }
         }
     }
diff --git a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
index b9dc22f..ef41057 100644
--- a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
+++ b/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
@@ -1,37 +1,29 @@
 package asgardius.page.s3manager;
 
-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.view.WindowManager;
-import android.widget.ProgressBar;
-import android.widget.Toast;
-
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.otaliastudios.zoom.ZoomImageView;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.Toast;
 
+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;
-    ZoomImageView iv;
-    boolean controls = false;
-    float cursorx, cursory;
+    String videoURL;
+    ImageView iv;
 
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_image_viewer);
-        videoURL = getIntent().getStringExtra("video_url");
-        title = getIntent().getStringExtra("title");
-        getSupportActionBar().setTitle(title);
         final ProgressBar simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
-        iv = (ZoomImageView) findViewById(R.id.imageViewer);
+        iv = (ImageView) findViewById(R.id.imageViewer);
         //System.out.println(videoURL);
         Thread imgread = new Thread(new Runnable() {
 
@@ -39,6 +31,7 @@ public class ImageViewer extends AppCompatActivity {
             public void run() {
                 try  {
                     //Your code goes here
+                    videoURL = getIntent().getStringExtra("video_url");
                     URL thumb_u = new URL(videoURL);
                     Drawable thumb_d = Drawable.createFromStream(thumb_u.openStream(), "src");
 
@@ -52,24 +45,13 @@ public class ImageViewer extends AppCompatActivity {
                         }
                     });
 
-                } catch (OutOfMemoryError e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.picture_too_big), Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
-                    });
-                    finish();
                 } catch (Exception e) {
                     e.printStackTrace();
                     runOnUiThread(new Runnable() {
 
                         @Override
                         public void run() {
-                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                             finish();
                         }
                     });
@@ -78,59 +60,21 @@ 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) {
-                cursorx = event.getX();
-                cursory = event.getY();
-                iv.performClick();
-
-                return true;
-            } else if (event.getAction() == MotionEvent.ACTION_UP) {
-                if(Math.abs(event.getX() - cursorx) < 5 || Math.abs(event.getY() - cursory) < 5) {
-                    if(controls) {
-                        controls = false;
-                        hideSystemBars();
-                    }
-                    else {
-                        controls = true;
-                        showSystemBars();
-                    }
-                }
-                return true;
-            }
-            return false;
-        });
     }
 
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
-        controls = false;
-        hideSystemBars();
 
-    }
 
-    private void hideSystemBars() {
-        // 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.
         View decorView = getWindow().getDecorView();
         decorView.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                         | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                         | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
-                        | View.SYSTEM_UI_FLAG_IMMERSIVE);
-    }
+                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
 
-    private void showSystemBars() {
-        View decorView = getWindow().getDecorView();
-        decorView.setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
index 9447245..88b4664 100644
--- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java
+++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
@@ -20,14 +20,12 @@ import java.util.ArrayList;
 
 public class MainActivity extends AppCompatActivity {
 
-    boolean style, isplaylist;
+    static boolean DEFAULT_PATH_STYLE_ACCESS = true;
     String alias, username, password, endpoint, location, pdfendpoint;
     RecyclerView recyclerView;
     SQLiteDatabase db;
     ArrayList Name;
     ArrayList Img;
-    MyDbHelper dbHelper;
-    int videocache, videotime, buffersize, playlisttime;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -40,217 +38,29 @@ public class MainActivity extends AppCompatActivity {
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getApplicationContext());
         recyclerView.setLayoutManager(linearLayoutManager);
 
-        dbHelper = new MyDbHelper(this);
-        Thread getprefs = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    // Database Queries
-                    try {
-                        db = dbHelper.getWritableDatabase();
-                        String query = "SELECT value FROM preferences where setting='videocache'";
-                        Cursor cursor = db.rawQuery(query,null);
-                        while (cursor.moveToNext()){
-                            videocache = (Integer.parseInt(cursor.getString(0)));
-                        }
-                        db.close();
-                        if (videocache == 0) {
-                            try {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("INSERT INTO preferences VALUES ('videocache', '300')");
-                                videocache = 300;
-                                db.close();
-                            } catch (Exception e) {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)");
-                                db.execSQL("INSERT INTO preferences VALUES ('videocache', '300')");
-                                db.execSQL("INSERT INTO preferences VALUES ('videotime', '3')");
-                                db.execSQL("INSERT INTO preferences VALUES ('buffersize', '12000')");
-                                db.execSQL("INSERT INTO preferences VALUES ('playlisttime', '5')");
-                                db.execSQL("INSERT INTO preferences VALUES ('isplaylist', '0')");
-                                videocache = 300;
-                                //videotime = 3;
-                                db.close();
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-                        //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                    try {
-                        db = dbHelper.getWritableDatabase();
-                        String query = "SELECT value FROM preferences where setting='videotime'";
-                        Cursor cursor = db.rawQuery(query,null);
-                        while (cursor.moveToNext()){
-                            videotime = (Integer.parseInt(cursor.getString(0)));
-                        }
-                        db.close();
-                        if (videotime == 0) {
-                            try {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("INSERT INTO preferences VALUES ('videotime', '3')");
-                                videotime = 3;
-                                db.close();
-                            } catch (Exception e) {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)");
-                                db.close();
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-                        //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                    try {
-                        db = dbHelper.getWritableDatabase();
-                        String query = "SELECT value FROM preferences where setting='playlisttime'";
-                        Cursor cursor = db.rawQuery(query,null);
-                        while (cursor.moveToNext()){
-                            playlisttime = (Integer.parseInt(cursor.getString(0)));
-                        }
-                        db.close();
-                        if (playlisttime == 0) {
-                            try {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("INSERT INTO preferences VALUES ('playlisttime', '5')");
-                                playlisttime = 5;
-                                db.close();
-                            } catch (Exception e) {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)");
-                                db.close();
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-                        //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                    try {
-                        db = dbHelper.getWritableDatabase();
-                        String query = "SELECT value FROM preferences where setting='isplaylist'";
-                        Cursor cursor = db.rawQuery(query,null);
-                        String update = null;
-                        while (cursor.moveToNext()){
-                            isplaylist = cursor.getString(0).equals("1");
-                            if(!isplaylist) {
-                                update = cursor.getString(0);
-                            }
-                        }
-                        db.close();
-                        if (!isplaylist && update == null) {
-                            try {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("INSERT INTO preferences VALUES ('isplaylist', '0')");
-                                isplaylist = false;
-                                db.close();
-                            } catch (Exception e) {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)");
-                                db.close();
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-                        //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                    try {
-                        db = dbHelper.getWritableDatabase();
-                        String query = "SELECT value FROM preferences where setting='buffersize'";
-                        Cursor cursor = db.rawQuery(query,null);
-                        while (cursor.moveToNext()){
-                            buffersize = (Integer.parseInt(cursor.getString(0)));
-                        }
-                        db.close();
-                        if (buffersize == 0) {
-                            try {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("INSERT INTO preferences VALUES ('buffersize', '12000')");
-                                buffersize = 12000;
-                                db.close();
-                            } catch (Exception e) {
-                                db = dbHelper.getWritableDatabase();
-                                db.execSQL("CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)");
-                                db.close();
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-                        //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                        }
-                    });
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    finish();
-                }
+        MyDbHelper dbHelper = new MyDbHelper(this);
+        db = dbHelper.getWritableDatabase();
+        if (db != null) {
+            // Database Queries
+            Name = new ArrayList<String>();
+            Img = new ArrayList<String>();
+            String query = "SELECT id FROM account";
+            Cursor cursor = db.rawQuery(query,null);
+            while (cursor.moveToNext()){
+                Name.add(cursor.getString(0));
+                Img.add(R.drawable.account);
             }
-        });
+            db.close();
+        } else {
+            Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
+        }
+
         Thread listaccount = new Thread(new Runnable() {
 
             @Override
             public void run() {
                 try  {
                     //Your code goes here
-                    db = dbHelper.getWritableDatabase();
-                    // Database Queries
-                    Name = new ArrayList<String>();
-                    Img = new ArrayList<String>();
-                    String query = "SELECT id FROM account";
-                    Cursor cursor = db.rawQuery(query,null);
-                    while (cursor.moveToNext()){
-                        Name.add(cursor.getString(0));
-                        Img.add(R.drawable.account);
-                    }
-                    db.close();
-                    getprefs.start();
                     runOnUiThread(new Runnable() {
 
                         @Override
@@ -288,8 +98,7 @@ public class MainActivity extends AppCompatActivity {
                 if (db != null) {
                     // Database Queries
                     try {
-                        //This retrieves credentials from selected account
-                        String query = "SELECT endpoint, username, password, region, pdfendpoint, style FROM account where id=\""+ Name.get(position).toString()+ "\"";
+                        String query = "SELECT endpoint, username, password, region, pdfendpoint FROM account where id=\""+ Name.get(position).toString()+ "\"";
                         Cursor cursor = db.rawQuery(query,null);
                         if (cursor.moveToNext()){
                             endpoint = cursor.getString(0);
@@ -297,27 +106,12 @@ public class MainActivity extends AppCompatActivity {
                             password = cursor.getString(2);
                             location = cursor.getString(3);
                             pdfendpoint = cursor.getString(4);
-                            try {
-                                style = cursor.getString(5).equals("1");
-                            } catch (Exception e) {
-                                e.printStackTrace();
-                                style = false;
-                            }
-
                             db.close();
-                            //This launch file explorer using selected account
                             explorer();
                         }
                     } catch (Exception e) {
                         e.printStackTrace();
-                        try {
-                            db = dbHelper.getWritableDatabase();
-                            db.execSQL("alter table account add column style text");
-                            db.close();
-                        } catch (Exception f) {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                            finish();
-                        }
+                        db.execSQL("ALTER TABLE account add column pdfendpoint text");
                     }
 
                 }
@@ -339,8 +133,7 @@ public class MainActivity extends AppCompatActivity {
                         if (menuItem.getTitle() == getResources().getString(R.string.accountedit_button)) {
                             try {
                                 db = dbHelper.getWritableDatabase();
-                                //This retrieves credentials from selected account
-                                String query = "SELECT id, endpoint, username, password, region, pdfendpoint, style FROM account where id=\""+ Name.get(position).toString()+ "\"";
+                                String query = "SELECT id, endpoint, username, password, region, pdfendpoint FROM account where id=\""+ Name.get(position).toString()+ "\"";
                                 System.out.println(query);
                                 Cursor cursor = db.rawQuery(query,null);
                                 if (cursor.moveToNext()){
@@ -350,33 +143,19 @@ public class MainActivity extends AppCompatActivity {
                                     password = cursor.getString(3);
                                     location = cursor.getString(4);
                                     pdfendpoint = cursor.getString(5);
-                                    try {
-                                        style = cursor.getString(6).equals("1");
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                        style = false;
-                                    }
                                 }
                                 db.close();
-                                //This launch account editor
                                 addaccount(true);
                                 //Toast.makeText(MainActivity.this, "This feature is not yet implemented", Toast.LENGTH_SHORT).show();
                             } catch (Exception e) {
                                 e.printStackTrace();
-                                try {
-                                    db = dbHelper.getWritableDatabase();
-                                    db.execSQL("alter table account add column style text");
-                                    db.close();
-                                } catch (Exception f) {
-                                    Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                                    finish();
-                                }
+                                db.execSQL("ALTER TABLE account add column pdfendpoint text");
                             }
                         }
                         else if (menuItem.getTitle() == getResources().getString(R.string.accountdel_button)) {
                             AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
                             builder.setCancelable(true);
-                            builder.setTitle(Name.get(position).toString());
+                            builder.setTitle(getResources().getString(R.string.accountdel_button));
                             builder.setMessage(getResources().getString(R.string.accountdel_confirm));
                             builder.setPositiveButton(android.R.string.ok,
                                     new DialogInterface.OnClickListener() {
@@ -384,7 +163,7 @@ public class MainActivity extends AppCompatActivity {
                                         public void onClick(DialogInterface dialog, int which) {
                                             db = dbHelper.getWritableDatabase();
                                             if (db != null) {
-                                                // This remove selected user account from local database
+                                                // Database Queries
                                                 try {
                                                     db.execSQL("DELETE FROM account where id=\""+ Name.get(position).toString()+ "\"");
                                                     Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountdel_success), Toast.LENGTH_SHORT).show();
@@ -415,24 +194,23 @@ public class MainActivity extends AppCompatActivity {
             }
         }));
 
-        //This is to add new user account
+        //This is to launch video playback test
         Button addaccount = (Button)findViewById(R.id.addaccount);
         addaccount.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
                 //buttonaction
-                //This launch account add screen
                 addaccount(false);
             }
         });
 
-        //This is to view app credits
-        Button settings = (Button)findViewById(R.id.settings_button);
-        settings.setOnClickListener(new View.OnClickListener(){
+        //This is to launch file explorer test
+        Button about = (Button)findViewById(R.id.about_button);
+        about.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
                 //buttonaction
-                settingsPage();
+                aboutPage();
             }
         });
     }
@@ -445,12 +223,6 @@ public class MainActivity extends AppCompatActivity {
         intent.putExtra("password", password);
         intent.putExtra("region", location);
         intent.putExtra("pdfendpoint", pdfendpoint);
-        intent.putExtra("style", style);
-        intent.putExtra("videocache", videocache);
-        intent.putExtra("videotime", videotime);
-        intent.putExtra("buffersize", buffersize);
-        intent.putExtra("playlisttime", playlisttime);
-        intent.putExtra("isplaylist", isplaylist);
         startActivity(intent);
 
     }
@@ -465,18 +237,17 @@ public class MainActivity extends AppCompatActivity {
             intent.putExtra("password", password);
             intent.putExtra("region", location);
             intent.putExtra("pdfendpoint", pdfendpoint);
-            intent.putExtra("style", style);
         }
         intent.putExtra("edit", edit);
         startActivity(intent);
 
     }
 
-    private void settingsPage() {
+    private void aboutPage () {
 
-        Intent intent = new Intent(this, Settings.class);
-        //intent.putExtra("web_url", "file:///android_asset/about.htm");
-        //intent.putExtra("title", getResources().getString(R.string.about_button));
+        Intent intent = new Intent(this, WebBrowser.class);
+        intent.putExtra("web_url", "file:///android_asset/about.htm");
+        intent.putExtra("title", getResources().getString(R.string.about_button));
         startActivity(intent);
 
     }
diff --git a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java b/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
index 931c69f..0674507 100644
--- a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
+++ b/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
@@ -5,14 +5,8 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
 public class MyDbHelper extends SQLiteOpenHelper {
-    private static final String usertable = "CREATE TABLE IF NOT EXISTS account(id text UNIQUE, endpoint text, username text, password text, region text, pdfendpoint text, style text)";
-    private static final String preftable = "CREATE TABLE IF NOT EXISTS preferences(setting text UNIQUE, value text)";
-    private static final String setvideocache = "INSERT INTO preferences VALUES ('videocache', '300')";
-    private static final String setvideotime = "INSERT INTO preferences VALUES ('videotime', '3')";
-    private static final String setbuffersize = "INSERT INTO preferences VALUES ('buffersize', '12000')";
-    private static final String setplaylisttime = "INSERT INTO preferences VALUES ('playlisttime', '5')";
-    private static final String setisplaylist = "INSERT INTO preferences VALUES ('isplaylist', '0')";
-    //private static final String upgrade = "ALTER TABLE account add column pdfendpoint text";
+    private static final String atcreate = "CREATE TABLE IF NOT EXISTS account(id text UNIQUE, endpoint text, username text, password text, region text, pdfendpoint text)";
+    private static final String atupgrade = "ALTER TABLE account add column pdfendpoint text";
     private static final int DATABASE_VERSION = 1;
     private static final String dbname = "accounts.sqlite3";
     private static final int dbversion = 3;
@@ -21,16 +15,10 @@ public class MyDbHelper extends SQLiteOpenHelper {
     }
     @Override
     public void onCreate(SQLiteDatabase db) {
-        db.execSQL(usertable);
-        db.execSQL(preftable);
-        db.execSQL(setvideocache);
-        db.execSQL(setvideotime);
-        db.execSQL(setbuffersize);
-        db.execSQL(setplaylisttime);
-        db.execSQL(setisplaylist);
+        db.execSQL(atcreate);
     }
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        //db.execSQL(upgrade);
+        db.execSQL(atupgrade);
     }
 }
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java b/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java
deleted file mode 100644
index fb034a8..0000000
--- a/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package asgardius.page.s3manager;
-
-import android.os.Bundle;
-import android.view.View;
-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.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
-
-import java.util.List;
-
-public class ObjectInfo extends AppCompatActivity {
-    String username, password, endpoint, bucket, object, location, title;
-    Region region;
-    S3ClientOptions s3ClientOptions;
-    AWSCredentials myCredentials;
-    AmazonS3 s3client;
-    ProgressBar simpleProgressBar;
-    TextView filesize, filesizeinfo, objectcount;
-    boolean isobject, isfolder, style;
-    long totalSize = 0;
-    int totalItems = 0;
-    ListObjectsRequest orequest;
-    long KiB, MiB, GiB;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_object_info);
-        KiB = 1024;
-        MiB = 1024 * KiB;
-        GiB = 1024 * MiB;
-        simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
-        filesize = (TextView) findViewById(R.id.size);
-        filesizeinfo = (TextView) findViewById(R.id.size_info);
-        objectcount = (TextView) findViewById(R.id.object_count);
-        endpoint = getIntent().getStringExtra("endpoint");
-        title = getIntent().getStringExtra("title");
-        username = getIntent().getStringExtra("username");
-        password = getIntent().getStringExtra("password");
-        bucket = getIntent().getStringExtra("bucket");
-        style = getIntent().getBooleanExtra("style", false);
-        location = getIntent().getStringExtra("region");
-        object = getIntent().getStringExtra("object");
-        if (object == null) {
-            getSupportActionBar().setTitle(bucket+"/");
-        } else {
-            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);
-        Thread getInfo = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    if (object == null) {
-                        isobject = false;
-                        orequest = new ListObjectsRequest().withBucketName(bucket).withMaxKeys(1000);
-                    } else {
-                        isobject = true;
-                        if (object.endsWith("/")) {
-                            isfolder = true;
-                        } else {
-                            isfolder = false;
-                        }
-                        orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(object).withMaxKeys(1000);
-                    }
-                    ObjectListing result = s3client.listObjects(orequest);
-                    List<S3ObjectSummary> objects = result.getObjectSummaries();
-                    for (S3ObjectSummary os : objects) {
-                        totalSize += os.getSize();
-                        totalItems++;
-                    }
-                    while (result.isTruncated()) {
-                        result = s3client.listNextBatchOfObjects (result);
-                        objects = result.getObjectSummaries();
-                        for (S3ObjectSummary os : objects) {
-                            totalSize += os.getSize();
-                            totalItems++;
-                        }
-
-                    }
-
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            if (isobject) {
-                                if (isfolder) {
-                                    filesizeinfo.setText(getResources().getString(R.string.folder_size));
-                                    objectcount.setText(totalItems+" "+getResources().getString(R.string.file_count));
-                                } else {
-                                    filesizeinfo.setText(getResources().getString(R.string.file_size));
-                                }
-                            } else {
-                                filesizeinfo.setText(getResources().getString(R.string.bucket_size));
-                                objectcount.setText(totalItems+" "+getResources().getString(R.string.file_count));
-                            }
-                            if (totalSize >= GiB) {
-                                filesize.setText(Long.toString(totalSize/GiB)+" GiB");
-                            } else if (totalSize >= MiB) {
-                                filesize.setText(Long.toString(totalSize/MiB)+" MiB");
-                            } else if (totalSize >= KiB) {
-                                filesize.setText(Long.toString(totalSize/KiB)+" KiB");
-                            } else {
-                                filesize.setText(Long.toString(totalSize)+" Bytes");
-                            }
-                            simpleProgressBar.setVisibility(View.INVISIBLE);
-                        }
-                    });
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                        }
-                    });
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            }
-        });
-        getInfo.start();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectPolicy.java b/app/src/main/java/asgardius/page/s3manager/ObjectPolicy.java
deleted file mode 100644
index 672301f..0000000
--- a/app/src/main/java/asgardius/page/s3manager/ObjectPolicy.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package asgardius.page.s3manager;
-
-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();
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
index 32a0c65..f187c93 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
@@ -4,12 +4,9 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
+
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.MenuItem;
 import android.view.View;
@@ -30,13 +27,10 @@ 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;
-import java.util.Calendar;
-import java.util.Date;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 
@@ -46,15 +40,14 @@ public class ObjectSelect extends AppCompatActivity {
     ArrayList Img;
     //ArrayList object;
     RecyclerView recyclerView;
-    String username, password, endpoint, bucket, prefix, location, pdfendpoint, query, policy;
-    boolean style, isplaylist;
+    String username, password, endpoint, bucket, prefix, location, pdfendpoint;
+    int treelevel;
     String[] filename;
     Region region;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
     AmazonS3 s3client;
     ProgressBar simpleProgressBar;
-    int videocache, videotime, buffersize, treelevel, playlisttime;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -65,14 +58,8 @@ public class ObjectSelect extends AppCompatActivity {
         bucket = getIntent().getStringExtra("bucket");
         location = getIntent().getStringExtra("region");
         pdfendpoint = getIntent().getStringExtra("pdfendpoint");
-        style = getIntent().getBooleanExtra("style", false);
         prefix = getIntent().getStringExtra("prefix");
         treelevel = getIntent().getIntExtra("treelevel", 0);
-        videocache = getIntent().getIntExtra("videocache", 40);
-        videotime = getIntent().getIntExtra("videotime", 1);
-        playlisttime = getIntent().getIntExtra("playlisttime", 1);
-        buffersize = getIntent().getIntExtra("buffersize", 2000);
-        isplaylist = getIntent().getBooleanExtra("isplaylist", false);
         setContentView(R.layout.activity_object_select);
         getSupportActionBar().setTitle(bucket+"/"+prefix);
         region = Region.getRegion(location);
@@ -81,10 +68,12 @@ public class ObjectSelect extends AppCompatActivity {
         try {
             s3client = new AmazonS3Client(myCredentials, region);
         } catch (Exception e) {
-            Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
         }
         s3client.setEndpoint(endpoint);
-        s3ClientOptions.setPathStyleAccess(style);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
 
         s3client.setS3ClientOptions(s3ClientOptions);
 
@@ -102,61 +91,26 @@ public class ObjectSelect extends AppCompatActivity {
                 try  {
                     //Your code goes here
                     //List<Bucket> buckets = s3client.listBuckets();
-                    ListObjectsRequest orequest;
-                    if (treelevel == 0) {
-                        orequest = new ListObjectsRequest().withBucketName(bucket).withMaxKeys(1000).withDelimiter("/");
-                    } else {
-                        orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(prefix).withMaxKeys(1000).withDelimiter("/");
-                    }
+                    ListObjectsRequest orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(prefix).withMaxKeys(8000);
                     //List<S3Object> objects = (List<S3Object>) s3client.listObjects(bucket, "/");
                     ObjectListing result = s3client.listObjects(orequest);
                     //System.out.println(objects);
                     //This convert bucket list to an array list
                     Img = new ArrayList<String>();
-                    ArrayList<String> object = new ArrayList<String>();
+                    LinkedHashSet<String> object = new LinkedHashSet<String>();
                     // Print bucket names
                     //System.out.println("Buckets:");
                     //int i=0;
-                    //This get folder list
-                    List<String> od = result.getCommonPrefixes();
-                    for (String os : od) {
-                        filename = os.split("/");
-                        if (filename.length == treelevel+1) {
-                            object.add(filename[treelevel]+"/");
+                    List<S3ObjectSummary> objects = result.getObjectSummaries();
+                    boolean nextbatch = false;
+                    while (result.isTruncated() || !nextbatch) {
+                        if (nextbatch) {
+                            result = s3client.listNextBatchOfObjects (result);
+                            objects = result.getObjectSummaries();
+                        } else {
+                            nextbatch = true;
                         }
-
-                        //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) {
-                        filename = os.getKey().split("/");
-                        if (filename.length == treelevel+1) {
-                            object.add(filename[treelevel]);
-                        }
-                        else {
-                            object.add(filename[treelevel]+"/");
-                        }
-
-                        //i++;
-                    }
-                    while (result.isTruncated()) {
-                        result = s3client.listNextBatchOfObjects (result);
-                        ob = result.getObjectSummaries();
-                        for (S3ObjectSummary os : ob) {
+                        for (S3ObjectSummary os : objects) {
                             filename = os.getKey().split("/");
                             if (filename.length == treelevel+1) {
                                 object.add(filename[treelevel]);
@@ -181,24 +135,22 @@ public class ObjectSelect extends AppCompatActivity {
                             Img.add(R.drawable.folder);
                         }
                         else if (Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".txt") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".md")) {
-                            Img.add(R.drawable.ptextfile);
+                            Img.add(R.drawable.textfile);
                         }
                         else if (Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".pdf")) {
                             Img.add(R.drawable.pdffile);
                         }
-                        else if (Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".jpg") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".jpeg")
-                                || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".png") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".gif")
-                                || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".webp")) {
+                        else if (Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".jpg") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".jpeg") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".png") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".gif")) {
                             Img.add(R.drawable.imagefile);
                         }
                         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(".m3u")) {
+                                || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".mka")) {
                             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")
-                                || Name.get(i).toString().endsWith(".webm") || Name.get(i).toString().endsWith(".m4v") || Name.get(i).toString().endsWith(".m3u8")) {
+                                || Name.get(i).toString().endsWith(".webm") || Name.get(i).toString().endsWith(".m4v")) {
                             Img.add(R.drawable.videofile);
                         }
                         else if (Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".htm") || Name.get(i).toString().toLowerCase(Locale.ROOT).endsWith(".html")) {
@@ -231,10 +183,10 @@ public class ObjectSelect extends AppCompatActivity {
 
                         @Override
                         public void run() {
-                            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();
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     finish();
                 }
             }
@@ -253,9 +205,9 @@ public class ObjectSelect extends AppCompatActivity {
                     try {
                         GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
                         URL objectURL = s3client.generatePresignedUrl(request);
-                        imageViewer(objectURL.toString(), Name.get(position).toString());
+                        imageViewer(objectURL.toString());
                     } catch (Exception e) {
-                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     }
                 } /*else if (Img.get(position).equals(R.drawable.textfile)) {
                     //load media file
@@ -264,117 +216,42 @@ public class ObjectSelect extends AppCompatActivity {
                         URL objectURL = s3client.generatePresignedUrl(request);
                         textViewer(objectURL.toString());
                     } catch (Exception e) {
-                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     }
-                }*/ else if (Img.get(position).equals(R.drawable.webpage) || Img.get(position).equals(R.drawable.ptextfile)) {
+                }*/ else if (Img.get(position).equals(R.drawable.webpage) || Img.get(position).equals(R.drawable.textfile)) {
                     //load media file
                     try {
                         GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
                         URL objectURL = s3client.generatePresignedUrl(request);
                         webBrowser(objectURL.toString(), Name.get(position).toString());
                     } catch (Exception e) {
-                        Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
+                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     }
                 } else if (Img.get(position).equals(R.drawable.pdffile)) {
                     //load media file
-                    Thread pdfread = new Thread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            try  {
-                                //Your code goes here
-                                GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
-                                URL objectURL = s3client.generatePresignedUrl(request);
-                                //System.out.println(getResources().getString(R.string.pdf_reader)+ URLEncoder.encode(objectURL.toString(), "UTF-8" ));
-                                if (pdfendpoint.endsWith("/")) {
-                                    query = pdfendpoint + "web/viewer.html?file=" + URLEncoder.encode(objectURL.toString(), "UTF-8" );
-                                } else {
-                                    query = pdfendpoint + "/web/viewer.html?file=" + URLEncoder.encode(objectURL.toString(), "UTF-8" );
-                                }
-
-                                runOnUiThread(new Runnable() {
-
-                                    @Override
-                                    public void run() {
-                                        // Sending reference and data to Adapter
-                                        webBrowser(query, Name.get(position).toString());
-                                    }
-                                });
-                                //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();
-                                    }
-                                });
-                                //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                                finish();
-                            }
+                    try {
+                        GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
+                        URL objectURL = s3client.generatePresignedUrl(request);
+                        //System.out.println(getResources().getString(R.string.pdf_reader)+ URLEncoder.encode(objectURL.toString(), "UTF-8" ));
+                        if (pdfendpoint == null) {
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.pdf_reader_notready), Toast.LENGTH_SHORT).show();
+                        } else if (pdfendpoint.endsWith("/")) {
+                            webBrowser(pdfendpoint + "web/viewer.html?file=" + URLEncoder.encode(objectURL.toString(), "UTF-8" ), Name.get(position).toString());
+                        } else {
+                            webBrowser(pdfendpoint + "/web/viewer.html?file=" + URLEncoder.encode(objectURL.toString(), "UTF-8" ), Name.get(position).toString());
                         }
-                    });
-                    if (pdfendpoint == null || pdfendpoint.equals("")) {
-                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.pdf_reader_notready), Toast.LENGTH_SHORT).show();
-                    } else {
-                        pdfread.start();
+
+                    } catch (Exception e) {
+                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     }
                 } else if (Img.get(position).equals(R.drawable.audiofile) || Img.get(position).equals(R.drawable.videofile)) {
-                    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() {
-
-                            @Override
-                            public void run() {
-                                try  {
-                                    //load media file
-                                    Date expiration = new Date();
-                                    Calendar mycal = Calendar.getInstance();
-                                    mycal.setTime(expiration);
-                                    //System.out.println("today is " + mycal.getTime());
-                                    mycal.add(Calendar.HOUR, videotime);
-                                    //System.out.println("Expiration date: " + mycal.getTime());
-                                    expiration = mycal.getTime();
-                                    try {
-                                        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, Name.get(position).toString());
-                                        }
-                                    });
-                                    //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();
-                                        }
-                                    });
-                                    //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                                    finish();
-                                }
-                            }
-                        });
-                        mediaread.start();
+                    //load media file
+                    try {
+                        GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
+                        URL objectURL = s3client.generatePresignedUrl(request);
+                        videoPlayer(objectURL.toString());
+                    } catch (Exception e) {
+                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     }
                 }  else {
                     Toast.makeText(ObjectSelect.this, getResources().getString(R.string.unsupported_file), Toast.LENGTH_SHORT).show();
@@ -398,21 +275,7 @@ public class ObjectSelect extends AppCompatActivity {
                             //Toast.makeText(MainActivity.this, "You Clicked " + menuItem.getTitle(), Toast.LENGTH_SHORT).show();
                             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);
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.upload_folder_here)) {
-                                //Toast.makeText(ObjectSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
-                                upload(true);
-                            } 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)) {
-                                objectInfo(prefix + Name.get(position).toString(), Name.get(position).toString());
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.copy_name)) {
-                                copyName(Name.get(position).toString());
+                                upload();
                             } else if (menuItem.getTitle() == getResources().getString(R.string.file_del)) {
                                 if (Name.size() == 1 && treelevel >= 1) {
                                     Toast.makeText(ObjectSelect.this, getResources().getString(R.string.only_item_onlist), Toast.LENGTH_SHORT).show();
@@ -438,21 +301,12 @@ public class ObjectSelect extends AppCompatActivity {
                             //Toast.makeText(MainActivity.this, "You Clicked " + menuItem.getTitle(), Toast.LENGTH_SHORT).show();
                             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());
+                                download(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);
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.upload_folder_here)) {
-                                //Toast.makeText(ObjectSelect.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
-                                upload(true);
-                            } 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)) {
-                                objectInfo(prefix + Name.get(position).toString(), Name.get(position).toString());
-                            } else if (menuItem.getTitle() == getResources().getString(R.string.copy_name)) {
-                                copyName(Name.get(position).toString());
+                                upload();
+                            } else if (menuItem.getTitle() == getResources().getString(R.string.file_share)) {
+                                share(prefix + Name.get(position).toString());
                             } else if (menuItem.getTitle() == getResources().getString(R.string.file_del)) {
                                 if (menuItem.getTitle() == getResources().getString(R.string.file_del)) {
                                     if (Name.size() == 1 && treelevel >= 1) {
@@ -472,119 +326,13 @@ public class ObjectSelect extends AppCompatActivity {
         }));
     }
 
-    private void videoPlayer(String url, String title) {
-        if (title.toLowerCase(Locale.ROOT).endsWith(".m3u")) {
-            Thread mediaread = new Thread(new Runnable() {
+    private void videoPlayer(String url) {
 
-                @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
-                public void run() {
-                    try  {
-                        //load media file
-                        ArrayList<String> medialist = new ArrayList<String>();
-                        for (int i = 0; i < Name.size(); i++) {
-                            if (Img.get(i).equals(R.drawable.audiofile) || Img.get(i).equals(R.drawable.videofile)) {
-                                medialist.add(Name.get(i).toString());
-                            }
-                        }
-                        ArrayList<String> links = getLinks(medialist);
-
-                        runOnUiThread(new Runnable() {
-
-                            @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);
-                                    intent.putExtra("video_url", url);
-                                    intent.putExtra("title", title);
-                                    intent.putExtra("videocache", videocache);
-                                    intent.putExtra("buffersize", buffersize);
-                                    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);
-
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                            }
-                        });
-                    }
-                }
-            });
-            mediaread.start();
-        } else {
-            Intent intent = new Intent(this, VideoPlayer.class);
-            intent.putExtra("video_url", url);
-            intent.putExtra("title", title);
-            intent.putExtra("videocache", videocache);
-            intent.putExtra("buffersize", buffersize);
-            intent.putExtra("isplaylist", isplaylist);
-            simpleProgressBar.setVisibility(View.INVISIBLE);
-            startActivity(intent);
-        }
+        Intent intent = new Intent(this, VideoPlayer.class);
+        intent.putExtra("video_url", url);
+        startActivity(intent);
 
     }
-
     private void textViewer(String url) {
 
         Intent intent = new Intent(this, TextViewer.class);
@@ -593,11 +341,10 @@ public class ObjectSelect extends AppCompatActivity {
 
     }
 
-    private void imageViewer(String url, String title) {
+    private void imageViewer(String url) {
 
         Intent intent = new Intent(this, ImageViewer.class);
         intent.putExtra("video_url", url);
-        intent.putExtra("title", title);
         startActivity(intent);
 
     }
@@ -623,17 +370,11 @@ public class ObjectSelect extends AppCompatActivity {
         intent.putExtra("treelevel", treelevel+1);
         intent.putExtra("region", location);
         intent.putExtra("pdfendpoint", pdfendpoint);
-        intent.putExtra("style", style);
-        intent.putExtra("videocache", videocache);
-        intent.putExtra("videotime", videotime);
-        intent.putExtra("buffersize", buffersize);
-        intent.putExtra("playlisttime", playlisttime);
-        intent.putExtra("isplaylist", isplaylist);
         startActivity(intent);
 
     }
 
-    private void share(String object, boolean mediafile) {
+    private void share(String object) {
 
         Intent intent = new Intent(this, Share.class);
         //treelevel ++;
@@ -641,29 +382,8 @@ public class ObjectSelect extends AppCompatActivity {
         intent.putExtra("username", username);
         intent.putExtra("password", password);
         intent.putExtra("bucket", bucket);
-        intent.putExtra("object", prefix+object);
-        intent.putExtra("title", object);
-        intent.putExtra("region", location);
-        intent.putExtra("mediafile", mediafile);
-        intent.putExtra("videotime", videotime);
-        intent.putExtra("playlisttime", playlisttime);
-        intent.putExtra("style", style);
-        startActivity(intent);
-
-    }
-
-    private void objectInfo(String object, String title) {
-
-        Intent intent = new Intent(this, ObjectInfo.class);
-        //treelevel ++;
-        intent.putExtra("endpoint", endpoint);
-        intent.putExtra("username", username);
-        intent.putExtra("password", password);
-        intent.putExtra("bucket", bucket);
         intent.putExtra("object", object);
-        intent.putExtra("title", title);
         intent.putExtra("region", location);
-        intent.putExtra("style", style);
         startActivity(intent);
 
     }
@@ -671,7 +391,7 @@ public class ObjectSelect extends AppCompatActivity {
     private void delete(String object, boolean folder) {
         AlertDialog.Builder builder = new AlertDialog.Builder(ObjectSelect.this);
         builder.setCancelable(true);
-        builder.setTitle(object);
+        builder.setTitle(getResources().getString(R.string.file_del));
         if (folder) {
             builder.setMessage(getResources().getString(R.string.folder_del_confirm));
         } else {
@@ -690,30 +410,29 @@ public class ObjectSelect extends AppCompatActivity {
                                     //Your code goes here
                                     //List<Bucket> buckets = s3client.listBuckets();
                                     if (folder) {
-                                        ListObjectsRequest orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(object).withMaxKeys(1000);
+                                        ListObjectsRequest orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(object).withMaxKeys(8000);
                                         //List<S3Object> objects = (List<S3Object>) s3client.listObjects(bucket, "/");
                                         ObjectListing result = s3client.listObjects(orequest);
                                         ArrayList<String> objectl = new ArrayList<String>();
                                         List<S3ObjectSummary> objects = result.getObjectSummaries();
-                                        for (S3ObjectSummary os : objects) {
-                                            objectl.add(os.getKey());
-                                        }
-                                        if (objectl.size() >= 1) {
-                                            DeleteObjectsRequest deleteObjectsRequest = new DeleteObjectsRequest(bucket).withKeys(objectl.toArray(new String[0]));
-                                            s3client.deleteObjects(deleteObjectsRequest);
-                                        }
-                                        while (result.isTruncated()) {
-                                            objectl = new ArrayList<String>();
-                                            result = s3client.listNextBatchOfObjects (result);
-                                            objects = result.getObjectSummaries();
+                                        boolean nextbatch = false;
+                                        while (result.isTruncated() || !nextbatch) {
+                                            if (nextbatch) {
+                                                result = s3client.listNextBatchOfObjects (result);
+                                                objects = result.getObjectSummaries();
+                                            } else {
+                                                nextbatch = true;
+                                            }
                                             for (S3ObjectSummary os : objects) {
                                                 objectl.add(os.getKey());
+
                                                 //i++;
                                             }
-                                            DeleteObjectsRequest deleteObjectsRequest = new DeleteObjectsRequest(bucket).withKeys(objectl.toArray(new String[0]));
-                                            s3client.deleteObjects(deleteObjectsRequest);
 
                                         }
+                                        //System.out.println(object);
+                                        DeleteObjectsRequest deleteObjectsRequest = new DeleteObjectsRequest(bucket).withKeys(objectl.toArray(new String[0]));
+                                        s3client.deleteObjects(deleteObjectsRequest);
 
                                     } else {
                                         DeleteObjectRequest deleteObjectRequest = new DeleteObjectRequest(bucket, object);
@@ -745,10 +464,10 @@ public class ObjectSelect extends AppCompatActivity {
 
                                         @Override
                                         public void run() {
-                                            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();
+                                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                                     finish();
                                 }
                             }
@@ -766,7 +485,7 @@ public class ObjectSelect extends AppCompatActivity {
         dialog.show();
     }
 
-    private void upload(boolean isfolder) {
+    private void upload() {
         Intent intent = new Intent(this, Uploader.class);
         intent.putExtra("endpoint", endpoint);
         intent.putExtra("username", username);
@@ -774,94 +493,19 @@ public class ObjectSelect extends AppCompatActivity {
         intent.putExtra("bucket", bucket);
         intent.putExtra("prefix", prefix);
         intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        intent.putExtra("isfolder", isfolder);
         startActivity(intent);
     }
 
-    private void download(String filename, boolean isfolder) {
+    private void download(String filename) {
 
         Intent intent = new Intent(this, Downloader.class);
-        if(isfolder) {
-            intent.putExtra("prefix", prefix+filename);
-        } else {
-            intent.putExtra("prefix", prefix);
-            intent.putExtra("filename", filename);
-        }
-        intent.putExtra("endpoint", endpoint);
-        intent.putExtra("username", username);
-        intent.putExtra("password", password);
-        intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        intent.putExtra("bucket", bucket);
-        intent.putExtra("isfolder", isfolder);
-        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("endpoint", endpoint);
+        intent.putExtra("username", username);
+        intent.putExtra("password", password);
+        intent.putExtra("prefix", prefix);
         intent.putExtra("region", location);
-        intent.putExtra("style", style);
-        intent.putExtra("title", title);
-        intent.putExtra("pdfendpoint", pdfendpoint);
+        intent.putExtra("bucket", bucket);
         startActivity(intent);
     }
-
-    public void copyName (String name) {
-        ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
-        ClipData clip;
-        if(name.endsWith("/")) {
-            clip = ClipData.newPlainText("name", name.replace("/", ""));
-        } else {
-            clip = ClipData.newPlainText("name", name);
-        }
-        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();
-        }
-    }
-
-    public ArrayList<String> getLinks (ArrayList<String> medialist) throws InterruptedException {
-        ArrayList<String> links = new ArrayList<String>();
-        Date expiration = new Date();
-        Calendar mycal = Calendar.getInstance();
-        mycal.setTime(expiration);
-        //System.out.println("today is " + mycal.getTime());
-        mycal.add(Calendar.HOUR, playlisttime);
-        //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);;
-            //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;
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/PolicyCheck.java b/app/src/main/java/asgardius/page/s3manager/PolicyCheck.java
deleted file mode 100644
index 3ce5fca..0000000
--- a/app/src/main/java/asgardius/page/s3manager/PolicyCheck.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package asgardius.page.s3manager;
-
-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();
-        }
-    }
-}
diff --git a/app/src/main/java/asgardius/page/s3manager/Settings.java b/app/src/main/java/asgardius/page/s3manager/Settings.java
deleted file mode 100644
index 4d373bb..0000000
--- a/app/src/main/java/asgardius/page/s3manager/Settings.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package asgardius.page.s3manager;
-
-import android.annotation.SuppressLint;
-import android.content.Intent;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
-import com.google.android.exoplayer2.upstream.cache.SimpleCache;
-import com.google.android.material.switchmaterial.SwitchMaterial;
-
-import java.io.File;
-
-import asgardius.page.s3manager.databinding.ActivitySettingsBinding;
-
-public class Settings extends AppCompatActivity {
-
-    private ActivitySettingsBinding binding;
-    MyDbHelper dbHelper;
-    SQLiteDatabase db;
-    String videocache, videotime, buffersize, playlisttime;
-    EditText vcachepick, vtimepick, bsizepick, ptimepick;
-    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);
-        vtimepick = (EditText)findViewById(R.id.videotime);
-        bsizepick = (EditText)findViewById(R.id.buffersize);
-        ptimepick = (EditText)findViewById(R.id.playlisttime);
-        dbHelper = new MyDbHelper(this);
-        isplaylist = (SwitchMaterial) findViewById(R.id.isplaylist);
-        Thread getprefs = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    // Database Queries
-                    db = dbHelper.getWritableDatabase();
-                    String query = "SELECT value FROM preferences where setting='videocache'";
-                    Cursor cursor = db.rawQuery(query,null);
-                    while (cursor.moveToNext()){
-                        videocache = (cursor.getString(0));
-                    }
-                    query = "SELECT value FROM preferences where setting='videotime'";
-                    cursor = db.rawQuery(query,null);
-                    while (cursor.moveToNext()){
-                        videotime = (cursor.getString(0));
-                    }
-                    query = "SELECT value FROM preferences where setting='buffersize'";
-                    cursor = db.rawQuery(query,null);
-                    while (cursor.moveToNext()){
-                        buffersize = (cursor.getString(0));
-                    }
-                    query = "SELECT value FROM preferences where setting='isplaylist'";
-                    cursor = db.rawQuery(query,null);
-                    while (cursor.moveToNext()){
-                        isplaylist.setChecked(cursor.getString(0).equals("1"));
-                    }
-                    query = "SELECT value FROM preferences where setting='playlisttime'";
-                    cursor = db.rawQuery(query,null);
-                    while (cursor.moveToNext()){
-                        playlisttime = (cursor.getString(0));
-                    }
-                    db.close();
-
-                    runOnUiThread(new Runnable() {
-
-                        @SuppressLint("SetTextI18n")
-                        @Override
-                        public void run() {
-                            vcachepick.setText(videocache);
-                            vtimepick.setText(videotime);
-                            bsizepick.setText(buffersize);
-                            ptimepick.setText(playlisttime);
-                        }
-                    });
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.broken_database), Toast.LENGTH_SHORT).show();
-                        }
-                    });
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            }
-        });
-        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);
-                    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(){
-            @Override
-            public void onClick(View view) {
-                //buttonaction
-                try {
-                    videocache = vcachepick.getText().toString();
-                    videotime = vtimepick.getText().toString();
-                    buffersize = bsizepick.getText().toString();
-                    playlisttime = ptimepick.getText().toString();
-                    if (videocache.equals("") || videotime.equals("") || buffersize.equals("")) {
-                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountadd_null), Toast.LENGTH_SHORT).show();
-                    } else if (videocache.equals("0") || videotime.equals("0") || playlisttime.equals("0")) {
-                        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 || Integer.parseInt(playlisttime) > 168) {
-                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
-                    } else {
-                        db = dbHelper.getWritableDatabase();
-                        db.execSQL("UPDATE preferences SET value='" + videocache + "' where setting='videocache'");
-                        db.execSQL("UPDATE preferences SET value='" + videotime + "' where setting='videotime'");
-                        db.execSQL("UPDATE preferences SET value='" + buffersize + "' where setting='buffersize'");
-                        db.execSQL("UPDATE preferences SET value='" + playlisttime + "' where setting='playlisttime'");
-                        if(isplaylist.isChecked()) {
-                            db.execSQL("UPDATE preferences SET value='1' where setting='isplaylist'");
-                        } else {
-                            db.execSQL("UPDATE preferences SET value='0' where setting='isplaylist'");
-                        }
-                        db.close();
-                        mainmenu();
-                    }
-                } 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 view app credits
-        about = (Button)findViewById(R.id.settings_button);
-        about.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view) {
-                //buttonaction
-                aboutPage();
-            }
-        });
-    }
-
-    @Override
-
-    public void onDestroy() {
-        super.onDestroy();
-    }
-
-    private void aboutPage () {
-
-        Intent intent = new Intent(this, WebBrowser.class);
-        intent.putExtra("web_url", "file:///android_asset/about.htm");
-        intent.putExtra("title", getResources().getString(R.string.about_button));
-        startActivity(intent);
-
-    }
-
-    private void mainmenu() {
-        Intent intent = new Intent(this, MainActivity.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.putExtra("EXIT", true);
-        startActivity(intent);
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3manager/Share.java
index 6f03cba..9f46d39 100644
--- a/app/src/main/java/asgardius/page/s3manager/Share.java
+++ b/app/src/main/java/asgardius/page/s3manager/Share.java
@@ -2,19 +2,12 @@ package asgardius.page.s3manager;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
 import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
+import android.database.sqlite.SQLiteDatabase;
 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;
@@ -24,36 +17,21 @@ import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3Client;
 import com.amazonaws.services.s3.S3ClientOptions;
 import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
-import com.amazonaws.services.s3.model.ListObjectsRequest;
-import com.amazonaws.services.s3.model.ObjectListing;
-import com.amazonaws.services.s3.model.S3ObjectSummary;
 
-import java.io.OutputStreamWriter;
 import java.net.URL;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.List;
 
 public class Share extends AppCompatActivity {
-    String username, password, endpoint, bucket, object, location, title, objectlist, policy;
-    boolean mediafile, style, publicobject;
-    TextView expirationtext;
-    ProgressBar simpleProgressBar;
+    String username, password, endpoint, bucket, object, location;
     Region region;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
     AmazonS3 s3client;
-    ListObjectsRequest orequest;
     Calendar mycal;
-    EditText datepick, hourpick, minutepick;
-    int date, hour, minute;
-    Button share, copylinks, savelinks;
-    GeneratePresignedUrlRequest request;
-    Date expiration;
-    URL objectURL;
-    Uri fileuri;
-    Intent intent;
-    int videotime, playlisttime;
+    EditText datepick, monthpick, yearpick, hourpick, minutepick;
+    int date, month, year, hour, minute;
+    Button share;
 
     public static String URLify(String str) {
         str = str.trim();
@@ -88,123 +66,52 @@ 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);
+        monthpick = (EditText)findViewById(R.id.Month);
+        yearpick = (EditText)findViewById(R.id.Year);
         hourpick = (EditText)findViewById(R.id.Hour);
         minutepick = (EditText)findViewById(R.id.Minute);
         share = (Button)findViewById(R.id.share);
-        copylinks = (Button)findViewById(R.id.copy_links);
-        savelinks = (Button)findViewById(R.id.save_links);
         endpoint = getIntent().getStringExtra("endpoint");
         username = getIntent().getStringExtra("username");
         password = getIntent().getStringExtra("password");
         bucket = getIntent().getStringExtra("bucket");
         location = getIntent().getStringExtra("region");
-        style = getIntent().getBooleanExtra("style", false);
         object = getIntent().getStringExtra("object");
-        mediafile = getIntent().getBooleanExtra("mediafile", false);
-        videotime = getIntent().getIntExtra("videotime", 1);
-        playlisttime = getIntent().getIntExtra("playlisttime", 1);
-        title = getIntent().getStringExtra("title");
-        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();
+            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
         }
         s3client.setEndpoint(endpoint);
-        s3ClientOptions.setPathStyleAccess(style);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         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 {
-                    sharefile();
+                    date = Integer.parseInt(datepick.getText().toString());
+                    month = Integer.parseInt(monthpick.getText().toString());
+                    year = Integer.parseInt(yearpick.getText().toString());
+                    hour = Integer.parseInt(hourpick.getText().toString());
+                    minute = Integer.parseInt(minutepick.getText().toString());
+                    mycal.set(Calendar.YEAR, year);
+                    mycal.set(Calendar.MONTH, month-1);
+                    mycal.set(Calendar.DATE, date);
+                    mycal.set(Calendar.HOUR, hour);
+                    mycal.set(Calendar.MINUTE, minute);
+                    mycal.set(Calendar.SECOND, 0);
+                    Date expiration = mycal.getTime();
+                    //System.out.println(expiration);
+                    GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, object).withExpiration(expiration);
+                    URL objectURL = s3client.generatePresignedUrl(request);
                     //System.out.println(URLify(objectURL.toString()));
                     Intent shareIntent = new Intent(Intent.ACTION_SEND);
                     shareIntent.setType("text/plain");
@@ -216,252 +123,5 @@ public class Share extends AppCompatActivity {
                 }
 
         });
-        copylinks.setOnClickListener(new View.OnClickListener(){
-            @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);
-                                        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();
-                                        }
-                                    }
-                                });
-                            } 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);
-
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            runOnUiThread(new Runnable() {
-
-                                @Override
-                                public void run() {
-                                    simpleProgressBar.setVisibility(View.INVISIBLE);
-                                    Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
-                                }
-                            });
-                        }
-                    }
-                });
-                copyLinks.start();
-            }
-
-        });
-        savelinks.setOnClickListener(new View.OnClickListener(){
-            @Override
-            public void onClick(View view) {
-                //buttonaction
-                performFileSearch("Select download location");
-            }
-
-        });
-    }
-
-    private void performFileSearch(String messageTitle) {
-        //uri = Uri.parse("content://com.android.externalstorage.documents/document/home");
-        intent = new Intent();
-        intent.setAction(Intent.ACTION_CREATE_DOCUMENT);
-        //intent.addCategory(Intent.CATEGORY_OPENABLE);
-        //intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-        //intent.putExtra("android.provider.extra.INITIAL_URI", uri);
-        intent.putExtra(Intent.EXTRA_TITLE, "links.txt");
-        intent.setType("*/*");
-        ((Activity) this).startActivityForResult(intent, 70);
-    }
-
-    @Override
-    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 == 70) {
-            if (resultCode == Activity.RESULT_OK) {
-                // The document selected by the user won't be returned in the intent.
-                // Instead, a URI to that document will be contained in the return intent
-                // provided to this method as a parameter.  Pull that uri using "resultData.getData()"
-                if (resultData != null && resultData.getData() != null) {
-                    fileuri = resultData.getData();
-                    System.out.println(fileuri.toString());
-                    savelinks();
-                    //System.out.println("File selected successfully");
-                    //System.out.println("content://com.android.externalstorage.documents"+file.getPath());
-                } else {
-                    Toast.makeText(Share.this, getResources().getString(R.string.file_path_fail), Toast.LENGTH_SHORT).show();
-                    finish();
-                }
-            } else {
-                //System.out.println("User cancelled file browsing {}");
-                finish();
-            }
-        }
-    }
-
-    private void getLinks() {
-        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) {
-            mycal.add(Calendar.HOUR, playlisttime);
-        } 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);
-        if (object == null) {
-            orequest = new ListObjectsRequest().withBucketName(bucket).withMaxKeys(1000);
-        } else {
-            orequest = new ListObjectsRequest().withBucketName(bucket).withPrefix(object).withMaxKeys(1000);
-        }
-        ObjectListing result = s3client.listObjects(orequest);
-        objectlist = "";
-        List<S3ObjectSummary> objects = result.getObjectSummaries();
-        for (S3ObjectSummary os : objects) {
-            objectlist = objectlist+PolicyCheck.getFileKey(s3client, bucket, os.getKey(), expiration, policy)+"\n";
-        }
-        while (result.isTruncated()) {
-            result = s3client.listNextBatchOfObjects (result);
-            objects = result.getObjectSummaries();
-            for (S3ObjectSummary os : objects) {
-                objectlist = objectlist+PolicyCheck.getFileKey(s3client, bucket, os.getKey(), expiration, policy)+"\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
-            public void run() {
-                try  {
-                    getLinks();
-                    OutputStreamWriter outputStreamWriter = new OutputStreamWriter(getContentResolver().openOutputStream(fileuri));
-                    outputStreamWriter.write(objectlist);
-                    outputStreamWriter.close();
-
-                    runOnUiThread(new Runnable() {
-
-                        @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();
-                        }
-                    });
-                    //System.out.println("tree "+treelevel);
-                    //System.out.println("prefix "+prefix);
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            simpleProgressBar.setVisibility(View.INVISIBLE);
-                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.invalid_expiration_date), Toast.LENGTH_SHORT).show();
-                        }
-                    });
-                }
-            }
-        });
-        saveLinks.start();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/TextViewer.java b/app/src/main/java/asgardius/page/s3manager/TextViewer.java
index 9a25383..c710fff 100644
--- a/app/src/main/java/asgardius/page/s3manager/TextViewer.java
+++ b/app/src/main/java/asgardius/page/s3manager/TextViewer.java
@@ -1,17 +1,25 @@
 package asgardius.page.s3manager;
 
-import android.os.Build;
+import androidx.appcompat.app.AppCompatActivity;
+
 import android.os.Bundle;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.ProgressBar;
 import android.widget.Toast;
 
-import androidx.appcompat.app.AppCompatActivity;
+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.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 {
@@ -23,53 +31,50 @@ public class TextViewer extends AppCompatActivity {
         setContentView(R.layout.activity_text_viewer);
         filecontent = (EditText)findViewById(R.id.textShow);
         final ProgressBar simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            String videoURL = getIntent().getStringExtra("video_url");
-            Thread textread = new Thread(new Runnable() {
 
-                @Override
-                public void run() {
-                    try  {
-                        //Your code goes here
-                        URL fileurl = new URL(videoURL);
+        String videoURL = getIntent().getStringExtra("video_url");
+        Thread textread = new Thread(new Runnable() {
 
-                        // Read all the text returned by the server
-                        BufferedReader in = new BufferedReader(new InputStreamReader(fileurl.openStream()));
-                        String str = in.lines().collect(Collectors.joining());
-                        in.close();
+            @Override
+            public void run() {
+                try  {
+                    //Your code goes here
+                    URL fileurl = new URL(videoURL);
 
-                        runOnUiThread(new Runnable() {
+                    // Read all the text returned by the server
+                    BufferedReader in = new BufferedReader(new InputStreamReader(fileurl.openStream()));
+                    String str = in.lines().collect(Collectors.joining());
+                    in.close();
 
-                            @Override
-                            public void run() {
-                                // Sending reference and data to Adapter
-                                simpleProgressBar.setVisibility(View.INVISIBLE);
-                                filecontent.setText(str);
+                    runOnUiThread(new Runnable() {
 
-                            }
-                        });
-                        //System.out.println("tree "+treelevel);
-                        //System.out.println("prefix "+prefix);
+                        @Override
+                        public void run() {
+                            // Sending reference and data to Adapter
+                            simpleProgressBar.setVisibility(View.INVISIBLE);
+                            filecontent.setText(str);
 
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        runOnUiThread(new Runnable() {
+                        }
+                    });
+                    //System.out.println("tree "+treelevel);
+                    //System.out.println("prefix "+prefix);
 
-                            @Override
-                            public void run() {
-                                Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                                finish();
-                            }
-                        });
-                        //Toast.makeText(getApplicationContext(),e.toString(), Toast.LENGTH_SHORT).show();
-                        finish();
-                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    runOnUiThread(new Runnable() {
+
+                        @Override
+                        public void run() {
+                            Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                            finish();
+                        }
+                    });
+                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                    finish();
                 }
-            });
-            textread.start();
-        } else {
-            finish();
-        }
+            }
+        });
+        textread.start();
 
         /*try {
             // Create a URL for the desired page
diff --git a/app/src/main/java/asgardius/page/s3manager/Uploader.java b/app/src/main/java/asgardius/page/s3manager/Uploader.java
index 1e11899..cc32bd6 100644
--- a/app/src/main/java/asgardius/page/s3manager/Uploader.java
+++ b/app/src/main/java/asgardius/page/s3manager/Uploader.java
@@ -3,9 +3,7 @@ package asgardius.page.s3manager;
 import static android.content.ContentValues.TAG;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.documentfile.provider.DocumentFile;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -14,24 +12,21 @@ import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.PowerManager;
+import android.os.storage.StorageManager;
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import com.amazonaws.AbortedException;
 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.AbortMultipartUploadRequest;
-import com.amazonaws.services.s3.model.AmazonS3Exception;
 import com.amazonaws.services.s3.model.CompleteMultipartUploadRequest;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadRequest;
 import com.amazonaws.services.s3.model.InitiateMultipartUploadResult;
@@ -50,10 +45,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Uploader extends AppCompatActivity {
-    String  username, password, endpoint, bucket, prefix, location;
+    String  username, password, endpoint, bucket, prefix, location, fkey;
+    int progress;
     Uri fileuri, folder;
     EditText fprefix;
-    TextView fprefixlabel;
     Region region;
     S3ClientOptions s3ClientOptions;
     AWSCredentials myCredentials;
@@ -61,14 +56,9 @@ public class Uploader extends AppCompatActivity {
     ProgressBar simpleProgressBar;
     long filesize;
     File ufile;
-    DocumentFile document;
     Intent intent;
     Button fileUpload;
-    Thread uploadFile, uploadProgress, calculateProgress;
-    boolean style, isfolder;
-    boolean started = false;
-    boolean cancel = false;
-    long transfered = 0;
+    Thread uploadFile;
     private static final long MAX_SINGLE_PART_UPLOAD_BYTES = 5 * 1024 * 1024;
     private WifiManager.WifiLock mWifiLock;
     private PowerManager.WakeLock mWakeLock;
@@ -87,19 +77,13 @@ public class Uploader extends AppCompatActivity {
         password = getIntent().getStringExtra("password");
         bucket = getIntent().getStringExtra("bucket");
         location = getIntent().getStringExtra("region");
-        style = getIntent().getBooleanExtra("style", false);
-        isfolder = getIntent().getBooleanExtra("isfolder", false);
         prefix = getIntent().getStringExtra("prefix");
-        if(isfolder) {
-            getSupportActionBar().setTitle(getResources().getString(R.string.batch_upload_button));
-        } else {
-            getSupportActionBar().setTitle(getResources().getString(R.string.upload_button));
-        }
         fprefix = (EditText)findViewById(R.id.fprefix);
-        fprefixlabel = (TextView) findViewById(R.id.fprefixlabel);
         region = Region.getRegion(location);
         s3ClientOptions = S3ClientOptions.builder().build();
-        s3ClientOptions.setPathStyleAccess(style);
+        if (!endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            s3ClientOptions.setPathStyleAccess(true);
+        }
         myCredentials = new BasicAWSCredentials(username, password);
         s3client = new AmazonS3Client(myCredentials, region);
         s3client.setEndpoint(endpoint);
@@ -108,209 +92,98 @@ public class Uploader extends AppCompatActivity {
         simpleProgressBar = (ProgressBar) findViewById(R.id.simpleProgressBar);
         //Toast.makeText(Uploader.this, getResources().getString(R.string.pending_feature), Toast.LENGTH_SHORT).show();
         performFileSearch("Select file to upload");
-        //fprefix.setText(prefix);
+        fprefix.setText(prefix);
         fileUpload.setOnClickListener(new View.OnClickListener(){
             @Override
             public void onClick(View view) {
                 //buttonaction
-                if (started) {
-                    started = false;
-                    cancel = true;
-                    uploadFile.interrupt();
-                    //simpleProgressBar.setVisibility(View.INVISIBLE);
+                if (fileuri == null && folder == null) {
+                    Toast.makeText(Uploader.this, getResources().getString(R.string.no_file_selected), Toast.LENGTH_SHORT).show();
                 } else {
-                    started = true;
-                    transfered = 0;
-                    //simpleProgressBar.setProgress(0);
+                    //Acquiring WakeLock and WifiLock if not held
+                    if (!mWifiLock.isHeld()) {
+                        mWifiLock.acquire();
+                        //System.out.println("WifiLock acquired");
+                    }
+                    if (!mWakeLock.isHeld()) {
+                        mWakeLock.acquire();
+                        //System.out.println("WakeLock acquired");
+                    }
                     simpleProgressBar.setVisibility(View.VISIBLE);
-                    if (fileuri == null && folder == null) {
-                        Toast.makeText(Uploader.this, getResources().getString(R.string.no_file_selected), Toast.LENGTH_SHORT).show();
-                    } else {
-                        //Acquiring WakeLock and WifiLock if not held
-                        if (!mWifiLock.isHeld()) {
-                            mWifiLock.acquire();
-                            //System.out.println("WifiLock acquired");
-                        }
-                        if (!mWakeLock.isHeld()) {
-                            mWakeLock.acquire();
-                            //System.out.println("WakeLock acquired");
-                        }
-                        //eUpload.setEnabled(false);
-                        fileUpload.setText(getResources().getString(R.string.cancel_upload));
-                        fprefix.setEnabled(false);
-                        uploadFile = new Thread(new Runnable() {
+                    fileUpload.setEnabled(false);
+                    fileUpload.setText(getResources().getString(R.string.upload_in_progress));
+                    uploadFile = new Thread(new Runnable() {
 
-                            @Override
-                            public void run() {
+                        @Override
+                        public void run() {
+                            if (fprefix.getText().toString().endsWith("/") || fprefix.getText().toString().equals("")) {
+                                fkey = fprefix.getText().toString()+getDisplayName(fileuri);
+                            } else {
+                                fkey = fprefix.getText().toString()+"/"+getDisplayName(fileuri);
+                            }
+                            //System.out.println(fkey);
+                            progress = 0;
+                            filesize = 0;
+                            try  {
+                                //Your code goes here
+                                //s3client.createBucket(bucket, location);
                                 //System.out.println(fkey);
-                                //filesize = 0;
-                                try  {
-                                    //Your code goes here
-                                    //s3client.createBucket(bucket, location);
-                                    //System.out.println(fkey);
-                                    if (isfolder) {
-                                        if(prefix.endsWith("/")) {
-                                            prefix = fprefix.getText().toString();
-                                        } else {
-                                            prefix = fprefix.getText().toString().concat("/");
+                                ufile = readContentToFile(fileuri);
+                                filesize = ufile.length();
+                                //PutObjectRequest request = new PutObjectRequest(bucket, fkey, ufile);
+                                //upload = s3client.putObject(request);
+                                putS3Object(bucket, fkey, ufile);
+                                runOnUiThread(new Runnable() {
+
+                                    @Override
+                                    public void run() {
+                                        //Releasing WifiLock and WakeLock if held
+                                        if (mWifiLock.isHeld()) {
+                                            mWifiLock.release();
+                                            //System.out.println("WifiLock released");
                                         }
-                                        document = DocumentFile.fromTreeUri(getApplicationContext(), fileuri);
-                                        DocumentFile[] filelist = document.listFiles();
-                                        ArrayList<String> filepath = new ArrayList<String>();
-                                        int treelevel = 0;
-                                        ArrayList<Integer> fileindex = new ArrayList<Integer>();
-                                        fileindex.add(0);
-                                        for (int i = 0; i < filelist.length && !cancel; i++) {
-                                            filepath.add(filelist[i].getName());
-                                            if(filelist[i].isDirectory()) {
-                                                treelevel++;
-                                                fileindex.add(0);
-                                                document = filelist[i];
-                                                filelist = document.listFiles();
-                                                while (treelevel >= 1 && fileindex.get(treelevel) < filelist.length+1 && !cancel) {
-                                                    if(fileindex.get(treelevel) == filelist.length) {
-                                                        fileindex.remove(treelevel);
-                                                        document = document.getParentFile();
-                                                        filelist = document.listFiles();
-                                                        treelevel--;
-                                                        filepath.remove(treelevel);
-                                                        fileindex.set(treelevel, fileindex.get(treelevel)+1);
-                                                    } else {
-                                                        filepath.add(filelist[fileindex.get(treelevel)].getName());
-                                                        if (filelist[fileindex.get(treelevel)].isDirectory()) {
-                                                            document = filelist[fileindex.get(treelevel)];
-                                                            filelist = document.listFiles();
-                                                            treelevel++;
-                                                            fileindex.add(0);
-                                                        } else {
-                                                            ufile = readContentToFile(filelist[fileindex.get(treelevel)].getUri());
-                                                            putS3Object(bucket, prefix+String.join("/", filepath), ufile);
-                                                            filepath.remove(treelevel);
-                                                            fileindex.set(treelevel, fileindex.get(treelevel)+1);
-                                                        }
-                                                    }
-                                                }
-                                            } else {
-                                                ufile = readContentToFile(filelist[i].getUri());
-                                                putS3Object(bucket, prefix+String.join("/", filepath), ufile);
-                                            }
-                                            filepath.clear();
-                                            fileindex.clear();
-                                            fileindex.add(0);
+                                        if (mWakeLock.isHeld()) {
+                                            mWakeLock.release();
+                                            //System.out.println("WakeLock released");
                                         }
-                                    } else {
-                                        ufile = readContentToFile(fileuri);
-                                        if(ufile.length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
-                                            filesize = ufile.length()/MAX_SINGLE_PART_UPLOAD_BYTES;
-                                        } else {
-                                            filesize = (ufile.length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1;
-                                        }
-                                        //PutObjectRequest request = new PutObjectRequest(bucket, fkey, ufile);
-                                        //upload = s3client.putObject(request);
-                                        putS3Object(bucket, fprefix.getText().toString(), ufile);
+                                        //simpleProgressBar.setProgress(100);
+                                        simpleProgressBar.setVisibility(View.INVISIBLE);
+                                        fileUpload.setText(getResources().getString(R.string.upload_success));
+                                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.upload_success), Toast.LENGTH_SHORT).show();
+                                        //simpleProgressBar.setVisibility(View.INVISIBLE);
                                     }
-                                    runOnUiThread(new Runnable() {
+                                });
+                                //System.out.println("tree "+treelevel);
+                                //System.out.println("prefix "+prefix);
 
-                                        @Override
-                                        public void run() {
-                                            //Releasing WifiLock and WakeLock if held
-                                            if (mWifiLock.isHeld()) {
-                                                mWifiLock.release();
-                                                //System.out.println("WifiLock released");
-                                            }
-                                            if (mWakeLock.isHeld()) {
-                                                mWakeLock.release();
-                                                //System.out.println("WakeLock released");
-                                            }
-                                            if(!cancel) {
-                                                simpleProgressBar.setProgress(100);
-                                            }
-                                            //simpleProgressBar.setVisibility(View.INVISIBLE);
-                                            if (cancel) {
-                                                fileUpload.setText(getResources().getString(R.string.upload_canceled));
-                                            } else if (isfolder) {
-                                                fileUpload.setText(getResources().getString(R.string.batch_upload_success));
-                                            } else {
-                                                fileUpload.setText(getResources().getString(R.string.upload_success));
-                                            }
-                                            started = false;
-                                            fileUpload.setEnabled(false);
-                                            //Toast.makeText(getApplicationContext(),getResources().getString(R.string.upload_success), Toast.LENGTH_SHORT).show();
-                                            //simpleProgressBar.setVisibility(View.INVISIBLE);
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                                runOnUiThread(new Runnable() {
+
+                                    @Override
+                                    public void run() {
+                                        //Releasing WifiLock and WakeLock if held
+                                        if (mWifiLock.isHeld()) {
+                                            mWifiLock.release();
+                                            //System.out.println("WifiLock released");
                                         }
-                                    });
-                                    //System.out.println("tree "+treelevel);
-                                    //System.out.println("prefix "+prefix);
-
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                    runOnUiThread(new Runnable() {
-
-                                        @Override
-                                        public void run() {
-                                            //Releasing WifiLock and WakeLock if held
-                                            if (mWifiLock.isHeld()) {
-                                                mWifiLock.release();
-                                                //System.out.println("WifiLock released");
-                                            }
-                                            if (mWakeLock.isHeld()) {
-                                                mWakeLock.release();
-                                                //System.out.println("WakeLock released");
-                                            }
-                                            started = false;
-                                            //simpleProgressBar.setVisibility(View.INVISIBLE);
-                                            //fileUpload.setEnabled(true);
-                                            if (cancel) {
-                                                fileUpload.setText(getResources().getString(R.string.upload_canceled));
-                                            } else {
-                                                fileUpload.setText(getResources().getString(R.string.upload_failed));
-                                            }
-                                            fileUpload.setEnabled(false);
-                                            //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                                        }
-                                    });
-                                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                                    //finish();
-                                }
-                            }
-                        });
-                        uploadProgress = new Thread(new Runnable() {
-
-                            @Override
-                            public void run() {
-                                try  {
-                                    //Your code goes here
-                                    while (started) {
-                                        try {
-                                            if (filesize != 0) {
-                                                //simpleProgressBar.setProgress((int)((transfered*100)/filesize));
-                                                simpleProgressBar.setProgress((int)((transfered*100)/filesize));
-                                            }
-                                            Thread.sleep(500);
-                                        } catch (Exception e) {
-                                            e.printStackTrace();
+                                        if (mWakeLock.isHeld()) {
+                                            mWakeLock.release();
+                                            //System.out.println("WakeLock released");
                                         }
+                                        simpleProgressBar.setVisibility(View.INVISIBLE);
+                                        fileUpload.setEnabled(true);
+                                        fileUpload.setText(getResources().getString(R.string.retry));
+                                        Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                                     }
-
-                                    runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            //simpleProgressBar.setProgress(100);
-                                        }
-                                    });
-                                    //System.out.println("tree "+treelevel);
-                                    //System.out.println("prefix "+prefix);
-
-                                } catch (Exception e) {
-                                    e.printStackTrace();
-                                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                                    //finish();
-                                }
+                                });
+                                //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
+                                //finish();
                             }
-                        });
-                        //simpleProgressBar.setVisibility(View.VISIBLE);
-                        uploadFile.start();
-                        uploadProgress.start();
+                        }
+                    });
+                    //simpleProgressBar.setVisibility(View.VISIBLE);
+                    uploadFile.start();
                     /*while (progress <= 99) {
                         System.out.println("Upload in progress");
                         if (upload != null) {
@@ -327,7 +200,6 @@ public class Uploader extends AppCompatActivity {
                             e.printStackTrace();
                         }
                     }*/
-                    }
                 }
             }
 
@@ -337,33 +209,15 @@ public class Uploader extends AppCompatActivity {
     private void performFileSearch(String messageTitle) {
         //uri = Uri.parse("content://com.android.externalstorage.documents/document/home");
         intent = new Intent();
-        if (isfolder) {
-            intent.setAction(Intent.ACTION_OPEN_DOCUMENT_TREE);
-        } else {
-            intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
-            intent.addCategory(Intent.CATEGORY_OPENABLE);
-            //intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
-            //intent.putExtra("android.provider.extra.INITIAL_URI", uri);
-            intent.setType("*/*");
-        }
+        intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        //intent.putExtra(Intent.EXTRA_LOCAL_ONLY, true);
+        //intent.putExtra("android.provider.extra.INITIAL_URI", uri);
+        intent.setType("*/*");
         ((Activity) this).startActivityForResult(intent, 100);
     }
 
-    @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,
@@ -377,16 +231,6 @@ public class Uploader extends AppCompatActivity {
                 if (resultData != null && resultData.getData() != null) {
                     fileuri = resultData.getData();
                     System.out.println(fileuri.toString());
-                    if (isfolder) {
-                        fprefix.setText(prefix);
-                        fprefix.setHint(getResources().getString(R.string.upload_prefix));
-                        fprefixlabel.setText(getResources().getString(R.string.upload_prefix));
-                        fileUpload.setText(getResources().getString(R.string.upload_calculate));
-                        fileUpload.setEnabled(false);
-                        calculateSize();
-                    } else {
-                        fprefix.setText(prefix+getDisplayName(fileuri));
-                    }
                     //System.out.println("File selected successfully");
                     //System.out.println("content://com.android.externalstorage.documents"+file.getPath());
                 } else {
@@ -441,7 +285,6 @@ public class Uploader extends AppCompatActivity {
         PutObjectRequest request = new PutObjectRequest(bucket, objectKey, file);
         PutObjectResult result = s3client.putObject(request);
         long bytesPushed = result.getMetadata().getContentLength();
-        transfered++;
         //LOGGER.info("Pushed {} bytes to s3://{}/{}", bytesPushed, bucket, objectKey);
     }
 
@@ -456,120 +299,31 @@ public class Uploader extends AppCompatActivity {
 
         // Upload the file parts.
         long fileOffset = 0;
-        try{
-            for (int partNumber = 1; fileOffset < contentLength && !cancel; ++partNumber) {
-                // Because the last part could be less than 5 MB, adjust the part size as needed.
-                partSize = Math.min(partSize, (contentLength - fileOffset));
+        for (int partNumber = 1; fileOffset < contentLength; ++partNumber) {
+            // Because the last part could be less than 5 MB, adjust the part size as needed.
+            partSize = Math.min(partSize, (contentLength - fileOffset));
 
-                // Create the request to upload a part.
-                UploadPartRequest uploadRequest = new UploadPartRequest()
-                        .withBucketName(bucket)
-                        .withKey(objectKey)
-                        .withUploadId(initResponse.getUploadId())
-                        .withPartNumber(partNumber)
-                        .withFileOffset(fileOffset)
-                        .withFile(file)
-                        .withPartSize(partSize);
+            // Create the request to upload a part.
+            UploadPartRequest uploadRequest = new UploadPartRequest()
+                    .withBucketName(bucket)
+                    .withKey(objectKey)
+                    .withUploadId(initResponse.getUploadId())
+                    .withPartNumber(partNumber)
+                    .withFileOffset(fileOffset)
+                    .withFile(file)
+                    .withPartSize(partSize);
 
-                // Upload the part and add the response's ETag to our list.
-                UploadPartResult uploadResult = s3client.uploadPart(uploadRequest);
-                //LOGGER.info("Uploading part {} of Object s3://{}/{}", partNumber, bucket, objectKey);
-                partETags.add(uploadResult.getPartETag());
+            // Upload the part and add the response's ETag to our list.
+            UploadPartResult uploadResult = s3client.uploadPart(uploadRequest);
+            //LOGGER.info("Uploading part {} of Object s3://{}/{}", partNumber, bucket, objectKey);
+            partETags.add(uploadResult.getPartETag());
 
-                fileOffset += partSize;
-                transfered++;
-            }
-
-            // Complete the multipart upload.
-            CompleteMultipartUploadRequest compRequest = new CompleteMultipartUploadRequest(bucket, objectKey, initResponse.getUploadId(), partETags);
-            s3client.completeMultipartUpload(compRequest);
-        } catch (AbortedException | AmazonS3Exception e) {
-            e.printStackTrace();
-            AbortMultipartUploadRequest abort = new AbortMultipartUploadRequest(bucket, objectKey, initResponse.getUploadId());
-            s3client.abortMultipartUpload(abort);
-            //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-            //finish();
+            fileOffset += partSize;
         }
-    }
 
-    private void calculateSize() {
-        calculateProgress = new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                try  {
-                    //Your code goes here
-                    document = DocumentFile.fromTreeUri(getApplicationContext(), fileuri);
-                    DocumentFile[] filelist = document.listFiles();
-                    ArrayList<String> filepath = new ArrayList<String>();
-                    int treelevel = 0;
-                    ArrayList<Integer> fileindex = new ArrayList<Integer>();
-                    fileindex.add(0);
-                    for (int i = 0; i < filelist.length; i++) {
-                        filepath.add(filelist[i].getName());
-                        if(filelist[i].isDirectory()) {
-                            treelevel++;
-                            fileindex.add(0);
-                            document = filelist[i];
-                            filelist = document.listFiles();
-                            while (treelevel >= 1 && fileindex.get(treelevel) < filelist.length+1) {
-                                if(fileindex.get(treelevel) == filelist.length) {
-                                    fileindex.remove(treelevel);
-                                    document = document.getParentFile();
-                                    filelist = document.listFiles();
-                                    treelevel--;
-                                    filepath.remove(treelevel);
-                                    fileindex.set(treelevel, fileindex.get(treelevel)+1);
-                                } else {
-                                    filepath.add(filelist[fileindex.get(treelevel)].getName());
-                                    if (filelist[fileindex.get(treelevel)].isDirectory()) {
-                                        document = filelist[fileindex.get(treelevel)];
-                                        filelist = document.listFiles();
-                                        treelevel++;
-                                        fileindex.add(0);
-                                    } else {
-                                        filepath.remove(treelevel);
-                                        if(filelist[fileindex.get(treelevel)].length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
-                                            filesize = filesize+(filelist[fileindex.get(treelevel)].length()/MAX_SINGLE_PART_UPLOAD_BYTES);
-                                        } else {
-                                            filesize = filesize+((filelist[fileindex.get(treelevel)].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1);
-                                        }
-                                        fileindex.set(treelevel, fileindex.get(treelevel)+1);
-                                    }
-                                }
-                            }
-                            //document = document.getParentFile();
-                            //filelist = document.listFiles();
-                            //treelevel--;
-                        } else {
-                            if(filelist[i].length()%MAX_SINGLE_PART_UPLOAD_BYTES == 0) {
-                                filesize = filesize+(filelist[i].length()/MAX_SINGLE_PART_UPLOAD_BYTES);
-                            } else {
-                                filesize = filesize+((filelist[i].length()/MAX_SINGLE_PART_UPLOAD_BYTES)+1);
-                            }
-                        }
-                        filepath.clear();
-                        fileindex.clear();
-                        fileindex.add(0);
-                    }
-
-                    runOnUiThread(new Runnable() {
-
-                        @Override
-                        public void run() {
-                            fileUpload.setText(getResources().getString(R.string.batch_upload_button));
-                            fileUpload.setEnabled(true);
-                        }
-                    });
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    //Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
-                    //finish();
-                }
-            }
-        });
-        calculateProgress.start();
+        // Complete the multipart upload.
+        CompleteMultipartUploadRequest compRequest = new CompleteMultipartUploadRequest(bucket, objectKey, initResponse.getUploadId(), partETags);
+        s3client.completeMultipartUpload(compRequest);
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
index cba85c7..0c83639 100644
--- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
@@ -1,49 +1,20 @@
 package asgardius.page.s3manager;
 
-import android.app.AppOpsManager;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.app.PictureInPictureParams;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.hardware.display.DisplayManager;
-import android.net.Uri;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.PowerManager;
-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;
 
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.DefaultLoadControl;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.view.View;
+import android.widget.Toast;
+
 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;
-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.cache.CacheDataSource;
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
-import com.google.android.exoplayer2.upstream.cache.SimpleCache;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Objects;
+import com.google.android.exoplayer2.upstream.HttpDataSource;
 
 /**
  * An example full-screen activity that shows and hides the system UI (i.e.
@@ -56,168 +27,50 @@ public class VideoPlayer extends AppCompatActivity {
     private WifiManager.WifiLock mWifiLock;
     private PowerManager.WakeLock mWakeLock;
     private PowerManager powerManager;
-    private long maxCacheSize;
-    ArrayList<String> queue, names;
-    LeastRecentlyUsedCacheEvictor evictor;
-    StandaloneDatabaseProvider standaloneDatabaseProvider;
-    SimpleCache simpleCache;
-    int videocache, buffersize;
-    ProgressiveMediaSource mediaSource;
-    DefaultLoadControl loadControl;
-    DefaultRenderersFactory renderersFactory;
+
     ExoPlayer player;
-    long videoPosition;
-    MediaSessionCompat mediaSession;
-    MediaSessionConnector mediaSessionConnector;
-    StyledPlayerView.ControllerVisibilityListener control;
-    AppOpsManager appOpsManager;
-    private PlayerNotificationManager playerNotificationManager;
-    private int notificationId = 1234;
-    boolean isplaylist;
-    boolean success = false;
-    String videoURL, title;
-    Rational ratio;
 
     @Override
     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);
-            NotificationManager manager =getSystemService(NotificationManager.class);
-            channel.setSound(null, null);
-            manager.createNotificationChannel(channel);
-        }
-        appOpsManager = (AppOpsManager)getSystemService(Context.APP_OPS_SERVICE);
-        mediaSession = new MediaSessionCompat(this, getPackageName());
-        mediaSessionConnector = new MediaSessionConnector(mediaSession);
-        hideSystemBars();
-        AudioAttributes audioAttributes = new AudioAttributes.Builder()
-                .setUsage(C.USAGE_MEDIA)
-                .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
-                .build();
         // create Wifi and wake locks
-        mWifiLock = ((WifiManager) this.getApplicationContext().getSystemService(Context.WIFI_SERVICE)).createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "S3Manager:wifi_lock");
+        mWifiLock = ((WifiManager) this.getApplicationContext().getSystemService(Context.WIFI_SERVICE)).createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Transistor:wifi_lock");
         powerManager = (PowerManager) getSystemService(POWER_SERVICE);
-        mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "S3Manager:wake_lock");
+        mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "Transistor:wake_lock");
         //Get media url
-        videoURL = getIntent().getStringExtra("video_url");
-        title = getIntent().getStringExtra("title");
-        videocache = getIntent().getIntExtra("videocache", 40);
-        buffersize = getIntent().getIntExtra("buffersize", 2000);
-        isplaylist = getIntent().getBooleanExtra("isplaylist", false);
-        queue = getIntent().getStringArrayListExtra("queue");
-        names = getIntent().getStringArrayListExtra("names");
-        getSupportActionBar().setTitle(title);
-        loadControl = new DefaultLoadControl.Builder().setBufferDurationsMs(2000, buffersize, 1500, 2000).build();
-
-        @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode = DefaultRenderersFactory.EXTENSION_RENDERER_MODE_PREFER;
-
-        renderersFactory = new DefaultRenderersFactory(this) .setExtensionRendererMode(extensionRendererMode);
-        standaloneDatabaseProvider = new StandaloneDatabaseProvider(this);
-        maxCacheSize = (long)videocache * 1024 * 1024;
+        String videoURL = getIntent().getStringExtra("video_url");
         playerView = findViewById(R.id.player_view);
         // creating a variable for exoplayer
-        player = new ExoPlayer.Builder(this).setLoadControl(loadControl).build();
-        player.setAudioAttributes(audioAttributes, true);
-        mediaSessionConnector.setPlayer(player);
-        mediaSession.setActive(true);
-        evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize);
-        simpleCache = new SimpleCache(
-                new File(this.getFilesDir(), "media"),
-                evictor,
-                standaloneDatabaseProvider);
+        player = new ExoPlayer.Builder(this).build();
+        // Attach player to the view.
         playerView.setPlayer(player);
-        control = new StyledPlayerView.ControllerVisibilityListener() {
-            @Override
-            public void onVisibilityChanged(int visibility) {
-                if (playerView.isControllerFullyVisible()) {
-                    showSystemBars();
-                } else {
-                    hideSystemBars();
-                }
-            }
-        };
-        playerView.setControllerVisibilityListener(control);
-        //MediaItem mediaItem = MediaItem.fromUri(videoURL);
+        MediaItem mediaItem = MediaItem.fromUri(videoURL);
 
         // Set the media item to be played.
-        //player.setMediaItem(mediaItem);
+        player.setMediaItem(mediaItem);
         // Prepare the player.
-        player.setPlayWhenReady(true);
-        playerNotificationManager = new PlayerNotificationManager.Builder(this, notificationId, "playback").build();
-        playerNotificationManager.setUseNextActionInCompactView(true);
-        playerNotificationManager.setUsePreviousActionInCompactView(true);
-        playerNotificationManager.setMediaSessionToken(mediaSession.getSessionToken());
-        playerNotificationManager.setPlayer(player);
-        if (isplaylist) {
-            for (int i = 0; i < queue.size(); i++) {
-                if (names.get(i).endsWith(".m3u8")) {
-                    MediaItem mediaItem = MediaItem.fromUri(Share.URLify(queue.get(i)));
-                    player.addMediaItem(mediaItem);
-                } else {
-                    mediaSource = new ProgressiveMediaSource.Factory(
-                            new CacheDataSource.Factory()
-                                    .setCache(simpleCache)
-                                    .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
-                                            .setUserAgent("S3 Manager"))
-                                    .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                    ).createMediaSource(MediaItem.fromUri(Share.URLify(queue.get(i))));
-                    player.addMediaSource(mediaSource);
-                }
-            }
-            getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
-            player.prepare();
-            try {
-                player.seekTo(names.indexOf(title), 0);
-            }catch (Exception e) {
-                System.out.println("Playing m3u file");
-            }
-        } else {
-            if (title.endsWith(".m3u8")) {
-                MediaItem mediaItem = MediaItem.fromUri(Share.URLify(videoURL));
-                player.setMediaItem(mediaItem);
-            } else {
-                mediaSource = new ProgressiveMediaSource.Factory(
-                        new CacheDataSource.Factory()
-                                .setCache(simpleCache)
-                                .setUpstreamDataSourceFactory(new DefaultHttpDataSource.Factory()
-                                        .setUserAgent("S3 Manager"))
-                                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
-                ).createMediaSource(MediaItem.fromUri(Share.URLify(videoURL)));
-                player.setMediaSource(mediaSource);
-            }
-            player.prepare();
-        }
+        player.prepare();
         // Start the playback.
         player.play();
 
+
         player.addListener(new Player.Listener() {
             @Override
 
             public void onPlayerError(PlaybackException error) {
                 Throwable cause = error.getCause();
-                if(success) {
-                    player.pause();
+                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();
                 } else {
                     // An HTTP error occurred.
                     //System.out.println("Playback error F");
-                    Toast.makeText(getApplicationContext(), Objects.requireNonNull(error.getCause()).toString(), Toast.LENGTH_SHORT).show();
-                    player.release();
-                    finish();
+                    Toast.makeText(getApplicationContext(), getResources().getString(R.string.media_wrong_type), Toast.LENGTH_SHORT).show();
                 }
-            }
-
-            @Override
-            public void onTracksChanged(Tracks tracks) {
-                if(isplaylist) {
-                    getSupportActionBar().setTitle(names.get(player.getCurrentMediaItemIndex()));
-                }
-                Player.Listener.super.onTracksChanged(tracks);
+                player.release();
+                finish();
             }
 
 
@@ -228,7 +81,6 @@ public class VideoPlayer extends AppCompatActivity {
             public void onPlaybackStateChanged(@Player.State int state) {
                 if (state == 3) {
                     // Active playback.
-                    success = true;
                     //Acquiring WakeLock and WifiLock if not held
                     if (!mWifiLock.isHeld()) {
                         mWifiLock.acquire();
@@ -269,195 +121,30 @@ public class VideoPlayer extends AppCompatActivity {
         });
     }
 
-    private void hideSystemBars() {
-        // 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();
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+
+
         View decorView = getWindow().getDecorView();
         decorView.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_STABLE
                         | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
                         | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
-                        | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
-                        | View.SYSTEM_UI_FLAG_IMMERSIVE);
+                        | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                        | View.SYSTEM_UI_FLAG_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
+
     }
 
-    private void showSystemBars() {
-        View decorView = getWindow().getDecorView();
-        decorView.setSystemUiVisibility(
-                View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
-        Objects.requireNonNull(getSupportActionBar()).show();
-    }
-
-
-    protected void enterPIPMode() {
-        try {
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                    && this.getPackageManager()
-                    .hasSystemFeature(
-                            PackageManager.FEATURE_PICTURE_IN_PICTURE) && appOpsManager.checkOpNoThrow(
-                    AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
-                    this.getPackageManager().getApplicationInfo(this.getPackageName(),
-                            PackageManager.GET_META_DATA).uid, this.getPackageName())
-                    == AppOpsManager.MODE_ALLOWED) {
-                videoPosition = player.getCurrentPosition();
-                playerView.setUseController(false);
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    if(player.getVideoFormat() != null) {
-                        ratio = new Rational(Math.round(player.getVideoFormat().width*20*player.getVideoSize().pixelWidthHeightRatio), Math.round(player.getVideoFormat().height*20));
-                    } else if(player.getAudioFormat() != null) {
-                        ratio = new Rational(player.getAudioFormat().width, player.getAudioFormat().height);
-                    } else {
-                        ratio = new Rational(1, 1);
-                    }
-                    PictureInPictureParams params = new PictureInPictureParams.Builder().setAspectRatio(ratio).build();
-                    this.enterPictureInPictureMode(params);
-                }else {
-                    this.enterPictureInPictureMode();
-                }
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public boolean isScreenOn(Context context) {
-        DisplayManager dm = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
-        boolean screenOn = false;
-        for (Display display : dm.getDisplays()) {
-            if (display.getState() == Display.STATE_ON) {
-                screenOn = true;
-            }
-        }
-        return screenOn;
-    }
-
-    @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);
-        mediaSession.setActive(false);
-        playerNotificationManager.setPlayer(null);
         player.release();
-        playerView.setPlayer(null);
-        simpleCache.release();
-        standaloneDatabaseProvider.close();
         super.onDestroy();
-    }
 
-    public void onResume(){
-        super.onResume();
-        // put your code here...
-        if (!playerView.getUseController()) {
-            playerView.setUseController(true);
-        }
-        hideSystemBars();
     }
 
-    public void onUserLeaveHint() {
-        super.onUserLeaveHint();
-        enterPIPMode();
-    }
-
-    protected void onNewIntent(Intent intent) {
-        videoURL = intent.getStringExtra("video_url");
-        title = intent.getStringExtra("title");
-        videocache = intent.getIntExtra("videocache", 40);
-        buffersize = intent.getIntExtra("buffersize", 2000);
-        isplaylist = intent.getBooleanExtra("isplaylist", false);
-        queue = intent.getStringArrayListExtra("queue");
-        names = intent.getStringArrayListExtra("names");
-        getSupportActionBar().setTitle(title);
-        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.
-        player.play();
-        super.onNewIntent(intent);
-    }
-
-    public void onStop() {
-        try {
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-                    && this.getPackageManager()
-                    .hasSystemFeature(
-                            PackageManager.FEATURE_PICTURE_IN_PICTURE) && appOpsManager.checkOpNoThrow(
-                    AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
-                    this.getPackageManager().getApplicationInfo(this.getPackageName(),
-                            PackageManager.GET_META_DATA).uid, this.getPackageName())
-                    == AppOpsManager.MODE_ALLOWED && isScreenOn(this) && this.isInPictureInPictureMode()) {
-                finish();
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-        }
-        super.onStop();
-    }
-
-    /*static void deleteCache(Context context, StandaloneDatabaseProvider database) {
-        SimpleCache.delete(new File(context.getCacheDir(), "media"), database);
-    }*/
-
     public void onBackPressed() {
-        try {
-            if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
-                    && this.getPackageManager()
-                    .hasSystemFeature(
-                            PackageManager.FEATURE_PICTURE_IN_PICTURE) && appOpsManager.checkOpNoThrow(
-                    AppOpsManager.OPSTR_PICTURE_IN_PICTURE,
-                    this.getPackageManager().getApplicationInfo(this.getPackageName(),
-                            PackageManager.GET_META_DATA).uid, this.getPackageName())
-                    == AppOpsManager.MODE_ALLOWED) {
-                enterPIPMode();
-            } else {
-                super.onBackPressed();
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            e.printStackTrace();
-            super.onBackPressed();
-        }
+        player.release();
+        finish();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_launcher_foreground.xml
rename to app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ptextfile.png b/app/src/main/res/drawable-v24/textfile.png
similarity index 100%
rename from app/src/main/res/drawable/ptextfile.png
rename to app/src/main/res/drawable-v24/textfile.png
diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml
index 9ac1c20..a25b90f 100644
--- a/app/src/main/res/layout/activity_account_add.xml
+++ b/app/src/main/res/layout/activity_account_add.xml
@@ -7,137 +7,123 @@
     android:orientation="vertical"
     tools:context=".AccountAdd">
 
-    <androidx.core.widget.NestedScrollView
+    <LinearLayout
+        android:id="@+id/aliasLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        <EditText
+        android:id="@+id/alias"
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:layout_weight="1"
+        android:focusable="true"
+        android:hint="@string/accountadd_alias"
+        android:importantForAutofill="no"
+        android:inputType="text"
+        android:textColorHint="?attr/colorOnSecondary"
+        tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountadd_alias"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
+        <EditText
+            android:id="@+id/pdfendpoint"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/accountadd_pdfendpoint"
+            android:importantForAutofill="no"
+            android:inputType="textUri"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
 
-            <EditText
-                android:id="@+id/alias"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/accountadd_alias"
-                android:inputType="text"
-                android:textColorHint="?attr/colorOnSecondary"/>
+    </LinearLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountadd_pdfendpoint"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
+    <LinearLayout
+        android:id="@+id/endpointLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
 
-            <EditText
-                android:id="@+id/pdfendpoint"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/accountadd_pdfendpoint"
-                android:inputType="textUri"
-                android:textColorHint="?attr/colorOnSecondary"/>
+        <EditText
+            android:id="@+id/endpoint"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/accountadd_endpoint"
+            android:importantForAutofill="no"
+            android:inputType="textUri"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountadd_endpoint"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
+        <EditText
+            android:id="@+id/region"
+            android:layout_width="wrap_content"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/accountadd_region"
+            android:importantForAutofill="no"
+            android:inputType="textNoSuggestions"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
 
-            <EditText
-                android:id="@+id/endpoint"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/accountadd_endpoint"
-                android:inputType="textUri"
-                android:textColorHint="?attr/colorOnSecondary"/>
+    </LinearLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountadd_region"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
+    <EditText
+        android:id="@+id/username"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:autofillHints="username"
+        android:focusable="true"
+        android:hint="@string/accountadd_username"
+        android:inputType="textNoSuggestions"
+        android:textColorHint="?attr/colorOnSecondary"
+        tools:ignore="MissingConstraints" />
 
-            <EditText
-                android:id="@+id/region"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/accountadd_region"
-                android:inputType="textNoSuggestions"
-                android:textColorHint="?attr/colorOnSecondary"/>
+    <EditText
+        android:id="@+id/password"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:autofillHints="username"
+        android:focusable="true"
+        android:hint="@string/accountadd_password"
+        android:inputType="textPassword"
+        android:textColorHint="?attr/colorOnSecondary"
+        tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountadd_username"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
 
-            <EditText
-                android:id="@+id/username"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:autofillHints="username"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/accountadd_username"
-                android:inputType="textNoSuggestions"
-                android:textColorHint="?attr/colorOnSecondary"/>
+        <Button
+            android:id="@+id/addaccount"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/accountadd_button"
+            tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountadd_password"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
+        <Button
+            android:id="@+id/testaccount"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/accounttest_button"
+            tools:ignore="MissingConstraints" />
 
-            <EditText
-                android:id="@+id/password"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:autofillHints="password"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/accountadd_password"
-                android:inputType="textPassword"
-                android:textColorHint="?attr/colorOnSecondary"/>
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/pathstyle"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/path_style"
-                android:textSize="24sp" />
-
-            <Button
-                android:id="@+id/addaccount"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/accountadd_button" />
-
-            <Button
-                android:id="@+id/testaccount"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/accounttest_button" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bucket_policy.xml b/app/src/main/res/layout/activity_bucket_policy.xml
deleted file mode 100644
index 5912f8c..0000000
--- a/app/src/main/res/layout/activity_bucket_policy.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_cors_config.xml b/app/src/main/res/layout/activity_cors_config.xml
deleted file mode 100644
index a5b6c51..0000000
--- a/app/src/main/res/layout/activity_cors_config.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".CorsConfig">
-
-    <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/origins"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <Button
-                android:id="@+id/allow_all"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/allow_all"
-                android:visibility="gone" />
-
-            <Button
-                android:id="@+id/allow_pdf"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/allow_pdf"
-                android:visibility="gone" />
-
-            <Button
-                android:id="@+id/delete_cors"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/delete_cors"
-                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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_create_bucket.xml b/app/src/main/res/layout/activity_create_bucket.xml
index 701c67f..6152397 100644
--- a/app/src/main/res/layout/activity_create_bucket.xml
+++ b/app/src/main/res/layout/activity_create_bucket.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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,54 +7,42 @@
     android:orientation="vertical"
     tools:context=".CreateBucket">
 
-    <androidx.core.widget.NestedScrollView
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:text="@string/set_bucket_name"
+        android:textAlignment="center"
+        android:textSize="30sp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+    <EditText
+        android:id="@+id/bname"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:focusable="true"
+        android:hint="@string/bucket_name"
+        android:importantForAutofill="no"
+        android:inputType="text"
+        android:textColorHint="?attr/colorOnSecondary"
+        tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/set_bucket_name"
-                android:textAlignment="center"
-                android:textSize="30sp" />
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
 
-            <EditText
-                android:id="@+id/bname"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/bucket_name"
-                android:importantForAutofill="no"
-                android:inputType="text"
-                android:textColorHint="?attr/colorOnSecondary"
-                tools:ignore="MissingConstraints" />
+        <Button
+            android:id="@+id/cbucket"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/create_bucket"
+            tools:ignore="MissingConstraints" />
 
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                tools:ignore="MissingConstraints"
-                tools:layout_editor_absoluteX="20dp">
-
-                <Button
-                    android:id="@+id/cbucket"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text="@string/create_bucket"
-                    tools:ignore="MissingConstraints" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
 
     <ProgressBar
         android:id="@+id/simpleProgressBar"
@@ -67,4 +55,4 @@
         android:visibility="invisible"
         tools:ignore="MissingConstraints" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_downloader.xml b/app/src/main/res/layout/activity_downloader.xml
index 000f473..71525ad 100644
--- a/app/src/main/res/layout/activity_downloader.xml
+++ b/app/src/main/res/layout/activity_downloader.xml
@@ -28,13 +28,12 @@
 
     <ProgressBar
         android:id="@+id/simpleProgressBar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:indeterminate="false"
+        android:indeterminate="true"
         android:max="100"
         android:padding="20dp"
-        android:progress="0"
+        android:progress="50"
         android:visibility="invisible"
         tools:ignore="MissingConstraints" />
 
diff --git a/app/src/main/res/layout/activity_image_viewer.xml b/app/src/main/res/layout/activity_image_viewer.xml
index 1ebad8f..4b5dce5 100644
--- a/app/src/main/res/layout/activity_image_viewer.xml
+++ b/app/src/main/res/layout/activity_image_viewer.xml
@@ -4,10 +4,9 @@
     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
+    <ImageView
         android:id="@+id/imageViewer"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
@@ -15,9 +14,7 @@
         app:srcCompat="@drawable/empty"
         tools:ignore="MissingConstraints"
         tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="82dp"
-        app:minZoom="1.0"
-        app:maxZoom="25.5" />
+        tools:layout_editor_absoluteY="82dp" />
 
     <ProgressBar
         android:id="@+id/simpleProgressBar"
diff --git a/app/src/main/res/layout/activity_list_item.xml b/app/src/main/res/layout/activity_list_item.xml
index 8e58117..fed0d32 100644
--- a/app/src/main/res/layout/activity_list_item.xml
+++ b/app/src/main/res/layout/activity_list_item.xml
@@ -1,19 +1,19 @@
 <?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:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="10dp"
     tools:context=".list_item">
+
+
     <ImageView
         android:id="@+id/image"
         android:layout_width="30dp"
         android:layout_height="30dp"
         android:layout_marginStart="16dp"
-        android:layout_marginTop="6dp"
-        android:layout_marginBottom="6dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginTop="16dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@mipmap/ic_launcher" />
@@ -22,8 +22,7 @@
         android:id="@+id/imageinfo"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:layout_gravity="center"
+        android:layout_marginEnd="192dp"
         android:text="TextView"
         android:textSize="15sp"
         android:textStyle="bold"
@@ -32,4 +31,4 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toTopOf="parent" />
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 92d8139..5deca80 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,42 +7,48 @@
     android:orientation="vertical"
     tools:context=".MainActivity">
 
-    <androidx.core.widget.NestedScrollView
+
+    <LinearLayout
+        android:id="@+id/linearLayout"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="70dp"
+        android:layout_margin="20dp"
+        android:orientation="horizontal"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+        <Button
+            android:id="@+id/addaccount"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/accountadd_button"
+            tools:ignore="MissingConstraints"
+            style="?android:attr/buttonStyle" />
 
-            <Button
-                android:id="@+id/addaccount"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/accountadd_button" />
+        <Button
+            android:id="@+id/about_button"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/about_button"
+            tools:ignore="MissingConstraints"
+            style="?android:attr/buttonStyle" />
 
-            <Button
-                android:id="@+id/settings_button"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/settings" />
+    </LinearLayout>
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/accountselect"
-                android:textAlignment="center"
-                android:textSize="25sp" />
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/accountselect"
+        android:textAlignment="center"
+        android:textSize="25sp" />
 
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/alist"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:contentDescription="@string/account_list"
-                tools:layout_editor_absoluteX="27dp" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/alist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/account_list"
+        tools:layout_editor_absoluteX="27dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_info.xml b/app/src/main/res/layout/activity_object_info.xml
deleted file mode 100644
index f38821d..0000000
--- a/app/src/main/res/layout/activity_object_info.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?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"
-    android:id="@+id/activity_main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    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"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
-
-    <TextView
-        android:id="@+id/size"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
-
-    <TextView
-        android:id="@+id/object_count"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="center"
-        android:textSize="25sp" />
-
-    </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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_policy.xml b/app/src/main/res/layout/activity_object_policy.xml
deleted file mode 100644
index 2325102..0000000
--- a/app/src/main/res/layout/activity_object_policy.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
deleted file mode 100644
index 4413e37..0000000
--- a/app/src/main/res/layout/activity_settings.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".Settings">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/videocache"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <EditText
-                android:id="@+id/videocache"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/videocache"
-                android:inputType="number"
-                android:textColorHint="?attr/colorOnSecondary"/>
-
-            <Button
-                android:id="@+id/clearcache"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/clearcache" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/videotime"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <EditText
-                android:id="@+id/videotime"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/videotime"
-                android:inputType="number"
-                android:textColorHint="?attr/colorOnSecondary"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/buffersize"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <EditText
-                android:id="@+id/buffersize"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/buffersize"
-                android:inputType="number"
-                android:textColorHint="?attr/colorOnSecondary"/>
-
-            <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/isplaylist"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/playlist_playback"
-                android:textSize="24sp" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/playlisttime"
-                android:textAlignment="center"
-                android:textSize="25sp"/>
-
-            <EditText
-                android:id="@+id/playlisttime"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_weight="1"
-                android:focusable="true"
-                android:hint="@string/playlisttime"
-                android:inputType="number"
-                android:textColorHint="?attr/colorOnSecondary"/>
-
-            <Button
-                android:id="@+id/saveprefs"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/save_settings" />
-
-            <Button
-                android:id="@+id/settings_button"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/about_button" />
-
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index f638260..27942ff 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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,108 +7,114 @@
     android:orientation="vertical"
     tools:context=".Share">
 
-    <androidx.core.widget.NestedScrollView
+    <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        tools:ignore="MissingConstraints">
+        android:text="@string/expiration_date"
+        android:textAlignment="center"
+        android:textSize="25sp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/expirationtext"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textAlignment="center"
-                android:textSize="25sp" />
-
-            <LinearLayout
-                android:id="@+id/linearLayoutDate"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                tools:ignore="MissingConstraints"
-                tools:layout_editor_absoluteX="20dp">
-
-                <EditText
-                    android:id="@+id/Date"
-                    android:layout_width="0dp"
-                    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"
-                    android:textColorHint="?attr/colorOnSecondary"
-                    tools:ignore="MissingConstraints" />
-
-                <EditText
-                    android:id="@+id/Hour"
-                    android:layout_width="0dp"
-                    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"
-                    android:textColorHint="?attr/colorOnSecondary"
-                    tools:ignore="MissingConstraints" />
-
-                <EditText
-                    android:id="@+id/Minute"
-                    android:layout_width="0dp"
-                    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"
-                    android:textColorHint="?attr/colorOnSecondary"
-                    tools:ignore="MissingConstraints" />
-
-            </LinearLayout>
-
-            <Button
-                android:id="@+id/share"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/file_share"
-                android:visibility="gone"
-                tools:ignore="MissingConstraints" />
-
-            <Button
-                android:id="@+id/copy_links"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/copy_links"
-                android:visibility="gone"
-                tools:ignore="MissingConstraints" />
-
-            <Button
-                android:id="@+id/save_links"
-                android:layout_width="match_parent"
-                android:layout_height="70dp"
-                android:text="@string/save_links"
-                android:visibility="gone"
-                tools:ignore="MissingConstraints" />
-
-        </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"
+    <LinearLayout
+        android:id="@+id/linearLayoutDate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
         tools:ignore="MissingConstraints"
-        android:indeterminate="true" />
+        tools:layout_editor_absoluteX="20dp">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <EditText
+            android:id="@+id/Date"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/share_date"
+            android:inputType="date"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
+
+        <EditText
+            android:id="@+id/Month"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/share_month"
+            android:inputType="date"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
+
+        <EditText
+            android:id="@+id/Year"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/share_year"
+            android:inputType="date"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
+
+    </LinearLayout>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/expiration_time"
+        android:textAlignment="center"
+        android:textSize="25sp" />
+
+    <LinearLayout
+        android:id="@+id/linearLayoutTime"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
+
+        <EditText
+            android:id="@+id/Hour"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/share_hour"
+            android:inputType="date"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
+
+        <EditText
+            android:id="@+id/Minute"
+            android:layout_width="0dp"
+            android:layout_height="48dp"
+            android:layout_weight="1"
+            android:focusable="true"
+            android:hint="@string/share_minute"
+            android:inputType="date"
+            android:textColorHint="?attr/colorOnSecondary"
+            tools:ignore="MissingConstraints" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayoutSubmit"
+        android:layout_width="match_parent"
+        android:layout_height="70dp"
+        android:layout_margin="20dp"
+        android:orientation="horizontal"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
+
+        <Button
+            android:id="@+id/share"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/create_link"
+            tools:ignore="MissingConstraints" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_uploader.xml b/app/src/main/res/layout/activity_uploader.xml
index 41f1c65..b74b7ae 100644
--- a/app/src/main/res/layout/activity_uploader.xml
+++ b/app/src/main/res/layout/activity_uploader.xml
@@ -7,66 +7,52 @@
     android:orientation="vertical"
     tools:context=".Uploader">
 
-    <androidx.core.widget.NestedScrollView
+    <TextView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:text="@string/upload_prefix"
+        android:textAlignment="center"
+        android:textSize="30sp" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+    <EditText
+        android:id="@+id/fprefix"
+        android:layout_width="match_parent"
+        android:layout_height="48dp"
+        android:focusable="true"
+        android:hint="@string/upload_prefix"
+        android:importantForAutofill="no"
+        android:inputType="text"
+        android:textColorHint="?attr/colorOnSecondary"
+        tools:ignore="MissingConstraints" />
 
-            <TextView
-                android:id="@+id/fprefixlabel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/upload_key"
-                android:textAlignment="center"
-                android:textSize="30sp" />
+    <LinearLayout
+        android:id="@+id/linearLayout"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:orientation="horizontal"
+        android:padding="10dp"
+        tools:ignore="MissingConstraints"
+        tools:layout_editor_absoluteX="20dp">
 
-            <EditText
-                android:id="@+id/fprefix"
-                android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:focusable="true"
-                android:hint="@string/upload_key"
-                android:importantForAutofill="no"
-                android:inputType="text"
-                android:textColorHint="?attr/colorOnSecondary"
-                tools:ignore="MissingConstraints" />
+        <Button
+            android:id="@+id/fileupload"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="@string/upload_button"
+            tools:ignore="MissingConstraints" />
 
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="match_parent"
-                android:layout_height="80dp"
-                android:orientation="horizontal"
-                android:padding="10dp"
-                tools:ignore="MissingConstraints"
-                tools:layout_editor_absoluteX="20dp">
+    </LinearLayout>
 
-                <Button
-                    android:id="@+id/fileupload"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text="@string/upload_button"
-                    tools:ignore="MissingConstraints" />
-
-            </LinearLayout>
-
-            <ProgressBar
-                android:id="@+id/simpleProgressBar"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:indeterminate="false"
-                android:max="100"
-                android:padding="20dp"
-                android:progress="0"
-                android:visibility="invisible"
-                tools:ignore="MissingConstraints" />
-
-</LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+    <ProgressBar
+        android:id="@+id/simpleProgressBar"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:indeterminate="true"
+        android:max="100"
+        android:padding="20dp"
+        android:progress="50"
+        android:visibility="invisible"
+        tools:ignore="MissingConstraints" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/bucket_menu.xml b/app/src/main/res/menu/bucket_menu.xml
index 5ff27bf..3c3e897 100644
--- a/app/src/main/res/menu/bucket_menu.xml
+++ b/app/src/main/res/menu/bucket_menu.xml
@@ -5,38 +5,10 @@
         android:id="@+id/upload_file"
         android:title="@string/upload_file_tobucket" />
 
-    <item
-        android:id="@+id/upload_folder"
-        android:title="@string/upload_folder_tobucket" />
-
-    <item
-        android:id="@+id/download_bucket"
-        android:title="@string/download_bucket" />
-
-    <item
-        android:id="@+id/sharefile"
-        android:title="@string/create_link" />
-
     <item
         android:id="@+id/newbucket"
         android:title="@string/create_bucket" />
 
-    <item
-        android:id="@+id/info"
-        android:title="@string/object_info" />
-
-    <item
-        android:id="@+id/copy_name"
-        android:title="@string/copy_name" />
-
-    <item
-        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" />
diff --git a/app/src/main/res/menu/folder_menu.xml b/app/src/main/res/menu/folder_menu.xml
index caaf8b8..1e64433 100644
--- a/app/src/main/res/menu/folder_menu.xml
+++ b/app/src/main/res/menu/folder_menu.xml
@@ -5,30 +5,6 @@
         android:id="@+id/upload_file"
         android:title="@string/upload_file_here" />
 
-    <item
-        android:id="@+id/upload_folder"
-        android:title="@string/upload_folder_here" />
-
-    <item
-        android:id="@+id/download_folder"
-        android:title="@string/download_folder" />
-
-    <item
-        android:id="@+id/sharefile"
-        android:title="@string/create_link" />
-
-    <item
-        android:id="@+id/info"
-        android:title="@string/object_info" />
-
-    <item
-        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" />
diff --git a/app/src/main/res/menu/object_menu.xml b/app/src/main/res/menu/object_menu.xml
index fc1082f..056673d 100644
--- a/app/src/main/res/menu/object_menu.xml
+++ b/app/src/main/res/menu/object_menu.xml
@@ -5,29 +5,13 @@
         android:id="@+id/upload_file"
         android:title="@string/upload_file_here" />
 
-    <item
-        android:id="@+id/upload_folder"
-        android:title="@string/upload_folder_here" />
-
     <item
         android:id="@+id/download_file"
         android:title="@string/download_file" />
 
     <item
         android:id="@+id/sharefile"
-        android:title="@string/create_link" />
-
-    <item
-        android:id="@+id/info"
-        android:title="@string/object_info" />
-
-    <item
-        android:id="@+id/copy_name"
-        android:title="@string/copy_name" />
-
-    <item
-        android:id="@+id/acl_config"
-        android:title="@string/bucket_policy" />
+        android:title="@string/file_share" />
 
     <item
         android:id="@+id/deletefile"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 778359f..3a731ff 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -11,24 +11,19 @@
     <string name="bucket_name_empty">Se requiere un nombre para el bucket</string>
     <string name="file_share">Compartir archivo</string>
     <string name="download_file">Descargar archivo</string>
-    <string name="download_files">Descargar archivos</string>
-    <string name="cancel_download">Cancelar descarga</string>
+    <string name="download_in_progress">Descarga en proceso</string>
     <string name="download_success">Archivo descargado exitosamente</string>
     <string name="upload_file_tobucket">Subir archivo en este bucket</string>
     <string name="upload_folder_tobucket">Subir carpeta en este bucket</string>
     <string name="feature_not_supported">Su dispositivo no es compatible con esta característica</string>
     <string name="file_path_fail">No se encuentra el uri del archivo</string>
     <string name="upload_button">Subir archivo</string>
-    <string name="batch_upload_button">Subir archivos</string>
-    <string name="upload_key">Nombre del objeto</string>
-    <string name="upload_prefix">Prefijo de los objetos</string>
+    <string name="upload_prefix">Prefijo del objeto</string>
     <string name="no_file_selected">Favor de seleccionar un archivo</string>
     <string name="upload_success">Archivo subido exitosamente</string>
-    <string name="batch_upload_success">Archivos subidos exitosamente</string>
-    <string name="cancel_upload">Cancelar subida</string>
+    <string name="upload_in_progress">Subida en proceso</string>
     <string name="retry">Reintentar</string>
     <string name="download_failed">Descarga fallida</string>
-    <string name="upload_failed">Subida fallida</string>
     <string name="success">Éxito</string>
     <string name="create_bucket">Crear nuevo bucket</string>
     <string name="create_bucket_success">Bucket creado exitosamente</string>
@@ -62,69 +57,24 @@
     <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>
+    <string name="share_date">DD</string>
+    <string name="share_month">MM</string>
+    <string name="share_year">AAAA</string>
     <string name="share_hour">HH</string>
     <string name="share_minute">MM</string>
     <string name="expiration_date">Fecha de expiración</string>
-    <string name="expiration_time">Expira dentro de</string>
-    <string name="create_link">Crear enlace</string>
+    <string name="expiration_time">Hora de expiración</string>
+    <string name="create_link">Crear enlace al archivo</string>
     <string name="invalid_expiration_date">La fecha de caducidad debe ser inferior a 7 días</string>
-    <string name="file_size">Tamaño del archivo</string>
-    <string name="object_info">Propiedades</string>
-    <string name="file_external">Abir en</string>
-    <string name="folder_size">Tamaño de la carpeta</string>
-    <string name="bucket_size">Tamaño del bucket</string>
-    <string name="file_count">Archivos</string>
-    <string name="null_expiration_date">Debe establecer una fecha de expiración para compartir archivos</string>
-    <string name="download_canceled">Descarga cancelada</string>
-    <string name="upload_canceled">Subida cancelada</string>
-    <string name="settings">Ajustes</string>
-    <string name="save_settings">Guardar ajustes</string>
-    <string name="videocache">Tamaño máximo de cache multimedia (en MiB)</string>
-    <string name="videotime">Tiempo de expiración para visor multimedia (en horas)</string>
-    <string name="playlist_playback">Habilitar listas de reproducción</string>
-    <string name="playlisttime">Tiempo de expiración para listas de reproducción (en horas)</string>
-    <string name="buffersize">Tamaño del buffer del reproductor multimedia (en milisegundos)</string>
-    <string name="buffersize_error">El tamaño del búfer debe ser de al menos 2001 milisegundos</string>
-    <string name="mediaplayer_multierror">Solo se puede reproducir un archivo multimedia a la vez</string>
-    <string name="playback_channel_name">Reproduccion de video</string>
-    <string name="not_zero">este valor no puede ser cero</string>
-    <string name="path_style">Acceso de estilo de ruta</string>
-    <string name="cors_config">Política CORS</string>
-    <string name="cors_status">Orígenes permitidos</string>
-    <string name="cors_all">Permitidos todos los orígenes</string>
-    <string name="cors_pdf">Uso de endpoint PDF permitido</string>
-    <string name="cors_npdf">Uso de endpoint PDF no permitido</string>
-    <string name="cors_none">Política CORS no encontrada</string>
-    <string name="allow_all">Permitir todo</string>
-    <string name="allow_pdf">Permitir pdf</string>
-    <string name="delete_cors">Eliminar CORS</string>
-    <string name="policy_error">No se pudo cambiar la política</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>
-    <string name="copy_name">Copiar nombre al portapapeles</string>
-    <string name="copy_ok">Copiado al portapapeles</string>
-    <string name="upload_calculate">Calculando tamaño de la carpeta</string>
-    <string name="picture_too_big">Imagen demasiado grande</string>
-    <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>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2c59bd1..41aeab3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,57 +1,44 @@
 <resources>
     <string name="app_name" translatable="false">S3 Manager</string>
     <string name="aws_endpoint" translatable="false">.amazonaws.com</string>
+    <string name="endpoint_url" translatable="false">https://object.asgardius.company</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>
     <string name="Image">Image</string>
     <string name="expiration_date">Expiration date</string>
-    <string name="expiration_time">Expires within</string>
+    <string name="expiration_time">Expiration time</string>
     <string name="share_hour">HH</string>
     <string name="share_minute">MM</string>
-    <string name="share_date">D</string>
-    <string name="create_link">Create link</string>
+    <string name="share_date">DD</string>
+    <string name="share_month">MM</string>
+    <string name="share_year">YYYY</string>
+    <string name="create_link">Create file link</string>
     <string name="invalid_expiration_date">Expiration date must be at most 7 days</string>
-    <string name="null_expiration_date">You must set an expiration date to share files</string>
     <string name="broken_database">Local database is corrupted. Please reinstall this app</string>
     <string name="pending_feature">This feature is not implemented yet</string>
     <string name="set_bucket_name">Set new bucket name</string>
     <string name="bucket_name">Bucket name</string>
     <string name="bucket_name_empty">A bucket name is required</string>
     <string name="file_share">Share file</string>
-    <string name="file_external">Open in</string>
     <string name="download_file">Download file</string>
-    <string name="download_files">Download files</string>
-    <string name="download_bucket">Download bucket content</string>
-    <string name="download_folder">Download folder content</string>
-    <string name="cancel_download">Cancel download</string>
+    <string name="download_in_progress">Download in progress</string>
     <string name="download_success">File downloaded successfully</string>
-    <string name="batch_download_success">Files downloaded successfully</string>
     <string name="upload_file_tobucket">Upload file to this bucket</string>
     <string name="upload_folder_tobucket">Upload folder to this bucket</string>
     <string name="feature_not_supported">Your device is not compatible with this feature</string>
     <string name="file_path_fail">File uri not found</string>
     <string name="upload_button">Upload file</string>
-    <string name="batch_upload_button">Upload files</string>
-    <string name="upload_key">Object name</string>
     <string name="upload_prefix">Object prefix</string>
     <string name="no_file_selected">Please select a file</string>
     <string name="upload_success">File uploaded successfully</string>
-    <string name="batch_upload_success">Files uploaded successfully</string>
-    <string name="cancel_upload">Cancel Upload</string>
+    <string name="upload_in_progress">Upload in progress</string>
     <string name="retry">Retry</string>
     <string name="download_failed">Download failed</string>
-    <string name="download_canceled">Download canceled</string>
-    <string name="upload_failed">Upload failed</string>
-    <string name="upload_canceled">Upload canceled</string>
     <string name="success">Success</string>
-    <string name="object_info">Properties</string>
-    <string name="file_size">File Size</string>
-    <string name="folder_size">Folder Size</string>
-    <string name="bucket_size">Bucket Size</string>
-    <string name="file_count">Files</string>
     <string name="create_bucket">Create new bucket</string>
     <string name="create_bucket_success">Bucket created successfully</string>
     <string name="upload_file_here">Upload file in current folder</string>
@@ -85,48 +72,13 @@
     <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="settings">Settings</string>
-    <string name="save_settings">Save settings</string>
-    <string name="videocache">Max media cache size (in MiB)</string>
-    <string name="videotime">Expiration time for media viewer (in hours)</string>
-    <string name="buffersize">Media player buffer size (in milliseconds)</string>
-    <string name="buffersize_error">Buffer size must be at least 2001 milliseconds</string>
-    <string name="playlist_playback">Enable playlists</string>
-    <string name="playlisttime">Expiration time for media playlists (in hours)</string>
-    <string name="mediaplayer_multierror">Only one media file can be played at once</string>
-    <string name="playback_channel_name">Video Playback</string>
-    <string name="not_zero">This value cannot be zero</string>
-    <string name="path_style">Path style access</string>
-    <string name="cors_config">CORS policy</string>
-    <string name="cors_status">Allowed origins</string>
-    <string name="cors_all">All origins allowed</string>
-    <string name="cors_pdf">PDF Endpoint allowed</string>
-    <string name="cors_npdf">PDF Endpoint not allowed</string>
-    <string name="cors_none">CORS policy not found</string>
-    <string name="allow_all">Allow all</string>
-    <string name="allow_pdf">Allow pdf</string>
-    <string name="delete_cors">Delete CORS</string>
-    <string name="policy_error">Cannot change policy</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>
-    <string name="picture_too_big">Picture too big</string>
-    <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>
+    <string name="dummy_button">Dummy Button</string>
+    <string name="dummy_content">DUMMY\nCONTENT</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a689e45..1a59a11 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -26,13 +26,4 @@
         <item name="fullscreenBackgroundColor">@color/light_blue_600</item>
         <item name="fullscreenTextColor">@color/light_blue_A200</item>
     </style>
-
-    <style name="Theme.AsgardiusS3Manager.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.AsgardiusS3Manager.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.AsgardiusS3Manager.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4a0042b..5ae9a7b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '7.2.2' apply false
+    id 'com.android.library' version '7.2.2' apply false
 }
 
 task clean(type: Delete) {
diff --git a/fastlane/metadata/android/en-US/changelogs/18.txt b/fastlane/metadata/android/en-US/changelogs/18.txt
deleted file mode 100644
index aa0a82f..0000000
--- a/fastlane/metadata/android/en-US/changelogs/18.txt
+++ /dev/null
@@ -1 +0,0 @@
-First F-Droid release
diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
deleted file mode 100644
index 300ea18..0000000
--- a/fastlane/metadata/android/en-US/changelogs/19.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue at playing long videos
diff --git a/fastlane/metadata/android/en-US/changelogs/20.txt b/fastlane/metadata/android/en-US/changelogs/20.txt
deleted file mode 100644
index 77abcb4..0000000
--- a/fastlane/metadata/android/en-US/changelogs/20.txt
+++ /dev/null
@@ -1 +0,0 @@
-Add cache to media player
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/21.txt b/fastlane/metadata/android/en-US/changelogs/21.txt
deleted file mode 100644
index a4db5a2..0000000
--- a/fastlane/metadata/android/en-US/changelogs/21.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fix stability issue at loading videos
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/22.txt b/fastlane/metadata/android/en-US/changelogs/22.txt
deleted file mode 100644
index 28a274f..0000000
--- a/fastlane/metadata/android/en-US/changelogs/22.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fix performance issue at main screen
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/23.txt b/fastlane/metadata/android/en-US/changelogs/23.txt
deleted file mode 100644
index ca1eb00..0000000
--- a/fastlane/metadata/android/en-US/changelogs/23.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue at file sharing screen
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/25.txt b/fastlane/metadata/android/en-US/changelogs/25.txt
deleted file mode 100644
index 3d4af03..0000000
--- a/fastlane/metadata/android/en-US/changelogs/25.txt
+++ /dev/null
@@ -1 +0,0 @@
-Add settings menu
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/26.txt b/fastlane/metadata/android/en-US/changelogs/26.txt
deleted file mode 100644
index 046c519..0000000
--- a/fastlane/metadata/android/en-US/changelogs/26.txt
+++ /dev/null
@@ -1 +0,0 @@
-Update aws sdk
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/27.txt b/fastlane/metadata/android/en-US/changelogs/27.txt
deleted file mode 100644
index 7b5757c..0000000
--- a/fastlane/metadata/android/en-US/changelogs/27.txt
+++ /dev/null
@@ -1 +0,0 @@
-Customizable media player buffer size
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/33.txt b/fastlane/metadata/android/en-US/changelogs/33.txt
deleted file mode 100644
index 4fa4385..0000000
--- a/fastlane/metadata/android/en-US/changelogs/33.txt
+++ /dev/null
@@ -1 +0,0 @@
-Picture in Picture support
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/34.txt b/fastlane/metadata/android/en-US/changelogs/34.txt
deleted file mode 100644
index fcd5ad6..0000000
--- a/fastlane/metadata/android/en-US/changelogs/34.txt
+++ /dev/null
@@ -1 +0,0 @@
-Playback notifications for media player
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/36.txt b/fastlane/metadata/android/en-US/changelogs/36.txt
deleted file mode 100644
index a82e1ef..0000000
--- a/fastlane/metadata/android/en-US/changelogs/36.txt
+++ /dev/null
@@ -1 +0,0 @@
-Fix Picture in Picture
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/37.txt b/fastlane/metadata/android/en-US/changelogs/37.txt
deleted file mode 100644
index d609ec1..0000000
--- a/fastlane/metadata/android/en-US/changelogs/37.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Better performance at listing buckets with 1000+ objects
-* Fix issue at deleting folders with 1000+ files
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/38.txt b/fastlane/metadata/android/en-US/changelogs/38.txt
deleted file mode 100644
index 1fb9ad5..0000000
--- a/fastlane/metadata/android/en-US/changelogs/38.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix delete dialog
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/39.txt b/fastlane/metadata/android/en-US/changelogs/39.txt
deleted file mode 100644
index e595950..0000000
--- a/fastlane/metadata/android/en-US/changelogs/39.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fix settings screen
-* Fix file list
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/40.txt b/fastlane/metadata/android/en-US/changelogs/40.txt
deleted file mode 100644
index 58e36a0..0000000
--- a/fastlane/metadata/android/en-US/changelogs/40.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Add support for HLS playback
-* Code cleanup
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/41.txt b/fastlane/metadata/android/en-US/changelogs/41.txt
deleted file mode 100644
index bdd51c6..0000000
--- a/fastlane/metadata/android/en-US/changelogs/41.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Fix uploader and downloader
-* Fix video player error handling
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/42.txt b/fastlane/metadata/android/en-US/changelogs/42.txt
deleted file mode 100644
index 8072d5c..0000000
--- a/fastlane/metadata/android/en-US/changelogs/42.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix Picture in Picture
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/43.txt b/fastlane/metadata/android/en-US/changelogs/43.txt
deleted file mode 100644
index 3383ae5..0000000
--- a/fastlane/metadata/android/en-US/changelogs/43.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix background playback issues
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/44.txt b/fastlane/metadata/android/en-US/changelogs/44.txt
deleted file mode 100644
index 3383ae5..0000000
--- a/fastlane/metadata/android/en-US/changelogs/44.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix background playback issues
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/45.txt b/fastlane/metadata/android/en-US/changelogs/45.txt
deleted file mode 100644
index bc2355a..0000000
--- a/fastlane/metadata/android/en-US/changelogs/45.txt
+++ /dev/null
@@ -1 +0,0 @@
-* UI fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/46.txt b/fastlane/metadata/android/en-US/changelogs/46.txt
deleted file mode 100644
index c4d90f8..0000000
--- a/fastlane/metadata/android/en-US/changelogs/46.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Account edit screen redesign
-* Add option to choose between virtual host style and path style for buckets (virtual host will be used by default)
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/47.txt b/fastlane/metadata/android/en-US/changelogs/47.txt
deleted file mode 100644
index 7352e9d..0000000
--- a/fastlane/metadata/android/en-US/changelogs/47.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* CORS configuration (currently you can allow pdf endpoint, allow all origins or delete policy)
-* Fixed UI issues when using app in free form mode
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/48.txt b/fastlane/metadata/android/en-US/changelogs/48.txt
deleted file mode 100644
index 1870de1..0000000
--- a/fastlane/metadata/android/en-US/changelogs/48.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed Picture in Picture issue when playing anamorphic videos
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/49.txt b/fastlane/metadata/android/en-US/changelogs/49.txt
deleted file mode 100644
index bc315ea..0000000
--- a/fastlane/metadata/android/en-US/changelogs/49.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fixed video being closed when app is on freeform mode
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/50.txt b/fastlane/metadata/android/en-US/changelogs/50.txt
deleted file mode 100644
index 939c470..0000000
--- a/fastlane/metadata/android/en-US/changelogs/50.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Freeform mode improvements
-* User interface more consistent
-* File sharing easier to use
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/52.txt b/fastlane/metadata/android/en-US/changelogs/52.txt
deleted file mode 100644
index 97881ee..0000000
--- a/fastlane/metadata/android/en-US/changelogs/52.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Folder download function added
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/58.txt b/fastlane/metadata/android/en-US/changelogs/58.txt
deleted file mode 100644
index c2c0bed..0000000
--- a/fastlane/metadata/android/en-US/changelogs/58.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* UI fixes
-* Copy file name to clipboard
-* Folder upload function added
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/59.txt b/fastlane/metadata/android/en-US/changelogs/59.txt
deleted file mode 100644
index be320a1..0000000
--- a/fastlane/metadata/android/en-US/changelogs/59.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Enhanced picture viewer
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/61.txt b/fastlane/metadata/android/en-US/changelogs/61.txt
deleted file mode 100644
index f8b8cdc..0000000
--- a/fastlane/metadata/android/en-US/changelogs/61.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* Add option to play all media items on current folder
-* Add option to share entire folders and save on clipboard or txt file
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/62.txt b/fastlane/metadata/android/en-US/changelogs/62.txt
deleted file mode 100644
index a84f421..0000000
--- a/fastlane/metadata/android/en-US/changelogs/62.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Delete cached media when is not longer needed
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/63.txt b/fastlane/metadata/android/en-US/changelogs/63.txt
deleted file mode 100644
index 1686b39..0000000
--- a/fastlane/metadata/android/en-US/changelogs/63.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix app setting validation
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/64.txt b/fastlane/metadata/android/en-US/changelogs/64.txt
deleted file mode 100644
index bc2355a..0000000
--- a/fastlane/metadata/android/en-US/changelogs/64.txt
+++ /dev/null
@@ -1 +0,0 @@
-* UI fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/65.txt b/fastlane/metadata/android/en-US/changelogs/65.txt
deleted file mode 100644
index bc2355a..0000000
--- a/fastlane/metadata/android/en-US/changelogs/65.txt
+++ /dev/null
@@ -1 +0,0 @@
-* UI fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/66.txt b/fastlane/metadata/android/en-US/changelogs/66.txt
deleted file mode 100644
index bc2355a..0000000
--- a/fastlane/metadata/android/en-US/changelogs/66.txt
+++ /dev/null
@@ -1 +0,0 @@
-* UI fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/68.txt b/fastlane/metadata/android/en-US/changelogs/68.txt
deleted file mode 100644
index bc2355a..0000000
--- a/fastlane/metadata/android/en-US/changelogs/68.txt
+++ /dev/null
@@ -1 +0,0 @@
-* UI fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/69.txt b/fastlane/metadata/android/en-US/changelogs/69.txt
deleted file mode 100644
index 7cdcff7..0000000
--- a/fastlane/metadata/android/en-US/changelogs/69.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-* UI fixes
-* Better support for notched devices
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/71.txt b/fastlane/metadata/android/en-US/changelogs/71.txt
deleted file mode 100644
index f6e3e39..0000000
--- a/fastlane/metadata/android/en-US/changelogs/71.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Set bucket as public or private
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/74.txt b/fastlane/metadata/android/en-US/changelogs/74.txt
deleted file mode 100644
index aba4d8a..0000000
--- a/fastlane/metadata/android/en-US/changelogs/74.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Set object as public or private
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/76.txt b/fastlane/metadata/android/en-US/changelogs/76.txt
deleted file mode 100644
index 84cbde8..0000000
--- a/fastlane/metadata/android/en-US/changelogs/76.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-* Check policy per object at creating share links
-* Cache reuse for public media files
-* Button to remove media cache inside ths app
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/77.txt b/fastlane/metadata/android/en-US/changelogs/77.txt
deleted file mode 100644
index 6c06e07..0000000
--- a/fastlane/metadata/android/en-US/changelogs/77.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix wakelock not being released at closing video player
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/78.txt b/fastlane/metadata/android/en-US/changelogs/78.txt
deleted file mode 100644
index d889ea2..0000000
--- a/fastlane/metadata/android/en-US/changelogs/78.txt
+++ /dev/null
@@ -1 +0,0 @@
-* M3U Playlist support
diff --git a/fastlane/metadata/android/en-US/changelogs/79.txt b/fastlane/metadata/android/en-US/changelogs/79.txt
deleted file mode 100644
index 121ed13..0000000
--- a/fastlane/metadata/android/en-US/changelogs/79.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Fix UI issue at media player screen
diff --git a/fastlane/metadata/android/en-US/changelogs/80.txt b/fastlane/metadata/android/en-US/changelogs/80.txt
deleted file mode 100644
index b905409..0000000
--- a/fastlane/metadata/android/en-US/changelogs/80.txt
+++ /dev/null
@@ -1 +0,0 @@
-* Libraries updated
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
deleted file mode 100644
index 61abb09..0000000
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-File Explorer to manage servers compatible with S3 Object Storage Protocol
-
-Current feature list
-
-<li>Audio and Video playback (opus, ogg, oga, mp3, m4a, flac, mka, mkv, mp4, m4v, webm)</li>
-<li>Picture preview (jpg, jpeg, png, gif, webp)</li>
-<li>Plain text file preview (txt, md)</li>
-<li>Webpage viewer (htm, html)</li>
-<li>Multiple account support</li>
-<li>Open object in external web browser</li>
-<li>Create buckets</li>
-<li>Delete buckets</li>
-<li>Delete files</li>
-<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
-
-<li>Nothing for now</li>
-
-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
-
-Supported languages
-
-<li>English</li>
-<li>Spanish</li>
-
-Knnown issues
-
-<li>Slow user interface on some low-end devices</li>
-<li>Running screen restarts after toggling system dark mode</li>
-
-Known supported providers
-
-<li>Amazon Web Services</li>
-<li>Scaleway Elements</li>
-<li>Wasabi Cloud</li>
-<li>Backblaze B2</li>
-<li>Cloudflare R2 (partial)</li>
-<li>MinIO **</li>
-<li>Garage **</li>
-
-Known not supported providers
-
-<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
-
-You can find app documentation at https://wiki.asgardius.company/shelves/asgardius-s3-manager-english (english) or https://wiki.asgardius.company/shelves/asgardius-s3-manager-espanol (spanish)
-
-You can use MinIO or Garage to have a FOSS selfhosted server to use with this app
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
deleted file mode 100644
index bd3e5fa..0000000
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index a1e4300..0000000
Binary files a/fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
deleted file mode 100644
index 620b088..0000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
deleted file mode 100644
index 2a8d954..0000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
deleted file mode 100644
index 2e76326..0000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
deleted file mode 100644
index b37c6d2..0000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png
deleted file mode 100644
index 73eb1ee..0000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png
deleted file mode 100644
index 2279997..0000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png
deleted file mode 100644
index b5aba61..0000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png
deleted file mode 100644
index 2f2d533..0000000
Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/4.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png
deleted file mode 100644
index 77691f7..0000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png
deleted file mode 100644
index 7c902a4..0000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png
deleted file mode 100644
index f17f727..0000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png
deleted file mode 100644
index 01d9c5f..0000000
Binary files a/fastlane/metadata/android/en-US/images/tenInchScreenshots/4.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
deleted file mode 100644
index ee744c4..0000000
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-File explorer for S3 servers with file preview support
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
deleted file mode 100644
index 5f69c07..0000000
--- a/fastlane/metadata/android/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Asgardius S3 Manager
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1cfb2ab..e606d51 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Aug 27 12:12:23 MST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME