diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 56d6814..be86486 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,26 @@
-
-
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..4ee6837
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 05f13e4..b16f0a0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+
@@ -27,6 +28,7 @@
+
diff --git a/.idea/other.xml b/.idea/other.xml
new file mode 100644
index 0000000..4604c44
--- /dev/null
+++ b/.idea/other.xml
@@ -0,0 +1,252 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..6d13891 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index a67ab27..998fd4b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,11 +6,11 @@ android {
compileSdk 33
defaultConfig {
- applicationId "asgardius.page.s3manager"
+ applicationId "asgardius.page.s3managermk2"
minSdk 21
- targetSdk 33
- versionCode 86
- versionName "0.10.1"
+ targetSdk 34
+ versionCode 1
+ versionName "0.11.0"
setProperty("archivesBaseName", "s3-manager-$versionName")
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -29,7 +29,7 @@ android {
buildFeatures {
viewBinding true
}
- namespace 'asgardius.page.s3manager'
+ namespace 'asgardius.page.s3managermk2'
}
dependencies {
@@ -43,7 +43,7 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation"com.otaliastudios:zoomlayout:1.9.0"
// BEGIN AWS DEPENDENCIES
- def aws_version = "2.73.0"
+ def aws_version = "2.76.0"
implementation "com.amazonaws:aws-android-sdk-s3:$aws_version"
implementation ("com.amazonaws:aws-android-sdk-mobile-client:$aws_version") { transitive = true }
// END AWS DEPENDENCIES
diff --git a/app/src/androidTest/java/asgardius/page/s3manager/ExampleInstrumentedTest.java b/app/src/androidTest/java/asgardius/page/s3managermk2/ExampleInstrumentedTest.java
similarity index 95%
rename from app/src/androidTest/java/asgardius/page/s3manager/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/asgardius/page/s3managermk2/ExampleInstrumentedTest.java
index d4901c4..a7c429b 100644
--- a/app/src/androidTest/java/asgardius/page/s3manager/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/asgardius/page/s3managermk2/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.content.Context;
diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3managermk2/AccountAdd.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/AccountAdd.java
rename to app/src/main/java/asgardius/page/s3managermk2/AccountAdd.java
index 3350038..f87ddec 100644
--- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/AccountAdd.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.content.Intent;
import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/asgardius/page/s3manager/Adapter.java b/app/src/main/java/asgardius/page/s3managermk2/Adapter.java
similarity index 97%
rename from app/src/main/java/asgardius/page/s3manager/Adapter.java
rename to app/src/main/java/asgardius/page/s3managermk2/Adapter.java
index 4631f78..1436427 100644
--- a/app/src/main/java/asgardius/page/s3manager/Adapter.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/Adapter.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.annotation.SuppressLint;
import android.content.Context;
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketPolicy.java b/app/src/main/java/asgardius/page/s3managermk2/BucketPolicy.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/BucketPolicy.java
rename to app/src/main/java/asgardius/page/s3managermk2/BucketPolicy.java
index 033f708..a8c2a95 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketPolicy.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/BucketPolicy.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.os.Bundle;
import android.view.View;
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3managermk2/BucketSelect.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/BucketSelect.java
rename to app/src/main/java/asgardius/page/s3managermk2/BucketSelect.java
index 2da8bbc..4ed8f54 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/BucketSelect.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java b/app/src/main/java/asgardius/page/s3managermk2/CorsConfig.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/CorsConfig.java
rename to app/src/main/java/asgardius/page/s3managermk2/CorsConfig.java
index cba45f3..27d06da 100644
--- a/app/src/main/java/asgardius/page/s3manager/CorsConfig.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/CorsConfig.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.os.Bundle;
import android.view.View;
diff --git a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java b/app/src/main/java/asgardius/page/s3managermk2/CreateBucket.java
similarity index 98%
rename from app/src/main/java/asgardius/page/s3manager/CreateBucket.java
rename to app/src/main/java/asgardius/page/s3managermk2/CreateBucket.java
index d8c7831..daa109f 100644
--- a/app/src/main/java/asgardius/page/s3manager/CreateBucket.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/CreateBucket.java
@@ -1,6 +1,5 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
-import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
diff --git a/app/src/main/java/asgardius/page/s3manager/Downloader.java b/app/src/main/java/asgardius/page/s3managermk2/Downloader.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/Downloader.java
rename to app/src/main/java/asgardius/page/s3managermk2/Downloader.java
index ea6aa21..efe6212 100644
--- a/app/src/main/java/asgardius/page/s3manager/Downloader.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/Downloader.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import static android.content.ContentValues.TAG;
diff --git a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java b/app/src/main/java/asgardius/page/s3managermk2/ImageViewer.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/ImageViewer.java
rename to app/src/main/java/asgardius/page/s3managermk2/ImageViewer.java
index b9dc22f..48de03a 100644
--- a/app/src/main/java/asgardius/page/s3manager/ImageViewer.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/ImageViewer.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.annotation.SuppressLint;
import android.graphics.drawable.Drawable;
diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3managermk2/MainActivity.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/MainActivity.java
rename to app/src/main/java/asgardius/page/s3managermk2/MainActivity.java
index 9447245..520936f 100644
--- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/MainActivity.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.content.DialogInterface;
import android.content.Intent;
diff --git a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java b/app/src/main/java/asgardius/page/s3managermk2/MyDbHelper.java
similarity index 97%
rename from app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
rename to app/src/main/java/asgardius/page/s3managermk2/MyDbHelper.java
index 931c69f..da1b81c 100644
--- a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/MyDbHelper.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.content.Context;
import android.database.sqlite.SQLiteDatabase;
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java b/app/src/main/java/asgardius/page/s3managermk2/ObjectInfo.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/ObjectInfo.java
rename to app/src/main/java/asgardius/page/s3managermk2/ObjectInfo.java
index fb034a8..94f0c45 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectInfo.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/ObjectInfo.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.os.Bundle;
import android.view.View;
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectPolicy.java b/app/src/main/java/asgardius/page/s3managermk2/ObjectPolicy.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/ObjectPolicy.java
rename to app/src/main/java/asgardius/page/s3managermk2/ObjectPolicy.java
index 672301f..e8a0f83 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectPolicy.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/ObjectPolicy.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
diff --git a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java b/app/src/main/java/asgardius/page/s3managermk2/ObjectSelect.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
rename to app/src/main/java/asgardius/page/s3managermk2/ObjectSelect.java
index 365ed1a..9d74075 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/ObjectSelect.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/java/asgardius/page/s3manager/PolicyCheck.java b/app/src/main/java/asgardius/page/s3managermk2/PolicyCheck.java
similarity index 98%
rename from app/src/main/java/asgardius/page/s3manager/PolicyCheck.java
rename to app/src/main/java/asgardius/page/s3managermk2/PolicyCheck.java
index 3ce5fca..d47f509 100644
--- a/app/src/main/java/asgardius/page/s3manager/PolicyCheck.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/PolicyCheck.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest;
diff --git a/app/src/main/java/asgardius/page/s3manager/RecyclerTouchListener.java b/app/src/main/java/asgardius/page/s3managermk2/RecyclerTouchListener.java
similarity index 97%
rename from app/src/main/java/asgardius/page/s3manager/RecyclerTouchListener.java
rename to app/src/main/java/asgardius/page/s3managermk2/RecyclerTouchListener.java
index 1b566f5..c3fab72 100644
--- a/app/src/main/java/asgardius/page/s3manager/RecyclerTouchListener.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/RecyclerTouchListener.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.content.Context;
import android.view.GestureDetector;
diff --git a/app/src/main/java/asgardius/page/s3manager/SdcardCheck.java b/app/src/main/java/asgardius/page/s3managermk2/SdcardCheck.java
similarity index 94%
rename from app/src/main/java/asgardius/page/s3manager/SdcardCheck.java
rename to app/src/main/java/asgardius/page/s3managermk2/SdcardCheck.java
index 8b47207..b16e6d9 100644
--- a/app/src/main/java/asgardius/page/s3manager/SdcardCheck.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/SdcardCheck.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.content.Context;
import android.content.pm.ApplicationInfo;
diff --git a/app/src/main/java/asgardius/page/s3manager/Settings.java b/app/src/main/java/asgardius/page/s3managermk2/Settings.java
similarity index 97%
rename from app/src/main/java/asgardius/page/s3manager/Settings.java
rename to app/src/main/java/asgardius/page/s3managermk2/Settings.java
index bc81b91..c818afd 100644
--- a/app/src/main/java/asgardius/page/s3manager/Settings.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/Settings.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.annotation.SuppressLint;
import android.content.Intent;
@@ -11,17 +11,15 @@ import androidx.appcompat.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
-import android.widget.TextView;
import android.widget.Toast;
import com.google.android.exoplayer2.database.StandaloneDatabaseProvider;
-import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor;
import com.google.android.exoplayer2.upstream.cache.SimpleCache;
import com.google.android.material.switchmaterial.SwitchMaterial;
import java.io.File;
-import asgardius.page.s3manager.databinding.ActivitySettingsBinding;
+import asgardius.page.s3managermk2.databinding.ActivitySettingsBinding;
public class Settings extends AppCompatActivity {
diff --git a/app/src/main/java/asgardius/page/s3manager/Share.java b/app/src/main/java/asgardius/page/s3managermk2/Share.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/Share.java
rename to app/src/main/java/asgardius/page/s3managermk2/Share.java
index 6f03cba..0a025ea 100644
--- a/app/src/main/java/asgardius/page/s3manager/Share.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/Share.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/java/asgardius/page/s3manager/TextViewer.java b/app/src/main/java/asgardius/page/s3managermk2/TextViewer.java
similarity index 98%
rename from app/src/main/java/asgardius/page/s3manager/TextViewer.java
rename to app/src/main/java/asgardius/page/s3managermk2/TextViewer.java
index 9a25383..0c378cd 100644
--- a/app/src/main/java/asgardius/page/s3manager/TextViewer.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/TextViewer.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.os.Build;
import android.os.Bundle;
diff --git a/app/src/main/java/asgardius/page/s3manager/Uploader.java b/app/src/main/java/asgardius/page/s3managermk2/Uploader.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/Uploader.java
rename to app/src/main/java/asgardius/page/s3managermk2/Uploader.java
index 1e11899..f1547b8 100644
--- a/app/src/main/java/asgardius/page/s3manager/Uploader.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/Uploader.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import static android.content.ContentValues.TAG;
diff --git a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java b/app/src/main/java/asgardius/page/s3managermk2/VideoPlayer.java
similarity index 99%
rename from app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
rename to app/src/main/java/asgardius/page/s3managermk2/VideoPlayer.java
index 7cfc14b..c65c8e1 100644
--- a/app/src/main/java/asgardius/page/s3manager/VideoPlayer.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/VideoPlayer.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import android.app.AppOpsManager;
import android.app.NotificationChannel;
diff --git a/app/src/main/java/asgardius/page/s3manager/WebBrowser.java b/app/src/main/java/asgardius/page/s3managermk2/WebBrowser.java
similarity index 97%
rename from app/src/main/java/asgardius/page/s3manager/WebBrowser.java
rename to app/src/main/java/asgardius/page/s3managermk2/WebBrowser.java
index a10afb4..2f4c2c3 100644
--- a/app/src/main/java/asgardius/page/s3manager/WebBrowser.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/WebBrowser.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/main/java/asgardius/page/s3manager/list_item.java b/app/src/main/java/asgardius/page/s3managermk2/list_item.java
similarity index 88%
rename from app/src/main/java/asgardius/page/s3manager/list_item.java
rename to app/src/main/java/asgardius/page/s3managermk2/list_item.java
index 0934a20..e2e90fb 100644
--- a/app/src/main/java/asgardius/page/s3manager/list_item.java
+++ b/app/src/main/java/asgardius/page/s3managermk2/list_item.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import androidx.appcompat.app.AppCompatActivity;
diff --git a/app/src/test/java/asgardius/page/s3manager/ExampleUnitTest.java b/app/src/test/java/asgardius/page/s3managermk2/ExampleUnitTest.java
similarity index 90%
rename from app/src/test/java/asgardius/page/s3manager/ExampleUnitTest.java
rename to app/src/test/java/asgardius/page/s3managermk2/ExampleUnitTest.java
index 043d73b..54ee896 100644
--- a/app/src/test/java/asgardius/page/s3manager/ExampleUnitTest.java
+++ b/app/src/test/java/asgardius/page/s3managermk2/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package asgardius.page.s3manager;
+package asgardius.page.s3managermk2;
import org.junit.Test;
diff --git a/build.gradle b/build.gradle
index 5f4fc7d..033efca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '8.1.4' apply false
- id 'com.android.library' version '8.1.4' apply false
+ id 'com.android.application' version '8.5.1' apply false
+ id 'com.android.library' version '8.5.1' apply false
}
task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a78c6f8..3330a04 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-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME