aiden
/
ytdl-android
mirror of https://github.com/deniscerri/ytdlnis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

history fixes

Browse Source
pull/1226/head
deniscerri 1 month ago
parent 3ec78a0281
commit bcdb1b80b8
No known key found for this signature in database
GPG Key ID: 95C43D517D830350
3 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File

2
app/src/main/java/com/deniscerri/ytdl/database/viewmodel/DownloadViewModel.kt
Unescape Escape View File

@ -684,7 +684,7 @@ class DownloadViewModel(private val application: Application) : AndroidViewModel
val toInsert = mutableListOf<DownloadItem>()
itemIDs.forEachIndexed { index, it ->
val item = historyRepository.getItem(it)
val downloadItem = createDownloadItemFromHistory(item)
val downloadItem = createDownloadItemFromHistory(item!!)
downloadItem.status = DownloadRepository.Status.Processing.toString()
downloadItem.rowNumber = index + 1

2
app/src/main/java/com/deniscerri/ytdl/database/viewmodel/HistoryViewModel.kt
Unescape Escape View File

@ -166,7 +166,7 @@ class HistoryViewModel(application: Application) : AndroidViewModel(application)
return repository.getAll()
}
fun getByID(id: Long) : HistoryItem {
fun getByID(id: Long) : HistoryItem? {
return repository.getItem(id)
}

64
app/src/main/java/com/deniscerri/ytdl/ui/downloads/HistoryFragment.kt
Unescape Escape View File

@ -297,7 +297,6 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
deleteDialog.setMessage(getString(R.string.confirm_delete_history_desc))
deleteDialog.setNegativeButton(getString(R.string.cancel)) { dialogInterface: DialogInterface, _: Int -> dialogInterface.cancel() }
deleteDialog.setPositiveButton(getString(R.string.ok)) { _: DialogInterface?, _: Int ->
historyAdapter.submitData(lifecycle, PagingData.empty())
historyViewModel.clearDeleted()
}
deleteDialog.show()
@ -312,7 +311,6 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
deleteDialog.setMessage(getString(R.string.confirm_delete_history_desc))
deleteDialog.setNegativeButton(getString(R.string.cancel)) { dialogInterface: DialogInterface, _: Int -> dialogInterface.cancel() }
deleteDialog.setPositiveButton(getString(R.string.ok)) { _: DialogInterface?, _: Int ->
historyAdapter.submitData(lifecycle, PagingData.empty())
historyViewModel.deleteDuplicates()
}
deleteDialog.show()
@ -623,13 +621,15 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
historyViewModel.getByID(selectedObjects.first())
}
downloadCardViewModel.setResultItem(downloadViewModel.createResultItemFromHistory(tmp))
downloadCardViewModel.setDownloadItem(null)
tmp?.apply {
downloadCardViewModel.setResultItem(downloadViewModel.createResultItemFromHistory(tmp))
downloadCardViewModel.setDownloadItem(null)
findNavController().navigate(R.id.downloadBottomSheetDialog, bundleOf(
Pair("type", tmp.type),
Pair("ignore_duplicates", true)
))
findNavController().navigate(R.id.downloadBottomSheetDialog, bundleOf(
Pair("type", tmp.type),
Pair("ignore_duplicates", true)
))
}
}else {
val showDownloadCard = sharedPreferences.getBoolean("download_card", true)
downloadViewModel.turnHistoryItemsToProcessingDownloads(selectedObjects, downloadNow = !showDownloadCard)
@ -697,22 +697,25 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
historyViewModel.getByID(itemID)
}
historyAdapter.notifyItemChanged(position)
UiUtil.showRemoveHistoryItemDialog(deletedItem, requireActivity(),
delete = { item, deleteFile ->
lifecycleScope.launch {
withContext(Dispatchers.IO){
historyViewModel.delete(item, deleteFile)
}
if (!deleteFile){
Snackbar.make(recyclerView, getString(R.string.you_are_going_to_delete) + ": " + deletedItem.title, Snackbar.LENGTH_INDEFINITE)
.setAction(getString(R.string.undo)) {
historyViewModel.insert(deletedItem)
}.show()
deletedItem?.apply {
UiUtil.showRemoveHistoryItemDialog(deletedItem, requireActivity(),
delete = { item, deleteFile ->
lifecycleScope.launch {
withContext(Dispatchers.IO){
historyViewModel.delete(item, deleteFile)
}
if (!deleteFile){
Snackbar.make(recyclerView, getString(R.string.you_are_going_to_delete) + ": " + deletedItem.title, Snackbar.LENGTH_INDEFINITE)
.setAction(getString(R.string.undo)) {
historyViewModel.insert(deletedItem)
}.show()
}
}
}
}
)
)
}
}
}
ItemTouchHelper.RIGHT -> {
@ -722,13 +725,15 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
}
historyAdapter.notifyItemChanged(position)
downloadCardViewModel.setResultItem(downloadViewModel.createResultItemFromHistory(item))
downloadCardViewModel.setDownloadItem(null)
item?.apply {
downloadCardViewModel.setResultItem(downloadViewModel.createResultItemFromHistory(item))
downloadCardViewModel.setDownloadItem(null)
findNavController().navigate(R.id.downloadBottomSheetDialog, bundleOf(
Pair("type", item.type),
Pair("ignore_duplicates", true)
))
findNavController().navigate(R.id.downloadBottomSheetDialog, bundleOf(
Pair("type", item.type),
Pair("ignore_duplicates", true)
))
}
}
}
}
@ -782,7 +787,10 @@ class HistoryFragment : Fragment(), HistoryPaginatedAdapter.OnItemClickListener{
val item = withContext(Dispatchers.IO){
historyViewModel.getByID(itemID)
}
FileUtil.shareFileIntent(requireContext(), item.downloadPath)
item?.apply {
FileUtil.shareFileIntent(requireContext(), item.downloadPath)
}
}
}

Write Preview
Loading…
Cancel
Save