From 36b8a19655720c1c402ba4fea1f9fec4d422e936 Mon Sep 17 00:00:00 2001 From: Owm Dubey Date: Fri, 17 Apr 2026 02:04:32 +0530 Subject: [PATCH] Fix:unhandled_Rxjava Signed-off-by: Owm Dubey --- .../ContributionBoundaryCallback.kt | 4 +-- .../contributions/ContributionViewHolder.kt | 4 +-- .../contributions/ContributionsPresenter.kt | 10 +++---- .../nrw/commons/contributions/MainActivity.kt | 6 ++-- .../description/DescriptionEditActivity.kt | 6 ++-- .../explore/paging/PagingDataSource.kt | 2 +- .../locationpicker/LocationPickerActivity.kt | 8 ++--- .../nrw/commons/media/MediaDetailFragment.kt | 4 +-- .../nearby/fragments/NearbyParentFragment.kt | 6 ++-- .../NearbyParentFragmentPresenter.kt | 2 +- .../free/nrw/commons/review/ReviewActivity.kt | 9 +++--- .../commons/upload/PendingUploadsPresenter.kt | 30 +++++++++---------- .../free/nrw/commons/upload/UploadActivity.kt | 4 +-- .../upload/categories/CategoriesPresenter.kt | 2 +- .../upload/depicts/DepictsPresenter.kt | 2 +- 15 files changed, 50 insertions(+), 49 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt index b5075a21e0c..683e965488b 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt @@ -106,10 +106,10 @@ class ContributionBoundaryCallback repository .save(contributions) .subscribeOn(ioThreadScheduler) - .subscribe { longs: List? -> + .subscribe({ longs: List? -> onRefreshFinish() repository["last_fetch_timestamp"] = System.currentTimeMillis() - }, + }, { Timber.e(it) }), ) } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt index 899ef458f6e..737227e8fe6 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt @@ -140,9 +140,9 @@ an upload might take a dozen seconds. */ mediaClient.doesPageContainMedia(wikipediaArticle) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe { mediaExists: Boolean -> + .subscribe({ mediaExists: Boolean -> displayWikipediaButton(mediaExists) - }) + }, { Timber.e(it) })) } /** diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt index 2a36101b93e..b07ca58f18e 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt @@ -53,7 +53,7 @@ class ContributionsPresenter @Inject internal constructor( contribution.contentUri, contribution.localUri) .subscribeOn(ioThreadScheduler) - .subscribe { imageCheckResult: Int -> + .subscribe({ imageCheckResult: Int -> if (imageCheckResult == ImageUtils.IMAGE_OK) { contribution.state = Contribution.STATE_QUEUED saveContribution(contribution) @@ -63,10 +63,10 @@ class ContributionsPresenter @Inject internal constructor( contributionsRepository .deleteContributionFromDB(contribution) .subscribeOn(ioThreadScheduler) - .subscribe() + .subscribe({ }, { Timber.e(it) }) ) } - }) + }, { Timber.e(it) })) } /** @@ -79,12 +79,12 @@ class ContributionsPresenter @Inject internal constructor( compositeDisposable!!.add(contributionsRepository .save(contribution) .subscribeOn(ioThreadScheduler) - .subscribe { + .subscribe({ view!!.getContext()?.applicationContext?.let { makeOneTimeWorkRequest( it, ExistingWorkPolicy.KEEP ) } - }) + }, { Timber.e(it) })) } } diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt index 923fa31a93e..ddcd9f0e2b5 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt @@ -331,7 +331,7 @@ after opening the app. contribution.dateUploadStarted = Calendar.getInstance().time Completable.fromAction { contributionDao!!.saveSynchronous(contribution) } .subscribeOn(Schedulers.io()) - .subscribe() + .subscribe({ }, { Timber.e(it) }) } makeOneTimeWorkRequest( this, ExistingWorkPolicy.APPEND_OR_REPLACE @@ -425,11 +425,11 @@ after opening the app. contributionDao ?.getContribution(listOf(Contribution.STATE_FAILED)) ?.subscribeOn(Schedulers.io()) - ?.subscribe { failedUploads -> + ?.subscribe({ failedUploads -> failedUploads.forEach { contribution -> contributionsFragment?.retryUpload(contribution) } - } + }, { Timber.e(it) }) } /** diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt index b1f1b7f9b8d..264c77be487 100644 --- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt @@ -244,7 +244,7 @@ class DescriptionEditActivity : updatedWikiText, ).subscribeOn(Schedulers.io()) ?.observeOn(AndroidSchedulers.mainThread()) - ?.subscribe(Consumer { s: Boolean? -> Timber.d("Descriptions are added.") }) + ?.subscribe({ s: Boolean? -> Timber.d("Descriptions are added.") }, { Timber.e(it) }) ?.let { compositeDisposable.add( it, @@ -277,11 +277,11 @@ class DescriptionEditActivity : mediaDetail.captionText, ).subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe { s: Boolean? -> + .subscribe({ s: Boolean? -> updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText media.captions = updatedCaptions Timber.d("Caption is added.") - }, + }, { Timber.e(it) }), ) } catch (e: InvalidLoginTokenException) { val username = sessionManager.userName diff --git a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt index 84dda5c38f9..466044d31c0 100644 --- a/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt +++ b/app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt @@ -61,7 +61,7 @@ abstract class PagingDataSource( Completable .fromAction { lastExecutedRequest?.invoke() } .subscribeOn(Schedulers.io()) - .subscribe() + .subscribe({ }, { Timber.e(it) }) } } 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 index 08dee587b36..697b9b6ae63 100644 --- a/app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt @@ -405,9 +405,9 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback { ) ?.subscribeOn(Schedulers.io()) ?.observeOn(AndroidSchedulers.mainThread()) - ?.subscribe { _ -> + ?.subscribe({ _ -> Timber.d("Coordinates removed from the image") - }?.let { it1 -> + }, { Timber.e(it) })?.let { it1 -> compositeDisposable.add( it1 ) @@ -524,9 +524,9 @@ class LocationPickerActivity : BaseActivity(), LocationPermissionCallback { accuracy )?.subscribeOn(Schedulers.io()) ?.observeOn(AndroidSchedulers.mainThread()) - ?.subscribe { _ -> + ?.subscribe({ _ -> Timber.d("Coordinates updated") - }?.let { it1 -> + }, { Timber.e(it) })?.let { it1 -> compositeDisposable.add( it1 ) diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt index 1ae954293fb..fe546af3871 100644 --- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt @@ -971,11 +971,11 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C reviewHelper.getFirstRevisionOfFile(fileName) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe { revision: Revision? -> + .subscribe({ revision: Revision? -> sendThanks( requireContext(), revision ) - } + }, { Timber.e(it) }) ) } diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt index 61dace3bb69..41919d84db7 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt +++ b/app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt @@ -1055,10 +1055,10 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), .takeUntil(RxView.detaches(binding!!.nearbyFilter.searchViewLayout.searchView)) .debounce(500, TimeUnit.MILLISECONDS) .observeOn(AndroidSchedulers.mainThread()) - .subscribe { query: CharSequence -> + .subscribe({ query: CharSequence -> (binding!!.nearbyFilterList.searchListView.adapter as NearbyFilterSearchRecyclerViewAdapter).filter .filter(query.toString()) - }) + }, { timber.log.Timber.e(it) })) } private fun restoreStoredFilterSelection() { @@ -1821,7 +1821,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(), } fun savePlaceToDatabase(place: Place?) { - placesRepository?.save(place)?.subscribeOn(Schedulers.io())?.subscribe()?.let { + placesRepository?.save(place)?.subscribeOn(Schedulers.io())?.subscribe({ }, { Timber.e(it) })?.let { compositeDisposable.add( it ) diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt index 9cd181234c3..5b7ec2adbfd 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt @@ -503,7 +503,7 @@ class NearbyParentFragmentPresenter placesRepository .save(finalPlaceGroup.place) .subscribeOn(Schedulers.io()) - .subscribe() + .subscribe({ }, { Timber.e(it) }) } } diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt index dccb77af1eb..6ca97a32ef5 100644 --- a/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt @@ -21,6 +21,7 @@ import fr.free.nrw.commons.utils.DialogUtil import fr.free.nrw.commons.utils.ViewUtil import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers +import timber.log.Timber import java.util.Locale import javax.inject.Inject @@ -148,13 +149,13 @@ class ReviewActivity : BaseActivity() { reviewHelper.checkFileUsage(media.filename) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe { result -> + .subscribe({ result -> if (!result) { findNonHiddenCategories(media) } else { runRandomizer() } - } + }, { Timber.e(it) }) ) } @@ -195,7 +196,7 @@ class ReviewActivity : BaseActivity() { reviewHelper.getFirstRevisionOfFile(fileName) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe { revision -> + .subscribe({ revision -> reviewController.firstRevision = revision reviewPagerAdapter.updateFileInformation() val caption = getString( @@ -207,7 +208,7 @@ class ReviewActivity : BaseActivity() { binding.pbReviewImage.visibility = View.GONE reviewImageFragment = getInstanceOfReviewImageFragment() reviewImageFragment?.enableButtons() - } + }, { Timber.e(it) }) ) binding.viewPagerReview.currentItem = 0 } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.kt index 5eeed2bc6a0..d4763149561 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.kt @@ -92,7 +92,7 @@ import javax.inject.Named contributionsRepository .deleteContributionFromDB(it) .subscribeOn(ioThreadScheduler) - .subscribe() + .subscribe({ }, { Timber.e(it) }) }?.let { compositeDisposable.add( it @@ -113,7 +113,7 @@ import javax.inject.Named STATE_PAUSED ) .subscribeOn(ioThreadScheduler) - .subscribe() + .subscribe({ }, { Timber.e(it) }) ) } @@ -127,7 +127,7 @@ import javax.inject.Named contributionsRepository .deleteContributionsFromDBWithStates(states) .subscribeOn(ioThreadScheduler) - .subscribe() + .subscribe({ }, { Timber.e(it) }) ) } @@ -167,11 +167,11 @@ import javax.inject.Named .doOnComplete { restartUploads(contributionList, index + 1, context) } - .subscribe { + .subscribe({ makeOneTimeWorkRequest( context, ExistingWorkPolicy.KEEP ) - }) + }, { Timber.e(it) })) } else { Timber.e("Contribution already exists") compositeDisposable.add( @@ -180,7 +180,7 @@ import javax.inject.Named .subscribeOn(ioThreadScheduler).doOnComplete { restartUploads(contributionList, index + 1, context) } - .subscribe()) + .subscribe({ }, { Timber.e(it) })) } }, { throwable: Throwable? -> Timber.e(throwable) @@ -196,9 +196,9 @@ import javax.inject.Named .doOnComplete { restartUploads(contributionList, index + 1, context) } - .subscribe { + .subscribe({ makeOneTimeWorkRequest(context, ExistingWorkPolicy.KEEP) - } + }, { Timber.e(it) }) ) } } @@ -229,16 +229,16 @@ import javax.inject.Named modifiedFilePath = contribution.localUri!! ) .subscribeOn(ioThreadScheduler) - .subscribe { imageCheckResult: Int -> + .subscribe({ imageCheckResult: Int -> if (imageCheckResult == IMAGE_OK) { contribution.state = STATE_QUEUED compositeDisposable.add( contributionsRepository .save(contribution) .subscribeOn(ioThreadScheduler) - .subscribe { + .subscribe({ makeOneTimeWorkRequest(context, ExistingWorkPolicy.KEEP) - } + }, { Timber.e(it) }) ) } else { Timber.e("Contribution already exists") @@ -246,19 +246,19 @@ import javax.inject.Named contributionsRepository .deleteContributionFromDB(contribution) .subscribeOn(ioThreadScheduler) - .subscribe() + .subscribe({ }, { Timber.e(it) }) ) } - }) + }, { Timber.e(it) })) } else { contribution.state = STATE_QUEUED compositeDisposable.add( contributionsRepository .save(contribution) .subscribeOn(ioThreadScheduler) - .subscribe { + .subscribe({ makeOneTimeWorkRequest(context, ExistingWorkPolicy.KEEP) - } + }, { Timber.e(it) }) ) } } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt index 97ef10a8749..310cb508b92 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt @@ -300,14 +300,14 @@ class UploadActivity : BaseActivity(), UploadContract.View, UploadBaseFragment.C .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .filter { result: Boolean? -> result!! } - .subscribe { _: Boolean? -> + .subscribe({ _: Boolean? -> showAlertDialog( this, getString(R.string.block_notification_title), getString(R.string.block_notification), getString(R.string.ok) ) { finish() } - }) + }, { Timber.e(it) })) } private fun checkStoragePermissions() { diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt index a1a96f2ac6c..ffddd3e43e6 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt @@ -328,7 +328,7 @@ class CategoriesPresenter repository.getPlaceCategories() .subscribeOn(ioScheduler) .observeOn(mainThreadScheduler) - .subscribe(::selectNewCategories), + .subscribe(::selectNewCategories, { Timber.e(it) }), ) } } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt index f356e74b1ba..e5948aac557 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt +++ b/app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt @@ -141,7 +141,7 @@ class DepictsPresenter repository.getPlaceDepictions() .subscribeOn(ioScheduler) .observeOn(mainThreadScheduler) - .subscribe(::selectNewDepictions), + .subscribe(::selectNewDepictions, { Timber.e(it) }), ) }