From 7c32f57c31ebb67e4f7726f9fd7fdc2c764c8c8c Mon Sep 17 00:00:00 2001 From: knightshade Date: Tue, 6 Mar 2018 23:05:01 +0530 Subject: [PATCH 1/3] 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) { From 2ae46a4c337f6ef1586fbeec21b4f407d477690b Mon Sep 17 00:00:00 2001 From: knightshade Date: Wed, 7 Mar 2018 16:06:36 +0530 Subject: [PATCH 2/3] Modified the code to only function in beta build variant. --- .../contributions/ContributionsActivity.java | 28 +++++++++++++++++-- .../ContributionsListFragment.java | 9 ++++-- 2 files changed, 32 insertions(+), 5 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 52f6da4c1..a84450275 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 @@ -26,6 +26,7 @@ import javax.inject.Inject; import javax.inject.Named; import butterknife.ButterKnife; +import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.HandlerService; import fr.free.nrw.commons.Media; import fr.free.nrw.commons.R; @@ -139,6 +140,12 @@ public class ContributionsActivity requestAuthToken(); initDrawer(); setTitle(getString(R.string.title_activity_contributions)); + + if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ + Timber.d("setUploadCount()"); + setUploadCount(); + } + } @Override @@ -265,11 +272,26 @@ public class ContributionsActivity } @SuppressWarnings("ConstantConditions") - public void setUploadCount(int uploadCount) { - getSupportActionBar().setSubtitle(getResources() - .getQuantityString(R.plurals.contributions_subtitle, uploadCount, uploadCount)); + 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 betaSetUploadCount(int betaUploadCount){ + Timber.d("" + betaUploadCount); + getSupportActionBar().setSubtitle(getResources() + .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount)); + } + + @Override public void notifyDatasetChanged() { // Do nothing for now 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 8878d13b9..e95b83203 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 @@ -27,6 +27,7 @@ import javax.inject.Named; import butterknife.BindView; import butterknife.ButterKnife; +import fr.free.nrw.commons.BuildConfig; import fr.free.nrw.commons.R; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.nearby.NearbyActivity; @@ -88,8 +89,12 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { public void setAdapter(ListAdapter adapter) { this.contributionsList.setAdapter(adapter); - Timber.d("ContributionsListFragment -> " + adapter.getCount()); - ((ContributionsActivity) getActivity()).setUploadCount(adapter.getCount()); + Timber.d("" + adapter.getCount()); + + if(BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ + Timber.d("betaBuild : adapter count -> " + adapter.getCount()); + ((ContributionsActivity) getActivity()).betaSetUploadCount(adapter.getCount()); + } } public void changeProgressBarVisibility(boolean isVisible) { From cc02da85828a087331f3746fb904be48b0a6bde0 Mon Sep 17 00:00:00 2001 From: knightshade Date: Sun, 11 Mar 2018 11:03:14 +0530 Subject: [PATCH 3/3] Removed debug logs used in development. --- .../free/nrw/commons/contributions/ContributionsActivity.java | 2 -- .../nrw/commons/contributions/ContributionsListFragment.java | 2 -- 2 files changed, 4 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 a84450275..ad6cff606 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 @@ -142,7 +142,6 @@ public class ContributionsActivity setTitle(getString(R.string.title_activity_contributions)); if(!BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ - Timber.d("setUploadCount()"); setUploadCount(); } @@ -286,7 +285,6 @@ public class ContributionsActivity } public void betaSetUploadCount(int betaUploadCount){ - Timber.d("" + betaUploadCount); getSupportActionBar().setSubtitle(getResources() .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount)); } 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 e95b83203..12ced5f75 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 @@ -89,10 +89,8 @@ public class ContributionsListFragment extends CommonsDaggerSupportFragment { public void setAdapter(ListAdapter adapter) { this.contributionsList.setAdapter(adapter); - Timber.d("" + adapter.getCount()); if(BuildConfig.FLAVOR.equalsIgnoreCase("beta")){ - Timber.d("betaBuild : adapter count -> " + adapter.getCount()); ((ContributionsActivity) getActivity()).betaSetUploadCount(adapter.getCount()); } }