Skip to content

Commit a3744e9

Browse files
committed
Fix nullability of the UploadItem
1 parent f2ff449 commit a3744e9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class ImageProcessingService @Inject constructor(
4545
}
4646

4747
Timber.d("Checking the validity of image")
48-
val filePath = uploadItem.mediaUri.path
48+
val filePath = uploadItem.mediaUri?.path
4949

5050
return Single.zip(
5151
checkDuplicateImage(filePath),

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import fr.free.nrw.commons.utils.ImageUtils
88
import io.reactivex.subjects.BehaviorSubject
99

1010
class UploadItem(
11-
var mediaUri: Uri,
11+
var mediaUri: Uri?,
1212
val mimeType: String?,
1313
var gpsCoords: ImageCoordinates?,
14-
var place: Place,
15-
val createdTimestamp: Long,
14+
var place: Place?,
15+
val createdTimestamp: Long?,
1616
val createdTimestampSource: String?,
1717
/**
1818
* Uri of uploadItem
@@ -23,7 +23,7 @@ class UploadItem(
2323
val fileCreatedDateString: String?
2424
) {
2525
var imageQuality: Int = ImageUtils.IMAGE_WAIT
26-
var uploadMediaDetails: List<UploadMediaDetail> = listOf(UploadMediaDetail())
26+
var uploadMediaDetails: MutableList<UploadMediaDetail> = mutableListOf(UploadMediaDetail())
2727
var hasInvalidLocation = false
2828
var isWLMUpload = false
2929
var countryCode: String? = null

app/src/test/kotlin/fr/free/nrw/commons/upload/CategoriesPresenterTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ class CategoriesPresenterTest {
8484
)
8585
val nonEmptyCaptionUploadItem = mock<UploadItem>()
8686
whenever(nonEmptyCaptionUploadItem.uploadMediaDetails)
87-
.thenReturn(listOf(UploadMediaDetail(captionText = "nonEmpty")))
87+
.thenReturn(mutableListOf(UploadMediaDetail(captionText = "nonEmpty")))
8888
val emptyCaptionUploadItem = mock<UploadItem>()
8989
whenever(emptyCaptionUploadItem.uploadMediaDetails)
90-
.thenReturn(listOf(UploadMediaDetail(captionText = "")))
90+
.thenReturn(mutableListOf(UploadMediaDetail(captionText = "")))
9191
whenever(repository.getUploads()).thenReturn(
9292
listOf(
9393
nonEmptyCaptionUploadItem,

app/src/test/kotlin/fr/free/nrw/commons/upload/UploadMediaPresenterTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class UploadMediaPresenterTest {
228228
whenever(repository.getUploads()).thenReturn(listOf(uploadItem))
229229
whenever(repository.getUploadItem(ArgumentMatchers.anyInt()))
230230
.thenReturn(uploadItem)
231-
whenever(uploadItem.uploadMediaDetails).thenReturn(listOf())
231+
whenever(uploadItem.uploadMediaDetails).thenReturn(mutableListOf())
232232

233233
uploadMediaPresenter.fetchTitleAndDescription(0)
234234
verify(view).updateMediaDetails(ArgumentMatchers.any())

0 commit comments

Comments
 (0)