From 4218d81c49b0142e9c3686fa0d4a81e9abb87177 Mon Sep 17 00:00:00 2001
From: aayush262 <aayushthakur262006@gmail.com>
Date: Tue, 23 Jan 2024 17:38:11 +0530
Subject: [PATCH] Download manager fixed

now no need to long tap download button to download externally (select external downloader to download from external app)
---
 .../media/anime/SelectorDialogFragment.kt     | 153 ++++++++----------
 app/src/main/res/layout/activity_settings.xml |   8 -
 app/src/main/res/values/strings.xml           |   1 -
 3 files changed, 71 insertions(+), 91 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt b/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt
index 688222c5859..ec8a1234df2 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt
@@ -300,96 +300,85 @@ class SelectorDialogFragment : BottomSheetDialogFragment() {
                     extractor.server.name
                 media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!.selectedVideo =
                     position
-                binding.urlDownload.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
-                val episode = media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!
-                val selectedVideo =
-                    if (extractor.videos.size > episode.selectedVideo) extractor.videos[episode.selectedVideo] else null
-
-                val subtitles = extractor.subtitles
-                val subtitleNames = subtitles.map { it.language }
-                var subtitleToDownload: Subtitle? = null
-                if (subtitles.isNotEmpty()) {
-                    val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
-                        .setTitle("Download Subtitle")
-                        .setSingleChoiceItems(
-                            subtitleNames.toTypedArray(),
-                            -1
-                        ) { dialog, which ->
-                            subtitleToDownload = subtitles[which]
-                        }
-                        .setPositiveButton("Download") { _, _ ->
-                            dialog?.dismiss()
-                            if (selectedVideo != null) {
-                                Helper.startAnimeDownloadService(
-                                    currActivity()!!,
-                                    media!!.mainName(),
-                                    episode.number,
-                                    selectedVideo,
-                                    subtitleToDownload,
-                                    media,
-                                    episode.thumb?.url ?: media!!.banner ?: media!!.cover
-                                )
-                            } else {
-                                snackString("No Video Selected")
-                            }
-                        }
-                        .setNegativeButton("Skip") { dialog, _ ->
-                            subtitleToDownload = null
-                            if (selectedVideo != null) {
-                                Helper.startAnimeDownloadService(
-                                    currActivity()!!,
-                                    media!!.mainName(),
-                                    episode.number,
-                                    selectedVideo,
-                                    subtitleToDownload,
-                                    media,
-                                    episode.thumb?.url ?: media!!.banner ?: media!!.cover
-                                )
-                            } else {
-                                snackString("No Video Selected")
-                            }
-                            dialog.dismiss()
-                        }
-                        .setNeutralButton("Cancel") { dialog, _ ->
-                            subtitleToDownload = null
-                            dialog.dismiss()
-                        }
-                        .show()
-                    alertDialog.window?.setDimAmount(0.8f)
-
-                } else {
-                    if (selectedVideo != null) {
-                        Helper.startAnimeDownloadService(
-                            requireActivity(),
-                            media!!.mainName(),
-                            episode.number,
-                            selectedVideo,
-                            subtitleToDownload,
-                            media,
-                            episode.thumb?.url ?: media!!.banner ?: media!!.cover
-                        )
-                    } else {
-                        snackString("No Video Selected")
-                    }
-                }
-                dismiss()
-            }
-            binding.urlDownload.setOnLongClickListener {
-                binding.urlDownload.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
                 if ((loadData<Int>("settings_download_manager") ?: 0) != 0) {
-                    media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!.selectedExtractor =
-                        extractor.server.name
-                    media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!.selectedVideo =
-                        position
                     download(
                         requireActivity(),
                         media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!,
                         media!!.userPreferredName
                     )
                 } else {
-                    snackString("No Download Manager Selected")
+                    val episode = media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]!!
+                    val selectedVideo =
+                        if (extractor.videos.size > episode.selectedVideo) extractor.videos[episode.selectedVideo] else null
+                    val subtitles = extractor.subtitles
+                    val subtitleNames = subtitles.map { it.language }
+                    var subtitleToDownload: Subtitle? = null
+                    if (subtitles.isNotEmpty()) {
+                        val alertDialog = AlertDialog.Builder(context, R.style.MyPopup)
+                            .setTitle("Download Subtitle")
+                            .setSingleChoiceItems(
+                                subtitleNames.toTypedArray(),
+                                -1
+                            ) { dialog, which ->
+                                subtitleToDownload = subtitles[which]
+                            }
+                            .setPositiveButton("Download") { _, _ ->
+                                dialog?.dismiss()
+                                if (selectedVideo != null) {
+                                    Helper.startAnimeDownloadService(
+                                        currActivity()!!,
+                                        media!!.mainName(),
+                                        episode.number,
+                                        selectedVideo,
+                                        subtitleToDownload,
+                                        media,
+                                        episode.thumb?.url ?: media!!.banner ?: media!!.cover
+                                    )
+                                } else {
+                                    snackString("No Video Selected")
+                                }
+                            }
+                            .setNegativeButton("Skip") { dialog, _ ->
+                                subtitleToDownload = null
+                                if (selectedVideo != null) {
+                                    Helper.startAnimeDownloadService(
+                                        currActivity()!!,
+                                        media!!.mainName(),
+                                        episode.number,
+                                        selectedVideo,
+                                        subtitleToDownload,
+                                        media,
+                                        episode.thumb?.url ?: media!!.banner ?: media!!.cover
+                                    )
+                                } else {
+                                    snackString("No Video Selected")
+                                }
+                                dialog.dismiss()
+                            }
+                            .setNeutralButton("Cancel") { dialog, _ ->
+                                subtitleToDownload = null
+                                dialog.dismiss()
+                            }
+                            .show()
+                        alertDialog.window?.setDimAmount(0.8f)
+
+                    } else {
+                        if (selectedVideo != null) {
+                            Helper.startAnimeDownloadService(
+                                requireActivity(),
+                                media!!.mainName(),
+                                episode.number,
+                                selectedVideo,
+                                subtitleToDownload,
+                                media,
+                                episode.thumb?.url ?: media!!.banner ?: media!!.cover
+                            )
+                        } else {
+                            snackString("No Video Selected")
+                        }
+                    }
                 }
-                true
+                dismiss()
             }
             if (video.format == VideoType.CONTAINER) {
                 binding.urlSize.visibility = if (video.size != null) View.VISIBLE else View.GONE
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 1c3d5f805b2..8a8fa7c4dfc 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -719,14 +719,6 @@
                     app:iconPadding="16dp"
                     app:iconSize="24dp" />
 
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:alpha="0.58"
-                    android:fontFamily="@font/poppins_family"
-                    android:text="@string/long_press_download"
-                    android:textSize="14sp" />
 
                 <!--TODO: Add support for SD card-->
                 <com.google.android.material.materialswitch.MaterialSwitch
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9ec43b42fe2..c94e2a8b51f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -647,7 +647,6 @@
     <string name="app_widget_description">This is an app widget description</string>
     <string name="airing_image">Airing Image</string>
     <string name="anime_downloads">animeDownloads</string>
-    <string name="long_press_download">Long press the download button to download using the selected download manager</string>
     <string name="purge_anime_downloads">Delete all anime downloads</string>
     <string name="purge_manga_downloads">Delete all Manga Downloads</string>
     <string name="purge_novel_downloads">Delete all Novel Downloads</string>