diff --git a/app/build.gradle b/app/build.gradle index ba2d9d769..73effe75c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ afterEvaluate { } dependencies { //noinspection GradleDependency - implementation('com.github.KotatsuApp:kotatsu-parsers:413f4a2f10') { + implementation('com.github.KotatsuApp:kotatsu-parsers:93f5f70d79') { exclude group: 'org.json', module: 'json' } diff --git a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt index 1732a0fb2..7ed9f638f 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt @@ -52,7 +52,6 @@ fun Parcel.readManga() = Manga( fun MangaPage.writeToParcel(out: Parcel) { out.writeLong(id) out.writeString(url) - out.writeString(referer) out.writeString(preview) out.writeSerializable(source) } @@ -60,7 +59,6 @@ fun MangaPage.writeToParcel(out: Parcel) { fun Parcel.readMangaPage() = MangaPage( id = readLong(), url = requireNotNull(readString()), - referer = requireNotNull(readString()), preview = readString(), source = checkNotNull(readSerializableCompat()), ) diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt index 79b98be28..9dc597eb0 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaDirInput.kt @@ -96,7 +96,6 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) { id = pageUri.longHashCode(), url = pageUri, preview = null, - referer = chapter.url, source = MangaSource.LOCAL, ) } @@ -113,7 +112,6 @@ class LocalMangaDirInput(root: File) : LocalMangaInput(root) { id = pageUri.longHashCode(), url = pageUri, preview = null, - referer = chapter.url, source = MangaSource.LOCAL, ) } diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaZipInput.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaZipInput.kt index 9f79bb3ba..7c01e50b8 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaZipInput.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/data/input/LocalMangaZipInput.kt @@ -132,7 +132,6 @@ class LocalMangaZipInput(root: File) : LocalMangaInput(root) { id = entryUri.longHashCode(), url = entryUri, preview = null, - referer = chapter.url, source = MangaSource.LOCAL, ) } diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaDirOutput.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaDirOutput.kt index 04ddd7f10..02ee3f412 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaDirOutput.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaDirOutput.kt @@ -83,10 +83,6 @@ class LocalMangaDirOutput( } } - override fun sortChaptersByName() { - index.sortChaptersByName() - } - suspend fun deleteChapter(chapterId: Long) { val chapter = checkNotNull(index.getMangaInfo()?.chapters) { "No chapters found" diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt index 85c9d5da3..55ceb940a 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaOutput.kt @@ -22,9 +22,6 @@ abstract class LocalMangaOutput( abstract suspend fun cleanup() - // TODO remove - abstract fun sortChaptersByName() - companion object { const val ENTRY_NAME_INDEX = "index.json" diff --git a/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaZipOutput.kt b/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaZipOutput.kt index 3ef46c52a..18bdcc023 100644 --- a/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaZipOutput.kt +++ b/app/src/main/java/org/koitharu/kotatsu/local/data/output/LocalMangaZipOutput.kt @@ -80,10 +80,6 @@ class LocalMangaZipOutput( output.close() } - override fun sortChaptersByName() { - index.sortChaptersByName() - } - @WorkerThread private fun mergeWith(other: File) { var otherIndex: MangaIndex? = null diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt index 30bab72b9..aac110c48 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/domain/PageLoader.kt @@ -191,7 +191,6 @@ class PageLoader @Inject constructor( val request = Request.Builder() .url(pageUrl) .get() - .header(CommonHeaders.REFERER, page.referer) .header(CommonHeaders.ACCEPT, "image/webp,image/png;q=0.9,image/jpeg,*/*;q=0.8") .cacheControl(CommonHeaders.CACHE_CONTROL_NO_STORE) .tag(MangaSource::class.java, page.source) diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt index 401d45b32..3f1a4dde5 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/colorfilter/ColorFilterConfigViewModel.kt @@ -47,7 +47,6 @@ class ColorFilterConfigViewModel @Inject constructor( MangaPage( id = page.id, url = url, - referer = page.referer, preview = page.preview, source = page.source, ), diff --git a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt index 6773f5dc3..a9c97cf96 100644 --- a/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt +++ b/app/src/main/java/org/koitharu/kotatsu/reader/ui/pager/ReaderPage.kt @@ -9,7 +9,6 @@ import org.koitharu.kotatsu.parsers.model.MangaSource data class ReaderPage( val id: Long, val url: String, - val referer: String, val preview: String?, val chapterId: Long, val index: Int, @@ -19,7 +18,6 @@ data class ReaderPage( constructor(page: MangaPage, index: Int, chapterId: Long) : this( id = page.id, url = page.url, - referer = page.referer, preview = page.preview, chapterId = chapterId, index = index, @@ -29,8 +27,7 @@ data class ReaderPage( fun toMangaPage() = MangaPage( id = id, url = url, - referer = referer, preview = preview, source = source, ) -} \ No newline at end of file +} diff --git a/app/src/test/java/org/koitharu/kotatsu/reader/domain/ChapterPagesTest.kt b/app/src/test/java/org/koitharu/kotatsu/reader/domain/ChapterPagesTest.kt index 57572b95f..039115a00 100644 --- a/app/src/test/java/org/koitharu/kotatsu/reader/domain/ChapterPagesTest.kt +++ b/app/src/test/java/org/koitharu/kotatsu/reader/domain/ChapterPagesTest.kt @@ -70,7 +70,6 @@ class ChapterPagesTest { private fun page(chapterId: Long) = ReaderPage( id = Random.nextLong(), url = "http://localhost", - referer = "http://localhost", preview = null, chapterId = chapterId, index = Random.nextInt(),