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) {
Helper.startAnimeDownloadService(
requireActivity(),
media!!.nameMAL ?: media!!.nameRomaji,
media!!.mainName(),
episode.number,
video,
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
val downloadTask = MangaDownloaderService.DownloadTask(
title = media.nameMAL ?: media.nameRomaji,
title = media.mainName(),
chapter = chapter.title!!,
imageData = images,
sourceMedia = media,
@ -489,7 +489,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
fun onMangaChapterRemoveDownloadClick(i: String) {
downloadManager.removeDownload(
DownloadedType(
media.nameMAL ?: media.nameRomaji,
media.mainName(),
i,
DownloadedType.Type.MANGA
)
@ -507,7 +507,7 @@ open class MangaReadFragment : Fragment(), ScanlatorSelectionListener {
// Remove the download from the manager and update the UI
downloadManager.removeDownload(
DownloadedType(
media.nameMAL ?: media.nameRomaji,
media.mainName(),
i,
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(
chapter,
media.selected!!,
media.nameMAL ?: media.nameRomaji
media.mainName()
)
}
}
@ -841,7 +841,7 @@ class MangaReaderActivity : AppCompatActivity() {
model.loadMangaChapterImages(
chapters[chaptersArr.getOrNull(currentChapterIndex + 1) ?: return@launch]!!,
media.selected!!,
media.nameMAL ?: media.nameRomaji,
media.mainName(),
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) {
Log.e("downloadTrigger", novelDownloadPackage.link)
val downloadTask = NovelDownloaderService.DownloadTask(
title = media.nameMAL ?: media.nameRomaji,
title = media.mainName(),
chapter = novelDownloadPackage.novelName,
downloadLink = novelDownloadPackage.link,
originalLink = novelDownloadPackage.originalLink,
@ -93,7 +93,7 @@ class NovelReadFragment : Fragment(),
val downloadsManager = Injekt.get<DownloadsManager>()
if (downloadsManager.queryDownload(
DownloadedType(
media.nameMAL ?: media.nameRomaji,
media.mainName(),
novel.name,
DownloadedType.Type.NOVEL
)
@ -101,7 +101,7 @@ class NovelReadFragment : Fragment(),
) {
val file = File(
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
val fileUri = FileProvider.getUriForFile(
@ -125,7 +125,7 @@ class NovelReadFragment : Fragment(),
val downloadsManager = Injekt.get<DownloadsManager>()
return downloadsManager.queryDownload(
DownloadedType(
media.nameMAL ?: media.nameRomaji,
media.mainName(),
novel.name,
DownloadedType.Type.NOVEL
)
@ -136,7 +136,7 @@ class NovelReadFragment : Fragment(),
val downloadsManager = Injekt.get<DownloadsManager>()
downloadsManager.removeDownload(
DownloadedType(
media.nameMAL ?: media.nameRomaji,
media.mainName(),
novel.name,
DownloadedType.Type.NOVEL
)