From 7c32f57c31ebb67e4f7726f9fd7fdc2c764c8c8c Mon Sep 17 00:00:00 2001 From: knightshade Date: Tue, 6 Mar 2018 23:05:01 +0530 Subject: [PATCH] Fixed upload count to show correct number of pictures upload by user in beta version of app. Fixes #1262 --- .../contributions/ContributionsActivity.java | 15 +++------------ .../contributions/ContributionsListFragment.java | 3 +++ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 5c1ecfaa0..52f6da4c1 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -139,7 +139,6 @@ public class ContributionsActivity requestAuthToken(); initDrawer(); setTitle(getString(R.string.title_activity_contributions)); - setUploadCount(); } @Override @@ -266,17 +265,9 @@ public class ContributionsActivity } @SuppressWarnings("ConstantConditions") - private void setUploadCount() { - compositeDisposable.add(mediaWikiApi - .getUploadCount(sessionManager.getCurrentAccount().name) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - uploadCount -> getSupportActionBar().setSubtitle(getResources() - .getQuantityString(R.plurals.contributions_subtitle, - uploadCount, uploadCount)), - t -> Timber.e(t, "Fetching upload count failed") - )); + public void setUploadCount(int uploadCount) { + getSupportActionBar().setSubtitle(getResources() + .getQuantityString(R.plurals.contributions_subtitle, uploadCount, uploadCount)); } @Override diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java index 25bf6eb93..8878d13b9 100644 --- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java +++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java @@ -56,6 +56,7 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { private ContributionController controller; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_contributions, container, false); @@ -87,6 +88,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { public void setAdapter(ListAdapter adapter) { this.contributionsList.setAdapter(adapter); + Timber.d("ContributionsListFragment -> " + adapter.getCount()); + ((ContributionsActivity) getActivity()).setUploadCount(adapter.getCount()); } public void changeProgressBarVisibility(boolean isVisible) {