From 1dc0a7c257d9f93162dd90fb4bfe95a09c4e75bb Mon Sep 17 00:00:00 2001 From: Vivek Maskara Date: Thu, 14 Jun 2018 14:42:46 +0530 Subject: [PATCH] Fix resource not found exception with null checks (#1628) --- .../contributions/ContributionsActivity.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 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 312839a24..c39fbb06e 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 @@ -275,17 +275,25 @@ public class ContributionsActivity .getUploadCount(sessionManager.getCurrentAccount().name) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - uploadCount -> getSupportActionBar().setSubtitle(getResources() - .getQuantityString(R.plurals.contributions_subtitle, - uploadCount, uploadCount)), + .subscribe(this::displayUploadCount, t -> Timber.e(t, "Fetching upload count failed") )); } - public void betaSetUploadCount(int betaUploadCount){ + private void displayUploadCount(Integer uploadCount) { + if (isFinishing() + || getSupportActionBar() == null + || getResources() == null) { + return; + } + getSupportActionBar().setSubtitle(getResources() - .getQuantityString(R.plurals.contributions_subtitle, betaUploadCount, betaUploadCount)); + .getQuantityString(R.plurals.contributions_subtitle, + uploadCount, uploadCount)); + } + + public void betaSetUploadCount(int betaUploadCount) { + displayUploadCount(betaUploadCount); }