rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

universal storage name

Browse source
This commit is contained in:
rebelonion 2024-01-16 15:00:21 -06:00
parent 0cfcfcb9ac
commit f861b3621f
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt
View file

@ -279,7 +279,7 @@ class SelectorDialogFragment : BottomSheetDialogFragment() {
if (video != null) { if (video != null) {
Helper.startAnimeDownloadService( Helper.startAnimeDownloadService(
requireActivity(), requireActivity(),
media!!.nameMAL ?: media!!.nameRomaji, media!!.mainName(),
episode.number, episode.number,
video, video,
null, null,

6
app/src/main/java/ani/dantotsu/media/manga/MangaReadFragment.kt
View file

@ -447,7 +447,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
// Create a download task // Create a download task
val downloadTask = MangaDownloaderService.DownloadTask( val downloadTask = MangaDownloaderService.DownloadTask(
title = media.nameMAL ?: media.nameRomaji, title = media.mainName(),
chapter = chapter.title!!, chapter = chapter.title!!,
imageData = images, imageData = images,
sourceMedia = media, sourceMedia = media,
@ -489,7 +489,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
fun onMangaChapterRemoveDownloadClick(i: String) { fun onMangaChapterRemoveDownloadClick(i: String) {
downloadManager.removeDownload( downloadManager.removeDownload(
DownloadedType( DownloadedType(
media.nameMAL ?: media.nameRomaji, media.mainName(),
i, i,
DownloadedType.Type.MANGA DownloadedType.Type.MANGA
) )
@ -507,7 +507,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
// Remove the download from the manager and update the UI // Remove the download from the manager and update the UI
downloadManager.removeDownload( downloadManager.removeDownload(
DownloadedType( DownloadedType(
media.nameMAL ?: media.nameRomaji, media.mainName(),
i, i,
DownloadedType.Type.MANGA DownloadedType.Type.MANGA
) )

4
app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
View file

@ -361,7 +361,7 @@ class MangaReaderActivity : AppCompatActivity() {
model.loadMangaChapterImages( model.loadMangaChapterImages(
chapter, chapter,
media.selected!!, media.selected!!,
media.nameMAL ?: media.nameRomaji media.mainName()
) )
} }
} }
@ -841,7 +841,7 @@ class MangaReaderActivity : AppCompatActivity() {
model.loadMangaChapterImages( model.loadMangaChapterImages(
chapters[chaptersArr.getOrNull(currentChapterIndex + 1) ?: return@launch]!!, chapters[chaptersArr.getOrNull(currentChapterIndex + 1) ?: return@launch]!!,
media.selected!!, media.selected!!,
media.nameMAL ?: media.nameRomaji, media.mainName(),
false false
) )
loading = false loading = false

10
app/src/main/java/ani/dantotsu/media/novel/NovelReadFragment.kt
View file

@ -67,7 +67,7 @@ class NovelReadFragment : Fragment(),
override fun downloadTrigger(novelDownloadPackage: NovelDownloadPackage) { override fun downloadTrigger(novelDownloadPackage: NovelDownloadPackage) {
Log.e("downloadTrigger", novelDownloadPackage.link) Log.e("downloadTrigger", novelDownloadPackage.link)
val downloadTask = NovelDownloaderService.DownloadTask( val downloadTask = NovelDownloaderService.DownloadTask(
title = media.nameMAL ?: media.nameRomaji, title = media.mainName(),
chapter = novelDownloadPackage.novelName, chapter = novelDownloadPackage.novelName,
downloadLink = novelDownloadPackage.link, downloadLink = novelDownloadPackage.link,
originalLink = novelDownloadPackage.originalLink, originalLink = novelDownloadPackage.originalLink,
@ -93,7 +93,7 @@ class NovelReadFragment : Fragment(),
val downloadsManager = Injekt.get<DownloadsManager>() val downloadsManager = Injekt.get<DownloadsManager>()
if (downloadsManager.queryDownload( if (downloadsManager.queryDownload(
DownloadedType( DownloadedType(
media.nameMAL ?: media.nameRomaji, media.mainName(),
novel.name, novel.name,
DownloadedType.Type.NOVEL DownloadedType.Type.NOVEL
) )
@ -101,7 +101,7 @@ class NovelReadFragment : Fragment(),
) { ) {
val file = File( val file = File(
context?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS), context?.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS),
"${DownloadsManager.novelLocation}/${media.nameMAL ?: media.nameRomaji}/${novel.name}/0.epub" "${DownloadsManager.novelLocation}/${media.mainName()}/${novel.name}/0.epub"
) )
if (!file.exists()) return false if (!file.exists()) return false
val fileUri = FileProvider.getUriForFile( val fileUri = FileProvider.getUriForFile(
@ -125,7 +125,7 @@ class NovelReadFragment : Fragment(),
val downloadsManager = Injekt.get<DownloadsManager>() val downloadsManager = Injekt.get<DownloadsManager>()
return downloadsManager.queryDownload( return downloadsManager.queryDownload(
DownloadedType( DownloadedType(
media.nameMAL ?: media.nameRomaji, media.mainName(),
novel.name, novel.name,
DownloadedType.Type.NOVEL DownloadedType.Type.NOVEL
) )
@ -136,7 +136,7 @@ class NovelReadFragment : Fragment(),
val downloadsManager = Injekt.get<DownloadsManager>() val downloadsManager = Injekt.get<DownloadsManager>()
downloadsManager.removeDownload( downloadsManager.removeDownload(
DownloadedType( DownloadedType(
media.nameMAL ?: media.nameRomaji, media.mainName(),
novel.name, novel.name,
DownloadedType.Type.NOVEL DownloadedType.Type.NOVEL
) )