diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
index 575fd53..7e31c22 100644
--- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
+++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
@@ -19,13 +19,15 @@ 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;
- String alias, username, password, endpoint, id, location, pdfendpoint;
+ SwitchMaterial pathstyle;
+ String alias, username, password, endpoint, id, location, pdfendpoint, style;
AWSCredentials myCredentials;
AmazonS3 s3client;
Region region;
@@ -41,6 +43,7 @@ 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,6 +56,11 @@ 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);
@@ -76,6 +84,11 @@ 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);
@@ -96,10 +109,10 @@ public class AccountAdd extends AppCompatActivity {
location = "us-east-1";
}
if (edit) {
- db.execSQL("UPDATE account SET id=\""+alias+"\", endpoint=\""+endpoint+"\", username=\""+username+"\", password=\""+password+"\", region=\""+location+"\", pdfendpoint=\""+pdfendpoint+"\" WHERE id=\""+id+"\"");
+ db.execSQL("UPDATE account SET id=\""+alias+"\", endpoint=\""+endpoint+"\", username=\""+username+"\", password=\""+password+"\", region=\""+location+"\", pdfendpoint=\""+pdfendpoint+"\", style=\""+style+"\" WHERE id=\""+id+"\"");
Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountsave_success), Toast.LENGTH_SHORT).show();
} else {
- db.execSQL("INSERT INTO account VALUES (\""+alias+"\", \""+endpoint+"\", \""+username+"\", \""+password+"\", \""+location+"\", \""+pdfendpoint+"\")");
+ db.execSQL("INSERT INTO account VALUES (\""+alias+"\", \""+endpoint+"\", \""+username+"\", \""+password+"\", \""+location+"\", \""+pdfendpoint+"\", \""+style+"\")");
Toast.makeText(getApplicationContext(),getResources().getString(R.string.accountadd_success), Toast.LENGTH_SHORT).show();
}
mainmenu();
diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
index 86e0b29..2b1622a 100644
--- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java
+++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
@@ -20,7 +20,7 @@ import java.util.ArrayList;
public class MainActivity extends AppCompatActivity {
- static boolean DEFAULT_PATH_STYLE_ACCESS = true;
+ boolean style;
String alias, username, password, endpoint, location, pdfendpoint;
RecyclerView recyclerView;
SQLiteDatabase db;
@@ -219,7 +219,7 @@ public class MainActivity extends AppCompatActivity {
// Database Queries
try {
//This retrieves credentials from selected account
- String query = "SELECT endpoint, username, password, region, pdfendpoint FROM account where id=\""+ Name.get(position).toString()+ "\"";
+ String query = "SELECT endpoint, username, password, region, pdfendpoint, style FROM account where id=\""+ Name.get(position).toString()+ "\"";
Cursor cursor = db.rawQuery(query,null);
if (cursor.moveToNext()){
endpoint = cursor.getString(0);
@@ -227,6 +227,11 @@ public class MainActivity extends AppCompatActivity {
password = cursor.getString(2);
location = cursor.getString(3);
pdfendpoint = cursor.getString(4);
+ if (cursor.getString(5).equals("1")) {
+ style = true;
+ } else {
+ style = false;
+ }
db.close();
//This launch file explorer using selected account
explorer();
@@ -255,7 +260,7 @@ public class MainActivity extends AppCompatActivity {
try {
db = dbHelper.getWritableDatabase();
//This retrieves credentials from selected account
- String query = "SELECT id, endpoint, username, password, region, pdfendpoint FROM account where id=\""+ Name.get(position).toString()+ "\"";
+ String query = "SELECT id, endpoint, username, password, region, pdfendpoint, style FROM account where id=\""+ Name.get(position).toString()+ "\"";
System.out.println(query);
Cursor cursor = db.rawQuery(query,null);
if (cursor.moveToNext()){
@@ -265,6 +270,11 @@ public class MainActivity extends AppCompatActivity {
password = cursor.getString(3);
location = cursor.getString(4);
pdfendpoint = cursor.getString(5);
+ if (cursor.getString(6).equals("1")) {
+ style = true;
+ } else {
+ style = false;
+ }
}
db.close();
//This launch account editor
@@ -363,6 +373,7 @@ 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);
diff --git a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java b/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
index da8a72c..4bb8c95 100644
--- a/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
+++ b/app/src/main/java/asgardius/page/s3manager/MyDbHelper.java
@@ -5,7 +5,7 @@ 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)";
+ 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')";
diff --git a/app/src/main/res/layout/activity_account_add.xml b/app/src/main/res/layout/activity_account_add.xml
index a25b90f..2ea215b 100644
--- a/app/src/main/res/layout/activity_account_add.xml
+++ b/app/src/main/res/layout/activity_account_add.xml
@@ -7,123 +7,141 @@
android:orientation="vertical"
tools:context=".AccountAdd">
-
+ android:layout_height="wrap_content">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e980244..e53eeb1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -94,4 +94,5 @@
Solo se puede reproducir un archivo multimedia a la vez
Reproduccion de video
este valor no puede ser cero
+ Acceso de estilo de ruta
\ 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 30b8cd5..63844fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -98,4 +98,5 @@
Only one media file can be played at once
Video Playback
This value cannot be zero
+ Path style access
\ No newline at end of file