some fixes

pull/1112/head
deniscerri 5 months ago
parent df63aa6ecb
commit dd5709ada5
No known key found for this signature in database
GPG Key ID: 95C43D517D830350

@ -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<Boolean>()
@ -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{

@ -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)
}

Loading…
Cancel
Save