diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt index 10471853..dd71ef30 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubFileParser.kt @@ -16,7 +16,7 @@ import javax.inject.Inject class EpubFileParser @Inject constructor() : FileParser { override suspend fun parse(file: File): Pair? { - if (!file.name.endsWith(".epub") || !file.exists()) { + if (!file.name.endsWith(".epub", true) || !file.exists()) { return null } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt index cff97c0b..3930ddd4 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/epub/EpubTextParser.kt @@ -21,7 +21,7 @@ import javax.inject.Inject class EpubTextParser @Inject constructor() : TextParser { override suspend fun parse(file: File): Resource> { - if (!file.name.endsWith(".epub") || !file.exists()) { + if (!file.name.endsWith(".epub", true) || !file.exists()) { return Resource.Error(UIText.StringResource(R.string.error_wrong_file_format)) } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt index c7441d46..ee382b80 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2FileParser.kt @@ -17,7 +17,7 @@ import javax.xml.parsers.DocumentBuilderFactory class Fb2FileParser @Inject constructor() : FileParser { override suspend fun parse(file: File): Pair? { - if (!file.name.endsWith(".fb2") || !file.exists()) { + if (!file.name.endsWith(".fb2", true) || !file.exists()) { return null } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2TextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2TextParser.kt index 60694cc8..4ddb1f30 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2TextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/fb2/Fb2TextParser.kt @@ -15,7 +15,7 @@ import javax.xml.parsers.DocumentBuilderFactory class Fb2TextParser @Inject constructor() : TextParser { override suspend fun parse(file: File): Resource> { - if (!file.name.endsWith(".fb2") || !file.exists()) { + if (!file.name.endsWith(".fb2", true) || !file.exists()) { return Resource.Error(UIText.StringResource(R.string.error_wrong_file_format)) } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt index 5901cea4..550190c2 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfFileParser.kt @@ -15,7 +15,7 @@ import javax.inject.Inject class PdfFileParser @Inject constructor(private val application: Application) : FileParser { override suspend fun parse(file: File): Pair? { - if (!file.name.endsWith(".pdf") || !file.exists()) { + if (!file.name.endsWith(".pdf", true) || !file.exists()) { return null } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt index 4bcb33fe..7afbb35d 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/pdf/PdfTextParser.kt @@ -14,7 +14,7 @@ import javax.inject.Inject class PdfTextParser @Inject constructor(private val application: Application) : TextParser { override suspend fun parse(file: File): Resource> { - if (!file.name.endsWith(".pdf") || !file.exists()) { + if (!file.name.endsWith(".pdf", true) || !file.exists()) { return Resource.Error(UIText.StringResource(R.string.error_wrong_file_format)) } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt index c865a466..131369fc 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtFileParser.kt @@ -12,7 +12,7 @@ import javax.inject.Inject class TxtFileParser @Inject constructor() : FileParser { override suspend fun parse(file: File): Pair? { - if (!file.name.endsWith(".txt") || !file.exists()) { + if (!file.name.endsWith(".txt", true) || !file.exists()) { return null } diff --git a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt index 4a42beac..6fb2e617 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/parser/txt/TxtTextParser.kt @@ -14,7 +14,7 @@ import javax.inject.Inject class TxtTextParser @Inject constructor() : TextParser { override suspend fun parse(file: File): Resource> { - if (!file.name.endsWith(".txt") || !file.exists()) { + if (!file.name.endsWith(".txt", true) || !file.exists()) { return Resource.Error(UIText.StringResource(R.string.error_wrong_file_format)) } diff --git a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt index 0d21a0f0..f2b98e6d 100644 --- a/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt +++ b/app/src/main/java/ua/acclorite/book_story/data/repository/BookRepositoryImpl.kt @@ -499,8 +499,8 @@ class BookRepositoryImpl @Inject constructor( } val isFileNotAdded = existingBooks.all { - it.filePath.substringAfterLast("/") != - file.path.substringAfterLast("/") + it.filePath.substringAfterLast("/").lowercase() != + file.path.substringAfterLast("/").lowercase() } if (!isFileNotAdded) { @@ -537,7 +537,7 @@ class BookRepositoryImpl @Inject constructor( val books = mutableListOf() for (file in files) { - val parsedBook = if (Constants.EXTENSIONS.any { file.name.endsWith(it) }) { + val parsedBook = if (Constants.EXTENSIONS.any { file.name.endsWith(it, true) }) { fileParser.parse(file) } else { books.add( @@ -549,7 +549,7 @@ class BookRepositoryImpl @Inject constructor( continue } - val parsedText = if (Constants.EXTENSIONS.any { file.name.endsWith(it) }) { + val parsedText = if (Constants.EXTENSIONS.any { file.name.endsWith(it, true) }) { textParser.parse(file) } else { books.add(