From 19cc86b45ee0550caadec3c993788e69e5099a72 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Sat, 7 Jan 2023 09:47:35 -0700
Subject: [PATCH] region fix

---
 app/src/main/java/asgardius/page/s3manager/AccountAdd.java | 7 ++++---
 .../main/java/asgardius/page/s3manager/BucketSelect.java   | 6 +++++-
 app/src/main/res/values/strings.xml                        | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
index ca01106..09de252 100644
--- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
+++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
@@ -150,10 +150,11 @@ public class AccountAdd extends AppCompatActivity {
                         public void run() {
                             try  {
                                 //Your code goes here
-                                if (location.equals("")) {
-                                    location = "us-east-1";
+                                if (endpoint.contains(getResources().getString(R.string.aws_endpoint)) || location.equals("")) {
+                                    region = Region.getRegion("us-east-1");
+                                } else {
+                                    region = Region.getRegion(location);
                                 }
-                                region = Region.getRegion("us-east-1");
                                 S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
                                 s3ClientOptions.setPathStyleAccess(pathstyle.isChecked());
                                 myCredentials = new BasicAWSCredentials(username, password);
diff --git a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
index 39a7163..c66640a 100644
--- a/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/BucketSelect.java
@@ -63,7 +63,11 @@ public class BucketSelect extends AppCompatActivity {
         isplaylist = getIntent().getBooleanExtra("isplaylist", false);
         prefix = "";
         setContentView(R.layout.activity_bucket_select);
-        region = Region.getRegion("us-east-1");
+        if (endpoint.contains(getResources().getString(R.string.aws_endpoint))) {
+            region = Region.getRegion("us-east-1");
+        } else {
+            region = Region.getRegion(location);
+        }
         s3ClientOptions = S3ClientOptions.builder().build();
         s3ClientOptions.setPathStyleAccess(style);
         myCredentials = new BasicAWSCredentials(username, password);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 575297e..7a209f2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
 <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://s3.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>