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

Use JSON SPARQL query for fetching nearby places (#2398)

Browse source 
* Use JSON response for nearby places

* Move okhttp calls to a different class

* wip

* Fetch picture of the day using JSON API

* Search images using JSON APIs

* tests

* Fix injection based on code review comments
This commit is contained in:
Vivek Maskara 2019-02-06 10:40:30 +05:30 • committed by Ashish Kumar
parent 323527b3be
commit f12837650a
44 changed files with 1472 additions and 418 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
View file

@ -43,6 +43,7 @@ import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.mwapi.MediaWikiApi;
import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient;
import fr.free.nrw.commons.theme.NavigationBaseActivity;
import fr.free.nrw.commons.utils.ViewUtil;
import io.reactivex.Single;
@ -100,7 +101,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
@Inject
SessionManager sessionManager;
@Inject
MediaWikiApi mediaWikiApi;
OkHttpJsonApiClient okHttpJsonApiClient;
MenuItem item;
private CompositeDisposable compositeDisposable = new CompositeDisposable();
@ -201,7 +202,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
if (checkAccount()) {
try{
compositeDisposable.add(mediaWikiApi
compositeDisposable.add(okHttpJsonApiClient
.getAchievements(Objects.requireNonNull(sessionManager.getCurrentAccount()).name)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@ -247,7 +248,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
*/
private void setUploadCount(Achievements achievements) {
if (checkAccount()) {
compositeDisposable.add(mediaWikiApi
compositeDisposable.add(okHttpJsonApiClient
.getUploadCount(Objects.requireNonNull(sessionManager.getCurrentAccount()).name)
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())