@@ -10,6 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
10
10
import fr.free.nrw.commons.R
11
11
import fr.free.nrw.commons.auth.SessionManager
12
12
import fr.free.nrw.commons.contributions.Contribution
13
+ import fr.free.nrw.commons.contributions.Contribution.Companion.STATE_FAILED
13
14
import fr.free.nrw.commons.databinding.FragmentFailedUploadsBinding
14
15
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
15
16
import fr.free.nrw.commons.media.MediaClient
@@ -43,7 +44,7 @@ class FailedUploadsFragment :
43
44
44
45
private lateinit var adapter: FailedUploadsAdapter
45
46
46
- var contributionsList = ArrayList <Contribution >()
47
+ var contributionsList = mutableListOf <Contribution >()
47
48
48
49
private lateinit var uploadProgressActivity: UploadProgressActivity
49
50
@@ -71,7 +72,7 @@ class FailedUploadsFragment :
71
72
inflater : LayoutInflater ,
72
73
container : ViewGroup ? ,
73
74
savedInstanceState : Bundle ? ,
74
- ): View ? {
75
+ ): View {
75
76
binding = FragmentFailedUploadsBinding .inflate(layoutInflater)
76
77
pendingUploadsPresenter.onAttachView(this )
77
78
initAdapter()
@@ -99,9 +100,9 @@ class FailedUploadsFragment :
99
100
pendingUploadsPresenter.getFailedContributions()
100
101
pendingUploadsPresenter.failedContributionList.observe(
101
102
viewLifecycleOwner,
102
- ) { list: PagedList <Contribution ? > ->
103
+ ) { list: PagedList <Contribution > ->
103
104
adapter.submitList(list)
104
- contributionsList = ArrayList ()
105
+ contributionsList = mutableListOf ()
105
106
list.forEach {
106
107
if (it != null ) {
107
108
contributionsList.add(it)
@@ -124,26 +125,22 @@ class FailedUploadsFragment :
124
125
* Restarts all the failed uploads.
125
126
*/
126
127
fun restartUploads () {
127
- if (contributionsList != null ) {
128
- pendingUploadsPresenter.restartUploads(
129
- contributionsList,
130
- 0 ,
131
- this .requireContext().applicationContext,
132
- )
133
- }
128
+ pendingUploadsPresenter.restartUploads(
129
+ contributionsList,
130
+ 0 ,
131
+ requireContext().applicationContext,
132
+ )
134
133
}
135
134
136
135
/* *
137
136
* Restarts a specific upload.
138
137
*/
139
138
override fun restartUpload (index : Int ) {
140
- if (contributionsList != null ) {
141
- pendingUploadsPresenter.restartUpload(
142
- contributionsList,
143
- index,
144
- this .requireContext().applicationContext,
145
- )
146
- }
139
+ pendingUploadsPresenter.restartUpload(
140
+ contributionsList,
141
+ index,
142
+ requireContext().applicationContext,
143
+ )
147
144
}
148
145
149
146
/* *
@@ -166,7 +163,7 @@ class FailedUploadsFragment :
166
163
ViewUtil .showShortToast(context, R .string.cancelling_upload)
167
164
pendingUploadsPresenter.deleteUpload(
168
165
contribution,
169
- this . requireContext().applicationContext,
166
+ requireContext().applicationContext,
170
167
)
171
168
},
172
169
{},
@@ -177,28 +174,24 @@ class FailedUploadsFragment :
177
174
* Deletes all the uploads after getting a confirmation from the user using Dialog.
178
175
*/
179
176
fun deleteUploads () {
180
- if (contributionsList != null ) {
181
- DialogUtil .showAlertDialog(
182
- requireActivity(),
183
- String .format(
184
- Locale .getDefault(),
185
- requireActivity().getString(R .string.cancelling_all_the_uploads),
186
- ),
187
- String .format(
188
- Locale .getDefault(),
189
- requireActivity().getString(R .string.are_you_sure_that_you_want_cancel_all_the_uploads),
190
- ),
191
- String .format(Locale .getDefault(), requireActivity().getString(R .string.yes)),
192
- String .format(Locale .getDefault(), requireActivity().getString(R .string.no)),
193
- {
194
- ViewUtil .showShortToast(context, R .string.cancelling_upload)
195
- uploadProgressActivity.hidePendingIcons()
196
- pendingUploadsPresenter.deleteUploads(
197
- listOf (Contribution .STATE_FAILED ),
198
- )
199
- },
200
- {},
201
- )
202
- }
177
+ DialogUtil .showAlertDialog(
178
+ requireActivity(),
179
+ String .format(
180
+ Locale .getDefault(),
181
+ requireActivity().getString(R .string.cancelling_all_the_uploads),
182
+ ),
183
+ String .format(
184
+ Locale .getDefault(),
185
+ requireActivity().getString(R .string.are_you_sure_that_you_want_cancel_all_the_uploads),
186
+ ),
187
+ String .format(Locale .getDefault(), requireActivity().getString(R .string.yes)),
188
+ String .format(Locale .getDefault(), requireActivity().getString(R .string.no)),
189
+ {
190
+ ViewUtil .showShortToast(context, R .string.cancelling_upload)
191
+ uploadProgressActivity.hidePendingIcons()
192
+ pendingUploadsPresenter.deleteUploads(listOf (STATE_FAILED ))
193
+ },
194
+ {},
195
+ )
203
196
}
204
197
}
0 commit comments