Convert upload to kotlin (part 3) (commons-app#6104)

* Convert UploadCategoriesFragment to kotlin

* Convert UploadBaseFragment to kotlin

* Convert UploadItem to kotlin

* Convert UploadModel to kotlin

* Convert UploadMediaDetailAdapter to kotlin

* Convert UploadActivity to kotlin

* Convert UploadMediaPresenter to kotlin

* Convert UploadMediaDetailFragment to kotlin

* Fix NPE that broke uploads

Author: psh

app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt

@@ -101,7 +101,7 @@ data class Contribution constructor(
          */
         fun formatCaptions(uploadMediaDetails: List<UploadMediaDetail>) =
             uploadMediaDetails
-                .associate { it.languageCode!! to it.captionText }
+                .associate { it.languageCode!! to it.captionText!! }
                 .filter { it.value.isNotBlank() }
 
         /**
@@ -112,7 +112,7 @@ data class Contribution constructor(
          */
         fun formatDescriptions(descriptions: List<UploadMediaDetail>) =
             descriptions
-                .filter { it.descriptionText.isNotEmpty() }
+                .filter { !it.descriptionText.isNullOrEmpty() }
                 .joinToString(separator = "") { "{{${it.languageCode}|1=${it.descriptionText}}}" }
     }
 

app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt

@@ -1,7 +1,6 @@
 package fr.free.nrw.commons.description
 
 import android.app.ProgressDialog
-import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
 import android.speech.RecognizerIntent
@@ -72,7 +71,7 @@ class DescriptionEditActivity :
 
     private lateinit var binding: ActivityDescriptionEditBinding
 
-    private var descriptionAndCaptions: ArrayList<UploadMediaDetail>? = null
+    private var descriptionAndCaptions: MutableList<UploadMediaDetail>? = null
 
     private val voiceInputResultLauncher = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
@@ -114,22 +113,18 @@ class DescriptionEditActivity :
      * Initializes the RecyclerView
      * @param descriptionAndCaptions list of description and caption
      */
-    private fun initRecyclerView(descriptionAndCaptions: ArrayList<UploadMediaDetail>?) {
+    private fun initRecyclerView(descriptionAndCaptions: MutableList<UploadMediaDetail>?) {
         uploadMediaDetailAdapter =
             UploadMediaDetailAdapter(
                 this,
                 savedLanguageValue,
-                descriptionAndCaptions,
+                descriptionAndCaptions ?: mutableListOf(),
                 recentLanguagesDao,
                 voiceInputResultLauncher
             )
-        uploadMediaDetailAdapter.setCallback { titleStringID: Int, messageStringId: Int ->
-            showInfoAlert(
-                titleStringID,
-                messageStringId,
-            )
-        }
-        uploadMediaDetailAdapter.setEventListener(this)
+
+        uploadMediaDetailAdapter.callback = UploadMediaDetailAdapter.Callback(::showInfoAlert)
+        uploadMediaDetailAdapter.eventListener = this
         rvDescriptions = binding.rvDescriptionsCaptions
         rvDescriptions!!.layoutManager = LinearLayoutManager(this)
         rvDescriptions!!.adapter = uploadMediaDetailAdapter
@@ -272,11 +267,11 @@ class DescriptionEditActivity :
                             applicationContext,
                             media,
                             mediaDetail.languageCode!!,
-                            mediaDetail.captionText,
+                            mediaDetail.captionText!!,
                         ).subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe { s: Boolean? ->
-                            updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
+                            updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
                             media.captions = updatedCaptions
                             Timber.d("Caption is added.")
                         },

app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt

@@ -41,8 +41,8 @@ import fr.free.nrw.commons.location.LocationPermissionsHelper
 import fr.free.nrw.commons.location.LocationPermissionsHelper.LocationPermissionCallback
 import fr.free.nrw.commons.location.LocationServiceManager
 import fr.free.nrw.commons.theme.BaseActivity
-import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_LOCATION
-import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.LAST_ZOOM
+import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.Companion.LAST_LOCATION
+import fr.free.nrw.commons.upload.mediaDetails.UploadMediaDetailFragment.Companion.LAST_ZOOM
 import fr.free.nrw.commons.utils.DialogUtil
 import fr.free.nrw.commons.utils.MapUtils.ZOOM_LEVEL
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt

@@ -1569,7 +1569,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
         mediaDetail: UploadMediaDetail,
         updatedCaptions: MutableMap<String, String>
     ) {
-        updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
+        updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
         media!!.captions = updatedCaptions
     }
 

app/src/main/java/fr/free/nrw/commons/recentlanguages/RecentLanguagesAdapter.kt

@@ -17,7 +17,7 @@ import java.util.HashMap
 class RecentLanguagesAdapter constructor(
     context: Context,
     var recentLanguages: List<Language>,
-    private val selectedLanguages: HashMap<*, String>,
+    private val selectedLanguages: MutableMap<Int, String>,
 ) : ArrayAdapter<String?>(context, R.layout.row_item_languages_spinner) {
     /**
      * Selected language code in UploadMediaDetailAdapter

app/src/main/java/fr/free/nrw/commons/repository/UploadRepository.kt

@@ -46,7 +46,7 @@ class UploadRepository @Inject constructor(
      *
      * @return
      */
-    fun buildContributions(): Observable<Contribution>? {
+    fun buildContributions(): Observable<Contribution> {
         return uploadModel.buildContributions()
     }
 
@@ -69,7 +69,7 @@ class UploadRepository @Inject constructor(
      * @return
      */
     fun getUploads(): List<UploadItem> {
-        return uploadModel.getUploads()
+        return uploadModel.uploads
     }
 
     /**
@@ -177,7 +177,7 @@ class UploadRepository @Inject constructor(
         place: Place?,
         similarImageInterface: SimilarImageInterface?,
         inAppPictureLocation: LatLng?
-    ): Observable<UploadItem>? {
+    ): Observable<UploadItem> {
         return uploadModel.preProcessImage(
             uploadableFile,
             place,
@@ -193,7 +193,7 @@ class UploadRepository @Inject constructor(
      * @param location Location of the image
      * @return Quality of UploadItem
      */
-    fun getImageQuality(uploadItem: UploadItem, location: LatLng?): Single<Int>? {
+    fun getImageQuality(uploadItem: UploadItem, location: LatLng?): Single<Int> {
         return uploadModel.getImageQuality(uploadItem, location)
     }
 
@@ -213,7 +213,7 @@ class UploadRepository @Inject constructor(
      * @param uploadItem UploadItem whose caption is to be checked
      * @return Quality of caption of the UploadItem
      */
-    fun getCaptionQuality(uploadItem: UploadItem): Single<Int>? {
+    fun getCaptionQuality(uploadItem: UploadItem): Single<Int> {
         return uploadModel.getCaptionQuality(uploadItem)
     }
 
@@ -275,7 +275,7 @@ class UploadRepository @Inject constructor(
      * @param selectedExistingDepictions existing depicts
      */
     fun setSelectedExistingDepictions(selectedExistingDepictions: List<String>) {
-        uploadModel.selectedExistingDepictions = selectedExistingDepictions
+        uploadModel.selectedExistingDepictions = selectedExistingDepictions.toMutableList()
     }
 
     /**

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

@@ -52,7 +52,7 @@ class FileProcessor
          * Processes filePath coordinates, either from EXIF data or user location
          */
         fun processFileCoordinates(
-            similarImageInterface: SimilarImageInterface,
+            similarImageInterface: SimilarImageInterface?,
             filePath: String?,
             inAppPictureLocation: LatLng?,
         ): ImageCoordinates {
@@ -146,7 +146,7 @@ class FileProcessor
          */
         private fun findOtherImages(
             fileBeingProcessed: File,
-            similarImageInterface: SimilarImageInterface,
+            similarImageInterface: SimilarImageInterface?,
         ) {
             val oneHundredAndTwentySeconds = 120 * 1000L
             // Time when the original image was created
@@ -161,7 +161,7 @@ class FileProcessor
                 .map { Pair(it, readImageCoordinates(it)) }
                 .firstOrNull { it.second?.decimalCoords != null }
                 ?.let { fileCoordinatesPair ->
-                    similarImageInterface.showSimilarImageFragment(
+                    similarImageInterface?.showSimilarImageFragment(
                         fileBeingProcessed.path,
                         fileCoordinatesPair.first.absolutePath,
                         fileCoordinatesPair.second,

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

@@ -23,7 +23,7 @@ import java.util.Locale
  */
 class LanguagesAdapter constructor(
     context: Context,
-    private val selectedLanguages: HashMap<*, String>,
+    private val selectedLanguages: MutableMap<Int, String>,
 ) : ArrayAdapter<String?>(context, R.layout.row_item_languages_spinner) {
     companion object {
         /**