From 5d6529a4d8dc6dc938cd05903bfde76412ce17cd Mon Sep 17 00:00:00 2001 From: Fabian Henneke Date: Wed, 10 Jun 2020 11:19:49 +0200 Subject: Replace FileUtils with Kotlin stdlib calls (#843) --- .../java/com/zeapo/pwdstore/utils/FileUtils.kt | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 app/src/main/java/com/zeapo/pwdstore/utils/FileUtils.kt (limited to 'app/src/main/java/com/zeapo/pwdstore/utils/FileUtils.kt') diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/FileUtils.kt b/app/src/main/java/com/zeapo/pwdstore/utils/FileUtils.kt deleted file mode 100644 index 867ec0aa..00000000 --- a/app/src/main/java/com/zeapo/pwdstore/utils/FileUtils.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -package com.zeapo.pwdstore.utils - -import java.io.File - -object FileUtils { - @JvmStatic - fun listFiles(dir: File, recursive: Boolean): Collection { - val res = ArrayList() - val files = dir.listFiles() - - if (files != null && files.isNotEmpty()) { - - files.forEach { file -> - // Check if the file is a directory and recursive add - if (file.isDirectory && recursive) { - res.addAll(listFiles(file, recursive)) - } else if (!file.isDirectory) { - res.add(file) - } - } - } - return res - } - - @JvmStatic - fun getBaseName(filename: String): String { - // Take the file name along with its extension - val indexName = filename.lastIndexOf('/') - val nameWithExtension = filename.substring(indexName + 1) - - // Find the final '.' character in the previously calculated nameWithExtension - val indexExt = nameWithExtension.lastIndexOf('.') - - // If no '.' is found in the name, we assume this is a directory and return the previously - // derived nameWithExtensions as-is, otherwise we slice out a substring from the first character - // to the last occurrence of '.' which we found earlier. - return if (indexExt == -1) - nameWithExtension - else - nameWithExtension.substring(0, indexExt) - } -} -- cgit v1.2.3