mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix java.lang.NullPointerException for username in ContributionBoundaryCallback (#5003)

Browse source
This commit is contained in:
Madhur Gupta 2022-07-05 14:24:15 +05:30 • committed by GitHub
parent d8e4c038e0
commit 5fe1ad84a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/fr/free/nrw/commons/contributions/ContributionBoundaryCallback.kt
View file

@ -21,7 +21,7 @@ class ContributionBoundaryCallback @Inject constructor(
@param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler @param:Named(CommonsApplicationModule.IO_THREAD) private val ioThreadScheduler: Scheduler
) : BoundaryCallback<Contribution>() { ) : BoundaryCallback<Contribution>() {
private val compositeDisposable: CompositeDisposable = CompositeDisposable() private val compositeDisposable: CompositeDisposable = CompositeDisposable()
lateinit var userName: String var userName: String? = null
/** /**
@ -53,13 +53,13 @@ class ContributionBoundaryCallback @Inject constructor(
/** /**
* Fetches contributions using the MediaWiki API * Fetches contributions using the MediaWiki API
*/ */
fun fetchContributions() { private fun fetchContributions() {
if (sessionManager.userName != null) { if (sessionManager.userName != null) {
compositeDisposable.add( userName?.let { userName ->
mediaClient.getMediaListForUser(userName!!) mediaClient.getMediaListForUser(userName)
.map { mediaList -> .map { mediaList ->
mediaList.map { mediaList.map { media ->
Contribution(media = it, state = Contribution.STATE_COMPLETED) Contribution(media = media, state = Contribution.STATE_COMPLETED)
} }
} }
.subscribeOn(ioThreadScheduler) .subscribeOn(ioThreadScheduler)
@ -69,11 +69,13 @@ class ContributionBoundaryCallback @Inject constructor(
error.message error.message
) )
} }
) }?.let {
}else { compositeDisposable.add(
if (compositeDisposable != null){ it
compositeDisposable.clear() )
} }
}else {
compositeDisposable.clear()
} }
} }