asgardius/s3manager
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 64 Packages Wiki Activity

region fix

Browse source
This commit is contained in:
Page Asgardius 2023-01-07 09:47:35 -07:00
parent c30eb36854
commit 19cc86b45e
3 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/asgardius/page/s3manager/AccountAdd.java
View file

@ -150,10 +150,11 @@ public class AccountAdd extends AppCompatActivity {
public void run() { public void run() {
try { try {
//Your code goes here //Your code goes here
if (location.equals("")) { if (endpoint.contains(getResources().getString(R.string.aws_endpoint)) || location.equals("")) {
location = "us-east-1"; region = Region.getRegion("us-east-1");
} else {
region = Region.getRegion(location);
} }
region = Region.getRegion("us-east-1");
S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build(); S3ClientOptions s3ClientOptions = S3ClientOptions.builder().build();
s3ClientOptions.setPathStyleAccess(pathstyle.isChecked()); s3ClientOptions.setPathStyleAccess(pathstyle.isChecked());
myCredentials = new BasicAWSCredentials(username, password); myCredentials = new BasicAWSCredentials(username, password);

6
app/src/main/java/asgardius/page/s3manager/BucketSelect.java
View file

@ -63,7 +63,11 @@ public class BucketSelect extends AppCompatActivity {
isplaylist = getIntent().getBooleanExtra("isplaylist", false); isplaylist = getIntent().getBooleanExtra("isplaylist", false);
prefix = ""; prefix = "";
setContentView(R.layout.activity_bucket_select); 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 = S3ClientOptions.builder().build();
s3ClientOptions.setPathStyleAccess(style); s3ClientOptions.setPathStyleAccess(style);
myCredentials = new BasicAWSCredentials(username, password); myCredentials = new BasicAWSCredentials(username, password);

1
app/src/main/res/values/strings.xml
View file

@ -1,5 +1,6 @@
<resources> <resources>
<string name="app_name" translatable="false">S3 Manager</string> <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="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" translatable="false">https://office.asgardius.company/pdfjs</string>
<string name="pdf_reader_notready">You need to setup a pdf.js server</string> <string name="pdf_reader_notready">You need to setup a pdf.js server</string>