Skip to content

Commit c702921

Browse files
author
Thomas Horta
committed
Remove displayNameUpdatedWasNeeded variable (PR comments)
1 parent cfd0d99 commit c702921

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,24 +123,21 @@ public void onErrorResponse(VolleyError volleyError) {
123123
.get("read/menu", params, null, listener, errorListener);
124124
}
125125

126-
private boolean displayNameUpdateWasNeeded(ReaderTagList serverTopics) {
127-
boolean updateDone = false;
128-
126+
/**
127+
* Update the display names of the default tags (such as Subscribed and Discover) in the serverTopics list.
128+
*
129+
* @param serverTopics The list of default tags.
130+
*/
131+
private void updateDisplayNamesIfNeeded(@NonNull ReaderTagList serverTopics) {
129132
for (ReaderTag tag : serverTopics) {
130-
String tagNameBefore = tag.getTagDisplayName();
131133
if (tag.isFollowedSites()) {
132134
tag.setTagDisplayName(mContext.getString(R.string.reader_subscribed_display_name));
133-
if (!tagNameBefore.equals(tag.getTagDisplayName())) updateDone = true;
134135
} else if (tag.isDiscover()) {
135136
tag.setTagDisplayName(mContext.getString(R.string.reader_discover_display_name));
136-
if (!tagNameBefore.equals(tag.getTagDisplayName())) updateDone = true;
137137
} else if (tag.isPostsILike()) {
138138
tag.setTagDisplayName(mContext.getString(R.string.reader_my_likes_display_name));
139-
if (!tagNameBefore.equals(tag.getTagDisplayName())) updateDone = true;
140139
}
141140
}
142-
143-
return updateDone;
144141
}
145142

146143
private void handleUpdateTagsResponse(final JSONObject jsonObject) {
@@ -152,7 +149,7 @@ public void run() {
152149
ReaderTagList serverTopics = new ReaderTagList();
153150
serverTopics.addAll(parseTags(jsonObject, "default", ReaderTagType.DEFAULT));
154151

155-
boolean displayNameUpdateWasNeeded = displayNameUpdateWasNeeded(serverTopics);
152+
updateDisplayNamesIfNeeded(serverTopics);
156153

157154
serverTopics.addAll(parseTags(jsonObject, "subscribed", ReaderTagType.FOLLOWED));
158155

@@ -181,8 +178,7 @@ public void run() {
181178

182179
boolean didChangeFollowedTags = false;
183180
if (!localTopics.isSameList(serverTopics)) {
184-
AppLog.d(AppLog.T.READER, "reader service > followed topics changed "
185-
+ "updatedDisplayNames [" + displayNameUpdateWasNeeded + "]");
181+
AppLog.d(AppLog.T.READER, "reader service > followed topics changed");
186182

187183
if (!mAccountStore.hasAccessToken()) {
188184
// Do not delete locally saved tags for logged out user

0 commit comments

Comments
 (0)