Skip to content

Commit 3030a6f

Browse files
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 <nicolas.raoul@gmail.com>
1 parent 7331197 commit 3030a6f

18 files changed

+1169
-974
lines changed

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

+26-22
Original file line numberDiff line numberDiff line change
@@ -372,16 +372,18 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
372372
*/
373373
private fun removeLocationFromImage() {
374374
media?.let {
375-
compositeDisposable.add(
376-
coordinateEditHelper.makeCoordinatesEdit(
377-
applicationContext, it, "0.0", "0.0", "0.0f"
378-
)
379-
.subscribeOn(Schedulers.io())
380-
.observeOn(AndroidSchedulers.mainThread())
381-
.subscribe { _ ->
382-
Timber.d("Coordinates removed from the image")
383-
}
375+
coordinateEditHelper.makeCoordinatesEdit(
376+
applicationContext, it, "0.0", "0.0", "0.0f"
384377
)
378+
?.subscribeOn(Schedulers.io())
379+
?.observeOn(AndroidSchedulers.mainThread())
380+
?.subscribe { _ ->
381+
Timber.d("Coordinates removed from the image")
382+
}?.let { it1 ->
383+
compositeDisposable.add(
384+
it1
385+
)
386+
}
385387
}
386388
setResult(RESULT_OK, Intent())
387389
finish()
@@ -473,19 +475,21 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback {
473475
fun updateCoordinates(latitude: String, longitude: String, accuracy: String) {
474476
media?.let {
475477
try {
476-
compositeDisposable.add(
477-
coordinateEditHelper.makeCoordinatesEdit(
478-
applicationContext,
479-
it,
480-
latitude,
481-
longitude,
482-
accuracy
483-
).subscribeOn(Schedulers.io())
484-
.observeOn(AndroidSchedulers.mainThread())
485-
.subscribe { _ ->
486-
Timber.d("Coordinates updated")
487-
}
488-
)
478+
coordinateEditHelper.makeCoordinatesEdit(
479+
applicationContext,
480+
it,
481+
latitude,
482+
longitude,
483+
accuracy
484+
)?.subscribeOn(Schedulers.io())
485+
?.observeOn(AndroidSchedulers.mainThread())
486+
?.subscribe { _ ->
487+
Timber.d("Coordinates updated")
488+
}?.let { it1 ->
489+
compositeDisposable.add(
490+
it1
491+
)
492+
}
489493
} catch (e: Exception) {
490494
if (e.localizedMessage == CsrfTokenClient.ANONYMOUS_TOKEN_MESSAGE) {
491495
val username = sessionManager.userName

app/src/main/java/fr/free/nrw/commons/coordinates/CoordinateEditHelper.java

-187
This file was deleted.

0 commit comments

Comments
 (0)