Skip to content

Commit 7788423

Browse files
committed
Convert MwQueryPage to kotlin
1 parent 9d06bd1 commit 7788423

File tree

9 files changed

+244
-244
lines changed

9 files changed

+244
-244
lines changed

app/src/main/java/fr/free/nrw/commons/review/ReviewActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ class ReviewActivity : BaseActivity() {
201201
val caption = getString(
202202
R.string.review_is_uploaded_by,
203203
fileName,
204-
revision.user
204+
revision.user()
205205
)
206206
binding.tvImageCaption.text = caption
207207
binding.pbReviewImage.visibility = View.GONE

app/src/main/java/fr/free/nrw/commons/review/ReviewController.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
1212
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
1313

1414
import java.util.ArrayList
15-
import java.util.concurrent.Callable
1615

1716
import javax.inject.Inject
1817
import javax.inject.Named
@@ -27,7 +26,6 @@ import fr.free.nrw.commons.delete.DeleteHelper
2726
import fr.free.nrw.commons.di.ApplicationlessInjection
2827
import fr.free.nrw.commons.utils.ViewUtil
2928
import io.reactivex.Observable
30-
import io.reactivex.ObservableSource
3129
import io.reactivex.android.schedulers.AndroidSchedulers
3230
import io.reactivex.schedulers.Schedulers
3331
import timber.log.Timber
@@ -175,7 +173,7 @@ class ReviewController @Inject constructor(
175173
if (firstRevision == null) return
176174

177175
Observable.defer {
178-
thanksClient.thank(firstRevision!!.revisionId)
176+
thanksClient.thank(firstRevision!!.revisionId())
179177
}
180178
.subscribeOn(Schedulers.io())
181179
.observeOn(AndroidSchedulers.mainThread())

app/src/main/java/fr/free/nrw/commons/review/ReviewHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ReviewHelper
3434
reviewInterface
3535
.getRecentChanges()
3636
.map { it.query()?.pages() }
37-
.map(MutableList<MwQueryPage>::shuffled)
37+
.map { it.shuffled() }
3838
.flatMapIterable { changes: List<MwQueryPage>? -> changes }
3939
.filter { isChangeReviewable(it) }
4040

app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@ package fr.free.nrw.commons.review
33
import android.graphics.Color
44
import android.os.Bundle
55
import android.text.Html
6-
import android.text.TextUtils
76
import android.view.LayoutInflater
87
import android.view.View
98
import android.view.ViewGroup
109
import fr.free.nrw.commons.CommonsApplication
11-
import fr.free.nrw.commons.Media
1210
import fr.free.nrw.commons.R
1311
import fr.free.nrw.commons.auth.SessionManager
1412
import fr.free.nrw.commons.auth.csrf.InvalidLoginTokenException
1513
import fr.free.nrw.commons.databinding.FragmentReviewImageBinding
1614
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment
17-
import java.util.ArrayList
1815
import javax.inject.Inject
1916

2017

@@ -126,7 +123,7 @@ class ReviewImageFragment : CommonsDaggerSupportFragment() {
126123
enableButtons()
127124
question = getString(R.string.review_thanks)
128125

129-
user = reviewActivity.reviewController.firstRevision?.user
126+
user = reviewActivity.reviewController.firstRevision?.user()
130127
?: savedInstanceState?.getString(SAVED_USER)
131128

132129
//if the user is null because of whatsoever reason, review will not be sent anyways

app/src/main/java/fr/free/nrw/commons/wikidata/mwapi/MwQueryPage.java

Lines changed: 0 additions & 229 deletions
This file was deleted.

0 commit comments

Comments
 (0)