From 1d13dfbde3027fed6b332be9aceb869d02568d07 Mon Sep 17 00:00:00 2001 From: Hardcore Sushi Date: Sun, 10 Apr 2022 22:08:33 +0200 Subject: [PATCH] Always show total size & Add some explorer info bar translations --- .../hardcore/droidfs/explorers/BaseExplorerActivity.kt | 9 ++++----- app/src/main/native/gocryptfs_jni.c | 4 ++-- app/src/main/res/layout/explorer_info_bar.xml | 1 - app/src/main/res/values-es/strings.xml | 5 ++++- app/src/main/res/values-pt-rBR/strings.xml | 5 ++++- app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values/strings.xml | 1 - 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt index d0be7c7..b20d42a 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/explorers/BaseExplorerActivity.kt @@ -249,8 +249,8 @@ open class BaseExplorerActivity : BaseActivity() { invalidateOptionsMenu() } - private fun displayExplorerElements(totalSizeValue: String) { - totalSizeText.text = getString(R.string.total_size, totalSizeValue) + private fun displayExplorerElements(totalSize: Long) { + totalSizeText.text = getString(R.string.total_size, PathUtils.formatSize(totalSize)) synchronized(this) { ExplorerElement.sortBy(sortOrderValues[currentSortOrderIndex], foldersFirst, explorerElements) } @@ -311,14 +311,13 @@ open class BaseExplorerActivity : BaseActivity() { totalSize += element.size } } - val totalSizeValue = PathUtils.formatSize(totalSize) runOnUiThread { - displayExplorerElements(totalSizeValue) + displayExplorerElements(totalSize) onDisplayed?.invoke() } }.start() } else { - displayExplorerElements(getString(R.string.default_total_size)) + displayExplorerElements(explorerElements.filter { !it.isParentFolder }.sumOf { it.size }) onDisplayed?.invoke() } } diff --git a/app/src/main/native/gocryptfs_jni.c b/app/src/main/native/gocryptfs_jni.c index 6258bfb..686d2d6 100644 --- a/app/src/main/native/gocryptfs_jni.c +++ b/app/src/main/native/gocryptfs_jni.c @@ -251,11 +251,11 @@ Java_sushi_hardcore_droidfs_GocryptfsVolume_native_1list_1dir(JNIEnv *env, jobje struct gcf_list_dir_return elements = gcf_list_dir(sessionID, go_plain_dir); - jclass java_ArrayList = (*env)->NewGlobalRef(env, (*env)->FindClass(env, "java/util/ArrayList")); + jclass java_ArrayList = (*env)->NewLocalRef(env, (*env)->FindClass(env, "java/util/ArrayList")); jmethodID java_ArrayList_init = (*env)->GetMethodID(env, java_ArrayList, "", "(I)V"); jmethodID java_ArrayList_add = (*env)->GetMethodID(env, java_ArrayList, "add", "(Ljava/lang/Object;)Z"); - jclass classExplorerElement = (*env)->NewGlobalRef(env, (*env)->FindClass(env, "sushi/hardcore/droidfs/explorers/ExplorerElement")); + jclass classExplorerElement = (*env)->NewLocalRef(env, (*env)->FindClass(env, "sushi/hardcore/droidfs/explorers/ExplorerElement")); jmethodID explorerElement_new = (*env)->GetStaticMethodID(env, classExplorerElement, "new", "(Ljava/lang/String;SJJLjava/lang/String;)Lsushi/hardcore/droidfs/explorers/ExplorerElement;"); jobject element_list = (*env)->NewObject(env, java_ArrayList, java_ArrayList_init, elements.r2); unsigned int c = 0; diff --git a/app/src/main/res/layout/explorer_info_bar.xml b/app/src/main/res/layout/explorer_info_bar.xml index 606e462..a07d42d 100644 --- a/app/src/main/res/layout/explorer_info_bar.xml +++ b/app/src/main/res/layout/explorer_info_bar.xml @@ -64,7 +64,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" style="@style/infoBarTextView" - android:text="@string/default_total_size" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@id/number_of_folders_text" diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c64223c..cbd987e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -41,7 +41,6 @@ ¿Estás seguro de que quiere borrar %s objetos? Ubicación: /%s Tamaño total: %s - N/D Importar desde otro volumen No se ha podido abrir este archivo. Volumen: %s @@ -233,4 +232,8 @@ Número inválido Nuevo nombre del volumen: Fallo al renombrar el volumen + 1 archivo + %d archivos + 1 carpeta + %d carpetas diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4ac3a57..2eead71 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -41,7 +41,6 @@ Você realmente deseja excluir estos %s itens? Localização: /%s Tamanho total: %s - N/A Importar do outro volume Falha ao abrir este arquivo. Volume: %s @@ -228,4 +227,8 @@ Número inválido Novo nome do volume: Falha ao renomear o volume + 1 arquivo + %d arquivos + 1 pasta + %d pastas diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8ba451f..21326c0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -39,7 +39,6 @@ Удалить %s элементов? Путь: /%s Общий размер: %s - — Импорт из другого тома Невозможно открыть файл. Том: %s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fc939bc..8422c8b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,7 +41,6 @@ Are you sure you want to delete these %s items ? Location: /%s Total size: %s - N/A Import from another volume Failed to open this file. Volume: %s