Migrated helper modules to kotlin (commons-app#6007)

* Rename .java to .kt * Migrated delete and description module to kotlin (WIP) * Fix: Unit tests * Fix: Unit tests * Rename .java to .kt * Migrated data, db, and converter module to kotlin * Fix: Unit tests * Fix: Unit tests --------- Co-authored-by: Nicolas Raoul <[email protected]>
neeldoshii · Dec 10, 2024 · 3030a6f · 3030a6f
1 parent 7331197
commit 3030a6f
Show file tree

Hide file tree

Showing 18 changed files with 1,169 additions and 974 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.kt b/app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.kt
@@ -372,16 +372,18 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
      */
     private fun removeLocationFromImage() {
         media?.let {
-            compositeDisposable.add(
-                coordinateEditHelper.makeCoordinatesEdit(
-                    applicationContext, it, "0.0", "0.0", "0.0f"
-                )
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe { _ ->
-                        Timber.d("Coordinates removed from the image")
-                    }
+            coordinateEditHelper.makeCoordinatesEdit(
+                applicationContext, it, "0.0", "0.0", "0.0f"
             )
+                ?.subscribeOn(Schedulers.io())
+                ?.observeOn(AndroidSchedulers.mainThread())
+                ?.subscribe { _ ->
+                    Timber.d("Coordinates removed from the image")
+                }?.let { it1 ->
+                    compositeDisposable.add(
+                        it1
+                    )
+                }
         }
         setResult(RESULT_OK, Intent())
         finish()
@@ -473,19 +475,21 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
     fun updateCoordinates(latitude: String, longitude: String, accuracy: String) {
         media?.let {
             try {
-                compositeDisposable.add(
-                    coordinateEditHelper.makeCoordinatesEdit(
-                        applicationContext,
-                        it,
-                        latitude,
-                        longitude,
-                        accuracy
-                    ).subscribeOn(Schedulers.io())
-                        .observeOn(AndroidSchedulers.mainThread())
-                        .subscribe { _ ->
-                            Timber.d("Coordinates updated")
-                        }
-                )
+                coordinateEditHelper.makeCoordinatesEdit(
+                    applicationContext,
+                    it,
+                    latitude,
+                    longitude,
+                    accuracy
+                )?.subscribeOn(Schedulers.io())
+                    ?.observeOn(AndroidSchedulers.mainThread())
+                    ?.subscribe { _ ->
+                        Timber.d("Coordinates updated")
+                    }?.let { it1 ->
+                        compositeDisposable.add(
+                            it1
+                        )
+                    }
             } catch (e: Exception) {
                 if (e.localizedMessage == CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE) {
                     val username = sessionManager.userName

diff --git a/app/src/main/java/fr/free/nrw/commons/coordinates/CoordinateEditHelper.java b/app/src/main/java/fr/free/nrw/commons/coordinates/CoordinateEditHelper.java