Skip to content

Commit 86cdf96

Browse files
make prop nullable (#6073)
Signed-off-by: parneet-guraya <[email protected]>
1 parent e7864ac commit 86cdf96

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

app/src/main/java/fr/free/nrw/commons/upload/UploadBaseFragment.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
66
* The base fragment of the fragments in upload
77
*/
88
abstract class UploadBaseFragment : CommonsDaggerSupportFragment() {
9-
lateinit var callback: Callback
9+
var callback: Callback? = null
1010

1111
protected open fun onBecameVisible() = Unit
1212

app/src/main/java/fr/free/nrw/commons/upload/categories/UploadCategoriesFragment.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ class UploadCategoriesFragment : UploadBaseFragment(), CategoriesContract.View {
9696
if (media == null) {
9797
if (callback != null) {
9898
binding!!.tvTitle.text = getString(
99-
R.string.step_count, callback.getIndexInViewFlipper(
99+
R.string.step_count, callback!!.getIndexInViewFlipper(
100100
this
101101
) + 1,
102-
callback.totalNumberOfSteps, getString(R.string.categories_activity_title)
102+
callback!!.totalNumberOfSteps, getString(R.string.categories_activity_title)
103103
)
104104
}
105105
} else {
@@ -220,7 +220,7 @@ class UploadCategoriesFragment : UploadBaseFragment(), CategoriesContract.View {
220220
}
221221

222222
override fun goToNextScreen() {
223-
callback.onNextButtonClicked(callback.getIndexInViewFlipper(this))
223+
callback!!.onNextButtonClicked(callback!!.getIndexInViewFlipper(this))
224224
}
225225

226226
override fun showNoCategorySelected() {
@@ -322,7 +322,7 @@ class UploadCategoriesFragment : UploadBaseFragment(), CategoriesContract.View {
322322
mediaDetailFragment.onResume()
323323
goBackToPreviousScreen()
324324
} else {
325-
callback.onPreviousButtonClicked(callback.getIndexInViewFlipper(this))
325+
callback!!.onPreviousButtonClicked(callback!!.getIndexInViewFlipper(this))
326326
}
327327
}
328328

app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsFragment.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
9797
if (media == null) {
9898
binding.depictsTitle.text =
9999
String.format(
100-
getString(R.string.step_count), callback.getIndexInViewFlipper(
100+
getString(R.string.step_count), callback!!.getIndexInViewFlipper(
101101
this
102102
) + 1,
103-
callback.totalNumberOfSteps, getString(R.string.depicts_step_title)
103+
callback!!.totalNumberOfSteps, getString(R.string.depicts_step_title)
104104
)
105105
} else {
106106
binding.depictsTitle.setText(R.string.edit_depictions)
@@ -173,11 +173,11 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
173173
}
174174

175175
override fun goToNextScreen() {
176-
callback.onNextButtonClicked(callback.getIndexInViewFlipper(this))
176+
callback!!.onNextButtonClicked(callback!!.getIndexInViewFlipper(this))
177177
}
178178

179179
override fun goToPreviousScreen() {
180-
callback.onPreviousButtonClicked(callback.getIndexInViewFlipper(this))
180+
callback!!.onPreviousButtonClicked(callback!!.getIndexInViewFlipper(this))
181181
}
182182

183183
override fun noDepictionSelected() {
@@ -338,7 +338,7 @@ class DepictsFragment : UploadBaseFragment(), DepictsContract.View {
338338
updateDepicts()
339339
goBackToPreviousScreen()
340340
} else {
341-
callback.onPreviousButtonClicked(callback.getIndexInViewFlipper(this))
341+
callback!!.onPreviousButtonClicked(callback!!.getIndexInViewFlipper(this))
342342
}
343343
}
344344

app/src/main/java/fr/free/nrw/commons/upload/license/MediaLicenseFragment.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,20 @@ class MediaLicenseFragment : UploadBaseFragment(), MediaLicenseContract.View {
4747

4848
binding.tvTitle.text = getString(
4949
R.string.step_count,
50-
callback.getIndexInViewFlipper(this) + 1,
51-
callback.totalNumberOfSteps,
50+
callback!!.getIndexInViewFlipper(this) + 1,
51+
callback!!.totalNumberOfSteps,
5252
getString(R.string.license_step_title)
5353
)
5454
setTvSubTitle()
5555
binding.btnPrevious.setOnClickListener {
56-
callback.onPreviousButtonClicked(
57-
callback.getIndexInViewFlipper(this)
56+
callback!!.onPreviousButtonClicked(
57+
callback!!.getIndexInViewFlipper(this)
5858
)
5959
}
6060

6161
binding.btnSubmit.setOnClickListener {
62-
callback.onNextButtonClicked(
63-
callback.getIndexInViewFlipper(this)
62+
callback!!.onNextButtonClicked(
63+
callback!!.getIndexInViewFlipper(this)
6464
)
6565
}
6666

@@ -201,6 +201,6 @@ class MediaLicenseFragment : UploadBaseFragment(), MediaLicenseContract.View {
201201
* Show the wlm info message if the upload is a WLM upload
202202
*/
203203
binding.llInfoMonumentUpload.visibility =
204-
if (callback.isWLMUpload && presenter.isWLMSupportedForThisPlace()) View.VISIBLE else View.GONE
204+
if (callback!!.isWLMUpload && presenter.isWLMSupportedForThisPlace()) View.VISIBLE else View.GONE
205205
}
206206
}

0 commit comments

Comments
 (0)