prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add check to avoid TransactionTooLargeException

Browse Source
This commit is contained in:
Koitharu
2022-04-08 18:15:04 +03:00
parent c92bdae842
commit 6c87d5b0bc
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/Parcelable.kt
View File

@@ -4,7 +4,7 @@ import android.os.Parcel
import androidx.core.os.ParcelCompat import androidx.core.os.ParcelCompat
import org.koitharu.kotatsu.parsers.model.* import org.koitharu.kotatsu.parsers.model.*
fun Manga.writeToParcel(out: Parcel, flags: Int) { fun Manga.writeToParcel(out: Parcel, flags: Int, withChapters: Boolean) {
out.writeLong(id) out.writeLong(id)
out.writeString(title) out.writeString(title)
out.writeString(altTitle) out.writeString(altTitle)
@@ -18,7 +18,11 @@ fun Manga.writeToParcel(out: Parcel, flags: Int) {
out.writeParcelable(ParcelableMangaTags(tags), flags) out.writeParcelable(ParcelableMangaTags(tags), flags)
out.writeSerializable(state) out.writeSerializable(state)
out.writeString(author) out.writeString(author)
out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags) if (withChapters) {
out.writeParcelable(chapters?.let(::ParcelableMangaChapters), flags)
} else {
out.writeString(null)
}
out.writeSerializable(source) out.writeSerializable(source)
} }

28
app/src/main/java/org/koitharu/kotatsu/core/model/parcelable/ParcelableManga.kt
View File

@@ -2,24 +2,34 @@ package org.koitharu.kotatsu.core.model.parcelable
import android.os.Parcel import android.os.Parcel
import android.os.Parcelable import android.os.Parcelable
import android.util.Log
import org.koitharu.kotatsu.BuildConfig
import org.koitharu.kotatsu.parsers.model.Manga import org.koitharu.kotatsu.parsers.model.Manga
// Limits to avoid TransactionTooLargeException
private const val MAX_SAFE_SIZE = 1024 * 512 // Assume that 512 kb is safe parcel size
private const val MAX_SAFE_CHAPTERS_COUNT = 40 // this is 100% safe
class ParcelableManga( class ParcelableManga(
val manga: Manga, val manga: Manga,
) : Parcelable { ) : Parcelable {
constructor(parcel: Parcel) : this(parcel.readManga()) constructor(parcel: Parcel) : this(parcel.readManga())
init {
if (BuildConfig.DEBUG && manga.chapters != null) {
Log.w("ParcelableManga", "Passing manga with chapters as Parcelable is dangerous!")
}
}
override fun writeToParcel(parcel: Parcel, flags: Int) { override fun writeToParcel(parcel: Parcel, flags: Int) {
manga.writeToParcel(parcel, flags) val chapters = manga.chapters
if (chapters == null || chapters.size <= MAX_SAFE_CHAPTERS_COUNT) {
// fast path
manga.writeToParcel(parcel, flags, withChapters = true)
return
}
val tempParcel = Parcel.obtain()
manga.writeToParcel(tempParcel, flags, withChapters = true)
val size = tempParcel.dataSize()
if (size < MAX_SAFE_SIZE) {
parcel.appendFrom(tempParcel, 0, size)
} else {
manga.writeToParcel(parcel, flags, withChapters = false)
}
tempParcel.recycle()
} }
override fun describeContents(): Int { override fun describeContents(): Int {