From 17c32f2144b8176d3fd030b75a00f224ca0d43e2 Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Sun, 3 Jul 2022 13:38:32 +0200
Subject: [PATCH] Show volume type in MainActivity

---
 .../droidfs/adapters/VolumeAdapter.kt         | 20 ++++++++++++-------
 app/src/main/res/layout/adapter_volume.xml    |  6 ++----
 app/src/main/res/values-ar/strings.xml        |  1 -
 app/src/main/res/values-es/strings.xml        |  3 ++-
 app/src/main/res/values-pt-rBR/strings.xml    |  3 ++-
 app/src/main/res/values-ru/strings.xml        |  3 ++-
 app/src/main/res/values/strings.xml           |  3 ++-
 7 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/sushi/hardcore/droidfs/adapters/VolumeAdapter.kt b/app/src/main/java/sushi/hardcore/droidfs/adapters/VolumeAdapter.kt
index 1d4ba41..953be7b 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/adapters/VolumeAdapter.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/adapters/VolumeAdapter.kt
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 import sushi.hardcore.droidfs.R
 import sushi.hardcore.droidfs.SavedVolume
 import sushi.hardcore.droidfs.VolumeDatabase
+import sushi.hardcore.droidfs.filesystems.EncryptedVolume
 
 class VolumeAdapter(
     private val context: Context,
@@ -89,13 +90,18 @@ class VolumeAdapter(
             } else {
                 View.VISIBLE
             }
-            itemView.findViewById<TextView>(R.id.text_read_only).apply {
-                visibility = if (volume.canWrite(context.filesDir.path))
-                    View.GONE
-                else {
-                    View.VISIBLE
-                }
-            }
+            itemView.findViewById<TextView>(R.id.text_info).text = context.getString(
+                if (volume.canWrite(context.filesDir.path)) {
+                    R.string.volume_type
+                } else {
+                    R.string.volume_type_read_only
+                },
+                context.getString(if (volume.type == EncryptedVolume.GOCRYPTFS_VOLUME_TYPE) {
+                    R.string.gocryptfs
+                } else {
+                    R.string.cryfs
+                })
+            )
             setSelectable(itemView.findViewById<LinearLayout>(R.id.selectable_container), itemView, layoutPosition)
         }
     }
diff --git a/app/src/main/res/layout/adapter_volume.xml b/app/src/main/res/layout/adapter_volume.xml
index bbbfdfe..f2b182d 100644
--- a/app/src/main/res/layout/adapter_volume.xml
+++ b/app/src/main/res/layout/adapter_volume.xml
@@ -47,18 +47,16 @@
                     app:layout_constrainedWidth="true"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/text_read_only"
+                    app:layout_constraintEnd_toStartOf="@id/text_info"
                     android:textSize="12sp"/>
 
                 <TextView
-                    android:id="@+id/text_read_only"
+                    android:id="@+id/text_info"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@string/read_only"
                     app:layout_constraintTop_toTopOf="parent"
                     app:layout_constraintStart_toEndOf="@id/text_path"
                     app:layout_constraintEnd_toEndOf="parent"
-                    android:visibility="gone"
                     android:textSize="12sp"/>
 
             </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index dd385af..7aef628 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -202,7 +202,6 @@
     <string name="password_confirmation_label">أعد كتابة كلمة المرور:</string>
     <string name="password_confirmation_hint">كلمة المرور (تأكيد)</string>
     <string name="password_hash_saved">تم حفظ تجزئة كلمة المرور</string>
-    <string name="read_only">(قراءة فقط)</string>
     <string name="no_volumes_text">ليس هنالك مجلد مشفر ، أضف واحد بالضغط على زر +</string>
     <string name="fingerprint_error_msg">لم يتم التعرف على بصمة الأصبع: %s.</string>
     <string name="keyguard_not_secure">حارس المفاتيح ليس آمنا</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a312805..f04a6da 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -202,7 +202,6 @@
     <string name="password_confirmation_label">Repite la contraseña:</string>
     <string name="password_confirmation_hint">Contraseña (confirmación)</string>
     <string name="password_hash_saved">hash de la contraseña guardada</string>
-    <string name="read_only">(Sólo lectura)</string>
     <string name="no_volumes_text">No se ha guardado ningún volumen, añada uno haciendo clic en el botón +</string>
     <string name="fingerprint_error_msg">La autenticación por huella dactilar no puede ser utilizada: %s.</string>
     <string name="keyguard_not_secure">keyguard no seguro</string>
@@ -240,4 +239,6 @@
     <string name="elements_selected">%d/%d Seleccionados</string>
     <string name="pin_passwords_title">Diseño de teclado numérico</string>
     <string name="pin_passwords_summary">Usar el diseño de teclado numérico para ingresar las contraseñas de los volumenes</string>
+    <string name="volume_type">(%s)</string>
+    <string name="volume_type_read_only">(%s, Sólo lectura)</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index faf99cf..829af57 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -196,7 +196,6 @@
     <string name="password_confirmation_label">Repita a senha:</string>
     <string name="password_confirmation_hint">Senha (confirmação)</string>
     <string name="password_hash_saved">O hash da senha foi salvo</string>
-    <string name="read_only">(somente leitura)</string>
     <string name="no_volumes_text">Nenhum volume salvo, adicione algum clicando no botão +</string>
     <string name="fingerprint_error_msg">A autenticação por impressão digital não pode ser usada: %s.</string>
     <string name="keyguard_not_secure">chave de segurança não é segura</string>
@@ -228,4 +227,6 @@
     <string name="multiple_files">%d arquivos</string>
     <string name="one_folder">1 pasta</string>
     <string name="multiple_folders">%d pastas</string>
+    <string name="volume_type">(%s)</string>
+    <string name="volume_type_read_only">(%s, somente leitura)</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4849d0b..685ecdd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -195,7 +195,6 @@
     <string name="password_confirmation_label">Повтор пароля:</string>
     <string name="password_confirmation_hint">Подтверждение пароля</string>
     <string name="password_hash_saved">хеш пароля сохранён</string>
-    <string name="read_only">(только для чтения)</string>
     <string name="no_volumes_text">Том не создан, добавьте его, нажав кнопку \"+\"</string>
     <string name="fingerprint_error_msg">Невозможно использовать аутентификацию по отпечатку пальца: %s.</string>
     <string name="keyguard_not_secure">хранилище ключей не защищено</string>
@@ -233,4 +232,6 @@
     <string name="elements_selected">Выбрано: %d/%d</string>
     <string name="pin_passwords_title">Цифровая клавиатура</string>
     <string name="pin_passwords_summary">Использовать цифровую раскладку клавиатуры при вводе паролей томов</string>
+    <string name="volume_type">(%s)</string>
+    <string name="volume_type_read_only">(%s, только для чтения)</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d3fa7bf..0b01dc1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -203,7 +203,6 @@
     <string name="password_confirmation_label">Repeat the password:</string>
     <string name="password_confirmation_hint">Password (confirmation)</string>
     <string name="password_hash_saved">password hash saved</string>
-    <string name="read_only">(read-only)</string>
     <string name="no_volumes_text">No volume saved, add some by clicking on the + button</string>
     <string name="fingerprint_error_msg">Fingerprint authentication can\'t be used: %s.</string>
     <string name="keyguard_not_secure">keyguard not secure</string>
@@ -247,4 +246,6 @@
     <string name="gocryptfs_disabled">Gocryptfs support has been disabled</string>
     <string name="cryfs_disabled">CryFS support has been disabled</string>
     <string name="file_op_delete_msg">Deleting files…</string>
+    <string name="volume_type">(%s)</string>
+    <string name="volume_type_read_only">(%s, read-only)</string>
 </resources>