Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some dead code

Browse Source 
(cherry picked from commit 7318f4f5dd86d23f18b5b137703fd9e6b516d5cb)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/globalsearch/GlobalSearchPresenter.kt
This commit is contained in:
arkon 2022-04-08 16:14:46 -04:00 committed by Jobobby04
parent 8a1d277630
commit 0a110d149a
2 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/sources/MigrationSourcesPresenter.kt
View File

@ -39,6 +39,10 @@ class MigrationSourcesPresenter(
.subscribeLatestCache(MigrationSourcesController::setSources)
}
fun requestSortUpdate() {
sortRelay.call(Unit)
}
private fun findSourcesWithManga(library: List<Manga>): List<SourceItem> {
val header = SelectionHeader()
return library
@ -52,7 +56,7 @@ class MigrationSourcesPresenter(
.toList()
}
fun sortFn(): java.util.Comparator<SourceItem> {
private fun sortFn(): java.util.Comparator<SourceItem> {
val sort by lazy {
preferences.migrationSortingMode().get()
}
@ -76,8 +80,4 @@ class MigrationSourcesPresenter(
MigrationSourcesController.DirectionSetting.DESCENDING -> Collections.reverseOrder(sortFn)
}
}
fun requestSortUpdate() {
sortRelay.call(Unit)
}
}

46
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
View File

@ -1,12 +1,8 @@
package eu.kanade.tachiyomi.ui.manga
import android.content.Context
import android.graphics.Bitmap
import android.graphics.BitmapFactory
import android.net.Uri
import android.os.Bundle
import coil.imageLoader
import coil.memory.MemoryCache
import com.jakewharton.rxrelay.PublishRelay
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.cache.CoverCache
@ -627,48 +623,6 @@ class MangaPresenter(
moveMangaToCategories(manga, listOfNotNull(category))
}
/**
* Get the manga cover as a Bitmap, either from the CoverCache (only works for library manga)
* or from the Coil ImageLoader cache.
*
* @param context the context used to get the Coil ImageLoader
* @param memoryCacheKey Coil MemoryCache.Key that points to the cover Bitmap cache location
* @return manga cover as Bitmap
*/
fun getCoverBitmap(context: Context, memoryCacheKey: MemoryCache.Key?): Bitmap {
var resultBitmap = coverBitmapFromCoverCache()
if (resultBitmap == null && memoryCacheKey != null) {
resultBitmap = coverBitmapFromImageLoader(context, memoryCacheKey)
}
return resultBitmap ?: throw Exception("Cover not in cache")
}
/**
* Attempt manga cover retrieval from the CoverCache.
*
* @return cover as Bitmap or null if CoverCache does not contain cover for manga
*/
private fun coverBitmapFromCoverCache(): Bitmap? {
val cover = coverCache.getCoverFile(manga)
return if (cover != null) {
BitmapFactory.decodeFile(cover.path)
} else {
null
}
}
/**
* Attempt manga cover retrieval from the Coil ImageLoader memoryCache.
*
* @param context the context used to get the Coil ImageLoader
* @param memoryCacheKey Coil MemoryCache.Key that points to the cover Bitmap cache location
* @return cover as Bitmap or null if there is no thumbnail cached with the memoryCacheKey
*/
private fun coverBitmapFromImageLoader(context: Context, memoryCacheKey: MemoryCache.Key): Bitmap? {
return context.imageLoader.memoryCache?.get(memoryCacheKey)?.bitmap
}
/**
* Save manga cover Bitmap to picture or temporary share directory.
*