mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-11-12 12:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded class

Browse Source
This commit is contained in:
len
2016-03-30 17:19:02 +02:00
parent e04596c668
commit 723c0e99a5
5 changed files with 32 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryFragment.kt
View File

@@ -13,7 +13,6 @@ import eu.davidea.flexibleadapter.FlexibleAdapter
import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.Category
import eu.kanade.tachiyomi.data.database.models.Manga
import eu.kanade.tachiyomi.data.io.downloadMediaAndReturnPath
import eu.kanade.tachiyomi.data.library.LibraryUpdateService
import eu.kanade.tachiyomi.event.LibraryMangasEvent
import eu.kanade.tachiyomi.ui.base.fragment.BaseRxFragment
@@ -25,8 +24,6 @@ import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.fragment_library.*
import nucleus.factory.RequiresPresenter
import org.greenrobot.eventbus.EventBus
import java.io.File
import java.io.FileInputStream
import java.io.IOException
/**
@@ -376,21 +373,14 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
try {
// Get the file's input stream from the incoming Intent
val inputStream = context.contentResolver.openInputStream(data.data)
// Convert to absolute path to prevent FileNotFoundException
val result = downloadMediaAndReturnPath(inputStream as FileInputStream, context)
// Get file from filepath
val picture = File(result)
// Update cover to selected file, show error if something went wrong
if (presenter.editCoverWithLocalFile(picture, manga)) {
adapter.refreshRegisteredAdapters()
} else {
context.toast(R.string.notification_manga_update_failed)
context.contentResolver.openInputStream(data.data).use {
// Update cover to selected file, show error if something went wrong
if (presenter.editCoverWithStream(it, manga)) {
adapter.refreshRegisteredAdapters()
} else {
context.toast(R.string.notification_manga_update_failed)
}
}
} catch (e: IOException) {
context.toast(R.string.notification_manga_update_failed)
e.printStackTrace()

13
app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryPresenter.kt
View File

@@ -17,8 +17,8 @@ import org.greenrobot.eventbus.EventBus
import rx.Observable
import rx.android.schedulers.AndroidSchedulers
import rx.subjects.BehaviorSubject
import java.io.File
import java.io.IOException
import java.io.InputStream
import java.util.*
import javax.inject.Inject
@@ -273,17 +273,14 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
/**
* Update cover with local file.
*
* @param file the new cover.
* @param inputStream the new cover.
* @param manga the manga edited.
* @return true if the cover is updated, false otherwise
*/
@Throws(IOException::class)
fun editCoverWithLocalFile(file: File, manga: Manga): Boolean {
if (!manga.initialized)
return false
if (manga.favorite) {
coverCache.copyToLocalCache(manga.thumbnail_url, file)
fun editCoverWithStream(inputStream: InputStream, manga: Manga): Boolean {
if (manga.thumbnail_url != null && manga.favorite) {
coverCache.copyToLocalCache(manga.thumbnail_url, inputStream)
return true
}
return false