From dd5709ada508262d8cc6f3366195aec362ea516f Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Sat, 14 Feb 2026 20:58:59 +0100 Subject: [PATCH] some fixes --- .../java/com/deniscerri/ytdl/receiver/ShareActivity.kt | 7 ++++++- .../ytdl/ui/downloadcard/DownloadBottomSheetDialog.kt | 6 +++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/deniscerri/ytdl/receiver/ShareActivity.kt b/app/src/main/java/com/deniscerri/ytdl/receiver/ShareActivity.kt index deb5990c..a205528b 100644 --- a/app/src/main/java/com/deniscerri/ytdl/receiver/ShareActivity.kt +++ b/app/src/main/java/com/deniscerri/ytdl/receiver/ShareActivity.kt @@ -31,6 +31,7 @@ import com.deniscerri.ytdl.R import com.deniscerri.ytdl.database.enums.DownloadType import com.deniscerri.ytdl.database.models.ResultItem import com.deniscerri.ytdl.database.viewmodel.CookieViewModel +import com.deniscerri.ytdl.database.viewmodel.DownloadCardViewModel import com.deniscerri.ytdl.database.viewmodel.DownloadViewModel import com.deniscerri.ytdl.database.viewmodel.HistoryViewModel import com.deniscerri.ytdl.database.viewmodel.ResultViewModel @@ -53,6 +54,7 @@ class ShareActivity : BaseActivity() { private lateinit var historyViewModel: HistoryViewModel private lateinit var downloadViewModel: DownloadViewModel private lateinit var cookieViewModel: CookieViewModel + private lateinit var downloadCardViewModel: DownloadCardViewModel private lateinit var sharedPreferences: SharedPreferences private lateinit var navController: NavController private var quickDownload by Delegates.notNull() @@ -117,6 +119,7 @@ class ShareActivity : BaseActivity() { historyViewModel = ViewModelProvider(this)[HistoryViewModel::class.java] downloadViewModel = ViewModelProvider(this)[DownloadViewModel::class.java] cookieViewModel = ViewModelProvider(this)[CookieViewModel::class.java] + downloadCardViewModel = ViewModelProvider(this)[DownloadCardViewModel::class.java] sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this) cookieViewModel.updateCookiesFile() @@ -190,8 +193,10 @@ class ShareActivity : BaseActivity() { val downloadType = DownloadType.valueOf(type ?: downloadViewModel.getDownloadType(url = result.url).toString()) if (sharedPreferences.getBoolean("download_card", true) && !background){ + + downloadCardViewModel.setResultItem(result) + downloadCardViewModel.setDownloadItem(null) val bundle = Bundle() - bundle.putParcelable("result", result) bundle.putSerializable("type", downloadType) navController.setGraph(R.navigation.share_nav_graph, bundle) }else{ diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadBottomSheetDialog.kt index 30680fda..78d92885 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadBottomSheetDialog.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadBottomSheetDialog.kt @@ -119,8 +119,8 @@ class DownloadBottomSheetDialog : BottomSheetDialogFragment() { override fun onSaveInstanceState(outState: Bundle) { super.onSaveInstanceState(outState) val downloadItem = getDownloadItem() - arguments?.putParcelable("result", result) - arguments?.putParcelable("downloadItem", downloadItem) + downloadCardViewModel.setResultItem(result) + downloadCardViewModel.setDownloadItem(downloadItem) arguments?.putSerializable("type", downloadItem.type) } @@ -587,7 +587,7 @@ class DownloadBottomSheetDialog : BottomSheetDialogFragment() { shimmerLoadingSubtitle.stopShimmer() val usingGenericFormatsOrEmpty = res.formats.isEmpty() || res.formats.any { it.format_note.contains("ytdlnisgeneric") } - arguments?.putParcelable("result", res) + downloadCardViewModel.setResultItem(res) if (usingGenericFormatsOrEmpty && sharedPreferences.getBoolean("update_formats", false)){ initUpdateFormats(res) }