diff --git a/app/build.gradle b/app/build.gradle index 149ec9e7..6c6a8b58 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { release { manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher", icon_placeholder_round: "@mipmap/ic_launcher_round"] debuggable false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-gson.pro', 'proguard-rules.pro' } } buildFeatures { diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt index 8fd0b97b..1e4d305d 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeNameAdapter.kt @@ -50,17 +50,15 @@ class AnimeNameAdapter { val removedNumber = text.replace(regexPattern, "").ifEmpty { text } - return if (removedNumber.equals(text, true)) { // if nothing was removed - val failedEpisodeNumberPattern: Regex = - Regex(failedEpisodeNumberRegex, RegexOption.IGNORE_CASE) - failedEpisodeNumberPattern.replace(removedNumber) { mr -> - mr.value.replaceFirst(mr.groupValues[1], "") - }.ifEmpty { removedNumber } - } else { + val letterPattern = Regex("[a-zA-Z]") + return if (letterPattern.containsMatchIn(removedNumber)) { removedNumber + } else { + text } } + fun removeEpisodeNumberCompletely(text: String): String { val regexPattern = Regex(episodeRegex, RegexOption.IGNORE_CASE) val removedNumber = text.replace(regexPattern, "") diff --git a/app/src/main/java/ani/dantotsu/others/Kitsu.kt b/app/src/main/java/ani/dantotsu/others/Kitsu.kt index 6f07b75d..bee4beee 100644 --- a/app/src/main/java/ani/dantotsu/others/Kitsu.kt +++ b/app/src/main/java/ani/dantotsu/others/Kitsu.kt @@ -85,10 +85,10 @@ query { return a } - fun decodeToString(res: NiceResponse?): String? { + private fun decodeToString(res: NiceResponse?): String? { return when (res?.headers?.get("Content-Encoding")) { "gzip" -> { - res.body.byteStream()?.use { inputStream -> + res.body.byteStream().use { inputStream -> GZIPInputStream(inputStream).use { gzipInputStream -> InputStreamReader(gzipInputStream).use { reader -> reader.readText()