Skip to content

Fix RxJava UndeliverableException crashes across codebase #6860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Roniscend wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix RxJava UndeliverableException crashes across codebase #6860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ class ContributionBoundaryCallback
repository
.save(contributions)
.subscribeOn(ioThreadScheduler)
.subscribe { longs: List<Long?>? ->
.subscribe({ longs: List<Long?>? ->
onRefreshFinish()
repository["last_fetch_timestamp"] = System.currentTimeMillis()
},
}, { Timber.e(it) }),
)
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }))
}

/**
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -63,10 +63,10 @@ class ContributionsPresenter @Inject internal constructor(
contributionsRepository
.deleteContributionFromDB(contribution)
.subscribeOn(ioThreadScheduler)
.subscribe()
.subscribe({ }, { Timber.e(it) })
)
}
})
}, { Timber.e(it) }))
}
Comment thread
Roniscend marked this conversation as resolved.

/**
Expand All @@ -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) }))
}
Comment thread
Roniscend marked this conversation as resolved.
}
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) })
}

/**
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class DescriptionEditActivity :
updatedWikiText,
).subscribeOn(Schedulers.io())
?.observeOn(AndroidSchedulers.mainThread())
?.subscribe(Consumer<Boolean> { s: Boolean? -> Timber.d("Descriptions are added.") })
?.subscribe({ s: Boolean? -> Timber.d("Descriptions are added.") }, { Timber.e(it) })
?.let {
compositeDisposable.add(
it,
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/explore/paging/PagingDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ abstract class PagingDataSource<T>(
Completable
.fromAction { lastExecutedRequest?.invoke() }
.subscribeOn(Schedulers.io())
.subscribe()
.subscribe({ }, { Timber.e(it) })
}
}

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/locationpicker/LocationPickerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down Expand Up @@ -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
)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) })
)
}

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }))
Comment thread
Roniscend marked this conversation as resolved.
}

private fun restoreStoredFilterSelection() {
Expand Down Expand Up @@ -1821,7 +1821,7 @@ class NearbyParentFragment : CommonsDaggerSupportFragment(),
}

fun savePlaceToDatabase(place: Place?) {
Comment thread
Roniscend marked this conversation as resolved.
placesRepository?.save(place)?.subscribeOn(Schedulers.io())?.subscribe()?.let {
placesRepository?.save(place)?.subscribeOn(Schedulers.io())?.subscribe({ }, { Timber.e(it) })?.let {
compositeDisposable.add(
it
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/nearby/presenter/NearbyParentFragmentPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ class NearbyParentFragmentPresenter
placesRepository
.save(finalPlaceGroup.place)
.subscribeOn(Schedulers.io())
.subscribe()
.subscribe({ }, { Timber.e(it) })
}
}

Expand Down
9 changes: 5 additions & 4 deletions app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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) })
)
}

Expand Down Expand Up @@ -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(
Expand All @@ -207,7 +208,7 @@ class ReviewActivity : BaseActivity() {
binding.pbReviewImage.visibility = View.GONE
reviewImageFragment = getInstanceOfReviewImageFragment()
reviewImageFragment?.enableButtons()
}
}, { Timber.e(it) })
)
binding.viewPagerReview.currentItem = 0
}
Expand Down
30 changes: 15 additions & 15 deletions app/src/main/java/fr/free/nrw/commons/upload/PendingUploadsPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ import javax.inject.Named
contributionsRepository
.deleteContributionFromDB(it)
.subscribeOn(ioThreadScheduler)
.subscribe()
.subscribe({ }, { Timber.e(it) })
}?.let {
compositeDisposable.add(
it
Expand All @@ -113,7 +113,7 @@ import javax.inject.Named
STATE_PAUSED
)
.subscribeOn(ioThreadScheduler)
.subscribe()
.subscribe({ }, { Timber.e(it) })
)
}

Expand All @@ -127,7 +127,7 @@ import javax.inject.Named
contributionsRepository
.deleteContributionsFromDBWithStates(states)
.subscribeOn(ioThreadScheduler)
.subscribe()
.subscribe({ }, { Timber.e(it) })
)
}

Expand Down Expand Up @@ -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(
Expand All @@ -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)
Expand All @@ -196,9 +196,9 @@ import javax.inject.Named
.doOnComplete {
restartUploads(contributionList, index + 1, context)
}
.subscribe {
.subscribe({
makeOneTimeWorkRequest(context, ExistingWorkPolicy.KEEP)
}
}, { Timber.e(it) })
)
}
}
Expand Down Expand Up @@ -229,36 +229,36 @@ 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")
compositeDisposable.add(
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) })
)
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class CategoriesPresenter
repository.getPlaceCategories()
.subscribeOn(ioScheduler)
.observeOn(mainThreadScheduler)
.subscribe(::selectNewCategories),
.subscribe(::selectNewCategories, { Timber.e(it) }),
)
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/fr/free/nrw/commons/upload/depicts/DepictsPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class DepictsPresenter
repository.getPlaceDepictions()
.subscribeOn(ioScheduler)
.observeOn(mainThreadScheduler)
.subscribe(::selectNewDepictions),
.subscribe(::selectNewDepictions, { Timber.e(it) }),
)
}

Expand Down
Loading