Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

First issue: Fixed errors/warnings in FailedUploadFragments.kt #6000

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

First issue: Fixed errors/warnings in FailedUploadFragments.kt #6000

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2cd91c5
fixed errors and warnings
KYash03 Dec 6, 2024
00866c5
Merge branch 'main' into fix-issues
nicolas-raoul Dec 6, 2024
7a932ef
Merge branch 'main' into fix-issues
nicolas-raoul Dec 6, 2024
ccbc925
Merge branch 'main' into fix-issues
nicolas-raoul Dec 10, 2024
b56e6df
Merge branch 'main' into fix-issues
nicolas-raoul Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 47 additions & 77 deletions app/src/main/java/fr/free/nrw/commons/upload/FailedUploadsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,16 @@ import fr.free.nrw.commons.profile.ProfileActivity
import fr.free.nrw.commons.utils.DialogUtil
import fr.free.nrw.commons.utils.ViewUtil
import org.apache.commons.lang3.StringUtils
import java.util.Locale
import javax.inject.Inject

/**
* Fragment for displaying a list of failed uploads in Upload Progress Activity. This fragment provides
* Fragment for displaying a list of failed uploads in Upload Progress Activity. It provides
* functionality for the user to retry or cancel failed uploads.
*/
class FailedUploadsFragment :
CommonsDaggerSupportFragment(),
PendingUploadsContract.View,
FailedUploadsAdapter.Callback {
@Inject
lateinit var pendingUploadsPresenter: PendingUploadsPresenter
Copy link
Contributor

@neeldoshii neeldoshii Dec 6, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason in removing this? I don't see any lint/warnings over this.


@Inject
lateinit var mediaClient: MediaClient
Expand All @@ -38,14 +35,11 @@ class FailedUploadsFragment :
lateinit var sessionManager: SessionManager

private var userName: String? = null

lateinit var binding: FragmentFailedUploadsBinding

private lateinit var binding: FragmentFailedUploadsBinding
private lateinit var adapter: FailedUploadsAdapter

var contributionsList = ArrayList<Contribution>()

private val contributionsList = ArrayList<Contribution>()
private lateinit var uploadProgressActivity: UploadProgressActivity
lateinit var pendingUploadsPresenter: PendingUploadsPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand All @@ -56,12 +50,8 @@ class FailedUploadsFragment :

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
// Now that we are allowing this fragment to be started for
// any userName- we expect it to be passed as an argument
if (arguments != null) {
userName = requireArguments().getString(ProfileActivity.KEY_USERNAME)
}

// Expecting userName as an argument; fallback to sessionManager's userName if not provided
userName = arguments?.getString(ProfileActivity.KEY_USERNAME)
if (StringUtils.isEmpty(userName)) {
userName = sessionManager.userName
}
Expand All @@ -71,14 +61,14 @@ class FailedUploadsFragment :
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?,
): View? {
binding = FragmentFailedUploadsBinding.inflate(layoutInflater)
): View {
binding = FragmentFailedUploadsBinding.inflate(inflater, container, false)
pendingUploadsPresenter.onAttachView(this)
initAdapter()
return binding.root
}

fun initAdapter() {
private fun initAdapter() {
adapter = FailedUploadsAdapter(this)
}

Expand All @@ -93,29 +83,27 @@ class FailedUploadsFragment :
/**
* Initializes the recycler view.
*/
fun initRecyclerView() {
binding.failedUploadsRecyclerView.setLayoutManager(LinearLayoutManager(this.context))
private fun initRecyclerView() {
binding.failedUploadsRecyclerView.layoutManager = LinearLayoutManager(context)
binding.failedUploadsRecyclerView.adapter = adapter
pendingUploadsPresenter.getFailedContributions()
pendingUploadsPresenter.failedContributionList.observe(
viewLifecycleOwner,
) { list: PagedList<Contribution?> ->
adapter.submitList(list)
contributionsList = ArrayList()
list.forEach {
if (it != null) {
contributionsList.add(it)
}
contributionsList.clear()
list.forEach { contribution ->
contribution?.let { contributionsList.add(it) }
}
if (list.size == 0) {
if (list.isEmpty()) {
uploadProgressActivity.setErrorIconsVisibility(false)
binding.nofailedTextView.visibility = View.VISIBLE
binding.failedUplaodsLl.visibility = View.GONE
} else {
uploadProgressActivity.setErrorIconsVisibility(true)
binding.nofailedTextView.visibility = View.GONE
binding.failedUplaodsLl.visibility = View.VISIBLE
binding.failedUploadsRecyclerView.setAdapter(adapter)
// Setting the adapter again is redundant; it's already set above
}
}
}
Expand All @@ -124,26 +112,22 @@ class FailedUploadsFragment :
* Restarts all the failed uploads.
*/
fun restartUploads() {
if (contributionsList != null) {
pendingUploadsPresenter.restartUploads(
contributionsList,
0,
this.requireContext().applicationContext,
)
}
pendingUploadsPresenter.restartUploads(
contributionsList,
0,
requireContext().applicationContext,
)
}

/**
* Restarts a specific upload.
*/
override fun restartUpload(index: Int) {
if (contributionsList != null) {
pendingUploadsPresenter.restartUpload(
contributionsList,
index,
this.requireContext().applicationContext,
)
}
pendingUploadsPresenter.restartUpload(
contributionsList,
index,
requireContext().applicationContext,
)
}

/**
Expand All @@ -152,53 +136,39 @@ class FailedUploadsFragment :
override fun deleteUpload(contribution: Contribution?) {
DialogUtil.showAlertDialog(
requireActivity(),
String.format(
Locale.getDefault(),
requireActivity().getString(R.string.cancelling_upload),
),
String.format(
Locale.getDefault(),
requireActivity().getString(R.string.cancel_upload_dialog),
),
String.format(Locale.getDefault(), requireActivity().getString(R.string.yes)),
String.format(Locale.getDefault(), requireActivity().getString(R.string.no)),
getString(R.string.cancelling_upload),
getString(R.string.cancel_upload_dialog),
getString(R.string.yes),
getString(R.string.no),
{
ViewUtil.showShortToast(context, R.string.cancelling_upload)
pendingUploadsPresenter.deleteUpload(
contribution,
this.requireContext().applicationContext,
requireContext().applicationContext,
)
},
{},
{}
)
}

/**
* Deletes all the uploads after getting a confirmation from the user using Dialog.
*/
fun deleteUploads() {
if (contributionsList != null) {
DialogUtil.showAlertDialog(
requireActivity(),
String.format(
Locale.getDefault(),
requireActivity().getString(R.string.cancelling_all_the_uploads),
),
String.format(
Locale.getDefault(),
requireActivity().getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads),
),
String.format(Locale.getDefault(), requireActivity().getString(R.string.yes)),
String.format(Locale.getDefault(), requireActivity().getString(R.string.no)),
{
ViewUtil.showShortToast(context, R.string.cancelling_upload)
uploadProgressActivity.hidePendingIcons()
pendingUploadsPresenter.deleteUploads(
listOf(Contribution.STATE_FAILED),
)
},
{},
)
}
DialogUtil.showAlertDialog(
requireActivity(),
getString(R.string.cancelling_all_the_uploads),
getString(R.string.are_you_sure_that_you_want_cancel_all_the_uploads),
getString(R.string.yes),
getString(R.string.no),
{
ViewUtil.showShortToast(context, R.string.cancelling_upload)
uploadProgressActivity.hidePendingIcons()
pendingUploadsPresenter.deleteUploads(
listOf(Contribution.STATE_FAILED),
)
},
{}
)
}
}