Refresh tags chip count when subscribed status changes in manage tags…

… & blogs screen
wordpress-mobile · Feb 9, 2024 · e2dd699 · e2dd699
1 parent 4c494c8
commit e2dd699
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java
@@ -176,8 +176,7 @@ private void setResult() {
  boolean shouldRefreshSubscriptions = false;
  if (mPageAdapter != null) {
  final ReaderTagFragment readerTagFragment = mPageAdapter.getReaderTagFragment();
- final ReaderBlogFragment readerBlogFragment = mPageAdapter.getReaderBlogFragment();
- if (readerTagFragment != null && readerBlogFragment != null) {
+ if (readerTagFragment != null) {
  shouldRefreshSubscriptions = readerTagFragment.hasChangedSelectedTags();
  }
  }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTagFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTagFragment.java
@@ -49,10 +49,10 @@ public boolean hasChangedSelectedTags() {
  for (final ReaderTag readerTag : mInitialReaderTagList) {
  initialTagsSlugs.add(readerTag.getTagSlug());
  }
- final List<ReaderTag> currentReaderTagList = getTagAdapter().getItems();
+ final List<ReaderTag> currentlySubscribedReaderTagList = getTagAdapter().getSubscribedItems();
  final Set<String> currentTagsSlugs = new HashSet<>();
- if (currentReaderTagList != null) {
- for (final ReaderTag readerTag : currentReaderTagList) {
+ if (currentlySubscribedReaderTagList != null) {
+ for (final ReaderTag readerTag : currentlySubscribedReaderTagList) {
  currentTagsSlugs.add(readerTag.getTagSlug());
  }
  }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderTagAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderTagAdapter.java
@@ -102,6 +102,17 @@ public ReaderTagList getItems() {
  return mTags;
  }
 
+ @Nullable
+ public ReaderTagList getSubscribedItems() {
+ final ReaderTagList readerSubscribedTagsList = new ReaderTagList();
+ for (final ReaderTag readerTag : mTags) {
+ if (Boolean.TRUE.equals(mBlogIdIsFollowedMap.get(readerTag.getTagSlug()))) {
+ readerSubscribedTagsList.add(readerTag);
+ }
+ }
+ return readerSubscribedTagsList;
+ }
+
  @Override
  public void onBindViewHolder(TagViewHolder holder, int position) {
  final ReaderTag tag = mTags.get(position);