From 9bdc3034b149685dd0cd2f702b038cd61d7bead5 Mon Sep 17 00:00:00 2001 From: chaneylc Date: Mon, 22 Jul 2024 10:38:28 -0500 Subject: [PATCH] fix #908 added .nomedia file to trait and field data dirs --- .../tracker/utilities/DocumentTreeUtil.kt | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/fieldbook/tracker/utilities/DocumentTreeUtil.kt b/app/src/main/java/com/fieldbook/tracker/utilities/DocumentTreeUtil.kt index b34239040..a45c4ac7b 100644 --- a/app/src/main/java/com/fieldbook/tracker/utilities/DocumentTreeUtil.kt +++ b/app/src/main/java/com/fieldbook/tracker/utilities/DocumentTreeUtil.kt @@ -39,11 +39,15 @@ class DocumentTreeUtil: BaseDocumentTreeUtil() { val plotDataDirName = context.getString(R.string.dir_plot_data) val fieldDir = createDir(context, plotDataDirName, field) if (fieldDir != null) { - val traitDir = fieldDir.findFile(traitName) + var traitDir = fieldDir.findFile(traitName) if (traitDir == null || !traitDir.exists()) { fieldDir.createDirectory(traitName) } - return fieldDir.findFile(traitName) + traitDir = fieldDir.findFile(traitName) + if (traitDir != null && traitDir.findFile(".nomedia")?.exists() != true) { + traitDir.createFile("*/*", ".nomedia") + } + return traitDir } } else return null } @@ -67,11 +71,15 @@ class DocumentTreeUtil: BaseDocumentTreeUtil() { val fieldDataDirName = context.getString(R.string.dir_field_data) val fieldDir = createDir(context, fieldDataDirName, field) if (fieldDir != null) { - val attributeDir = fieldDir.findFile(attributeName) + var attributeDir = fieldDir.findFile(attributeName) if (attributeDir == null || !attributeDir.exists()) { fieldDir.createDirectory(attributeName) } - return fieldDir.findFile(attributeName) + attributeDir = fieldDir.findFile(attributeName) + if (attributeDir != null && attributeDir.findFile(".nomedia")?.exists() != true) { + attributeDir.createFile("*/*", ".nomedia") + } + return attributeDir } } else return null }