From d6aebf45b8c1de20e6e3cdd3b002dd7530c49be6 Mon Sep 17 00:00:00 2001
From: Page Asgardius <asgardius@asgardius.company>
Date: Fri, 16 Sep 2022 09:40:15 -0700
Subject: [PATCH] new release

---
 README.md                                     |  5 ++
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              | 13 ++--
 .../asgardius/page/s3manager/AccountAdd.java  |  3 +
 .../page/s3manager/MainActivity.java          |  1 +
 .../page/s3manager/ObjectSelect.java          |  6 +-
 .../asgardius/page/s3manager/WebBrowser.java  |  4 +-
 app/src/main/res/values-es/strings.xml        | 69 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  9 ++-
 9 files changed, 99 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/values-es/strings.xml

diff --git a/README.md b/README.md
index bbe8cdd..8ecca02 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,11 @@ Planned feature list
 
 This app is a work in progress, so it have some bugs that need to be fixed
 
+Supported languages
+
+* English
+* Spanish
+
 Knnown issues
 
 * Object listing can be slow on buckets with a lot of objects (4000+)
diff --git a/app/build.gradle b/app/build.gradle
index 1f753d0..a948c13 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "asgardius.page.s3manager"
         minSdk 24
         targetSdk 33
-        versionCode 9
-        versionName "0.1.7"
+        versionCode 10
+        versionName "0.1.8"
         setProperty("archivesBaseName", "s3-manager-$versionName")
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 52954c7..ea40de2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,14 +21,17 @@
         <activity
             android:name=".Downloader"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/download_file" />
         <activity
             android:name=".CreateBucket"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/create_bucket" />
         <activity
             android:name=".Uploader"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/upload_button" />
         <activity
             android:name=".ImageViewer"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
@@ -54,12 +57,12 @@
         <activity
             android:name=".BucketSelect"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/bucket_list" />
         <activity
             android:name=".VideoPlayer"
             android:configChanges="orientation|keyboardHidden|screenSize|uiMode|keyboardHidden"
             android:exported="false"
-            android:label="@string/title_activity_video_player"
             android:theme="@style/Theme.AsgardiusS3Manager.Fullscreen" />
         <activity
             android:name=".MainActivity"
diff --git a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
index 56997e9..09b2d79 100644
--- a/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
+++ b/app/src/main/java/asgardius/page/s3manager/AccountAdd.java
@@ -44,6 +44,7 @@ public class AccountAdd extends AppCompatActivity {
         Button accounttest = (Button)findViewById(R.id.testaccount);
         edit = getIntent().getBooleanExtra("edit", false);
         if (edit) {
+            getSupportActionBar().setTitle(getResources().getString(R.string.accountedit_button));
             register.setText(getResources().getString(R.string.accountsave_button));
             id = getIntent().getStringExtra("alias");
             endpoint = getIntent().getStringExtra("endpoint");
@@ -56,6 +57,8 @@ public class AccountAdd extends AppCompatActivity {
             aupick.setText(username);
             appick.setText(password);
             arpick.setText(location);
+        } else{
+            getSupportActionBar().setTitle(getResources().getString(R.string.accountadd_button));
         }
 
 
diff --git a/app/src/main/java/asgardius/page/s3manager/MainActivity.java b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
index 0620ffc..c42b942 100644
--- a/app/src/main/java/asgardius/page/s3manager/MainActivity.java
+++ b/app/src/main/java/asgardius/page/s3manager/MainActivity.java
@@ -241,6 +241,7 @@ public class MainActivity extends AppCompatActivity {
 
         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/ObjectSelect.java b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
index f6cd43c..876487a 100644
--- a/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
+++ b/app/src/main/java/asgardius/page/s3manager/ObjectSelect.java
@@ -60,6 +60,7 @@ public class ObjectSelect extends AppCompatActivity {
         prefix = getIntent().getStringExtra("prefix");
         treelevel = getIntent().getIntExtra("treelevel", 0);
         setContentView(R.layout.activity_object_select);
+        getSupportActionBar().setTitle(bucket+"/"+prefix);
         region = Region.getRegion(location);
         s3ClientOptions = S3ClientOptions.builder().build();
         myCredentials = new BasicAWSCredentials(username, password);
@@ -214,7 +215,7 @@ public class ObjectSelect extends AppCompatActivity {
                     try {
                         GeneratePresignedUrlRequest request = new GeneratePresignedUrlRequest(bucket, prefix + Name.get(position).toString());
                         URL objectURL = s3client.generatePresignedUrl(request);
-                        webBrowser(objectURL.toString());
+                        webBrowser(objectURL.toString(), Name.get(position).toString());
                     } catch (Exception e) {
                         Toast.makeText(getApplicationContext(),getResources().getString(R.string.media_list_fail), Toast.LENGTH_SHORT).show();
                     }
@@ -329,10 +330,11 @@ public class ObjectSelect extends AppCompatActivity {
 
     }
 
-    private void webBrowser(String url) {
+    private void webBrowser(String url, String pagetitle) {
 
         Intent intent = new Intent(this, WebBrowser.class);
         intent.putExtra("web_url", url);
+        intent.putExtra("title", pagetitle);
         startActivity(intent);
 
     }
diff --git a/app/src/main/java/asgardius/page/s3manager/WebBrowser.java b/app/src/main/java/asgardius/page/s3manager/WebBrowser.java
index 59b5341..773b341 100644
--- a/app/src/main/java/asgardius/page/s3manager/WebBrowser.java
+++ b/app/src/main/java/asgardius/page/s3manager/WebBrowser.java
@@ -9,7 +9,7 @@ import android.webkit.WebViewClient;
 public class WebBrowser extends AppCompatActivity {
 
     private WebView npw;
-    String webURL;
+    String webURL, pagetitle;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -17,6 +17,8 @@ public class WebBrowser extends AppCompatActivity {
         //This initializes webview object
         try {
             webURL = getIntent().getStringExtra("web_url");
+            pagetitle = getIntent().getStringExtra("title");
+            getSupportActionBar().setTitle(pagetitle);
             npw =(WebView)findViewById(R.id.webview);
             npw.setWebViewClient(new MyBrowser());
             npw.loadUrl(webURL);
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 0000000..b7b0765
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="bucket_list">Lista de buckets</string>
+    <string name="account_list">Lista de cuentas</string>
+    <string name="object_list">Lista de objetos</string>
+    <string name="Image">Imagen</string>
+    <string name="broken_database">La base de datos está corrupta, favor de reinstalar la app</string>
+    <string name="pending_feature">Esta característica aún no es implementada</string>
+    <string name="set_bucket_name">Establezca el nombre del nuevo bucket</string>
+    <string name="bucket_name">Nombre del bucket</string>
+    <string name="bucket_name_empty">Se requiere un nombre para el bucket</string>
+    <string name="file_external">Abrir en</string>
+    <string name="download_file">Descargar archivo</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="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="upload_in_progress">Subida en proceso</string>
+    <string name="retry">Reintentar</string>
+    <string name="download_failed">Descarga fallida</string>
+    <string name="success">Éxito</string>
+    <string name="create_bucket">Crear nuevo bucket</string>
+    <string name="create_bucket_success">Bucket creado exitosamente</string>
+    <string name="upload_file_here">Subir archivo en el directorio actual</string>
+    <string name="upload_folder_here">Subir carpeta en el directorio actual</string>
+    <string name="file_del">Eliminar</string>
+    <string name="file_del_confirm">¿Desea eliminar este archivo?</string>
+    <string name="folder_del_confirm">¿Desea eliminar esta carpeta?</string>
+    <string name="bucket_del_confirm">¿Desea eliminar este bucket?</string>
+    <string name="bucket_del_success">Bucket eliminado exitosamente</string>
+    <string name="folder_del_success">Carpeta eliminada exitosamente</string>
+    <string name="file_del_success">Archivo eliminado exitosamente</string>
+    <string name="only_item_onlist">Este es el único elemento en esta carpeta, elimine la carpeta padre en su lugar</string>
+    <string name="accountselect">Seleccione una cuenta</string>
+    <string name="accountadd_button">Agregar cuenta</string>
+    <string name="accounttest_button">Probar credenciales</string>
+    <string name="accounttest_success">Las credenciales son correctas</string>
+    <string name="accountadd_alias">Alias de la cuenta</string>
+    <string name="accountadd_endpoint">URL del endpoint</string>
+    <string name="accountadd_region">Región S3</string>
+    <string name="accountadd_username">Clave de acceso S3</string>
+    <string name="accountadd_password">Clave secreta S3</string>
+    <string name="accountadd_success">Cuenta agregada exitosamente</string>
+    <string name="accountadd_fail">Este alias ya está en uso</string>
+    <string name="accountadd_null">Todos los campos son obligatorios</string>
+    <string name="accountdel_button">Quitar cuenta</string>
+    <string name="accountdel_success">Se quitó la cuenta</string>
+    <string name="accountdel_confirm">¿Desea quitar esta cuenta?</string>
+    <string name="accountedit_button">Editar cuenta</string>
+    <string name="accountsave_button">Guardar cambios</string>
+    <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>
+</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 c5a180b..d2a4560 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,8 @@
 <resources>
-    <string name="app_name">S3 Manager</string>
-    <string name="aws_endpoint">.amazonaws.com</string>
-    <string name="endpoint_url">https://object.asgardius.company</string>
-    <string name="access_key">google</string>
-    <string name="title_activity_video_player">VideoPlayer</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://object.asgardius.company</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>