public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1479 Load muted feeds

Browse source
This commit is contained in:
Andrei 2021-05-16 18:31:17 -07:00
parent aa1c918232
commit 7a25d3bbf2
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clients/android/NewsBlur/res/values/strings.xml
View file

@ -233,7 +233,6 @@
<string name="empty_list_view_loading">Loading…</string>
<string name="empty_list_view_no_stories">No stories to read</string>
<string name="empty_list_view_no_stories_unread">No unread stories</string>
<string name="empty_list_view_muted_feed">Feed is muted</string>
<string name="empty_list_view_no_unread_stories">You have no unread stories.</string>
<string name="empty_list_view_no_focus_stories">You have no unread stories in Focus mode.\n\nSwitch to All or Unread.</string>

17
clients/android/NewsBlur/src/com/newsblur/fragment/ItemSetFragment.java
View file

@ -198,8 +198,6 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC
}
protected void triggerRefresh(int desiredStoryCount, Integer totalSeen) {
if (getFeedSet().isMuted()) return;
// ask the sync service for as many stories as we want
boolean gotSome = NBSyncService.requestMoreForFeed(getFeedSet(), desiredStoryCount, totalSeen);
// if the service thinks it can get more, or if we haven't even seen a cursor yet, start the service
@ -234,7 +232,7 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC
}
public void hasUpdated() {
if (isAdded() && !getFeedSet().isMuted()) {
if (isAdded()) {
LoaderManager.getInstance(this).restartLoader(ITEMLIST_LOADER , null, this);
}
}
@ -248,11 +246,9 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC
try {
getActivity().finish();
} catch (Exception e) {
;
}
return FeedUtils.dbHelper.getNullLoader();
} else if (fs.isMuted()) {
return FeedUtils.dbHelper.getNullLoader();
} else {
return FeedUtils.dbHelper.getActiveStoriesLoader(getFeedSet());
}
@ -299,15 +295,6 @@ public class ItemSetFragment extends NbFragment implements LoaderManager.LoaderC
private void updateLoadingIndicators() {
calcFleuronPadding();
if (getFeedSet().isMuted()) {
binding.emptyViewText.setText(R.string.empty_list_view_muted_feed);
binding.emptyViewText.setTypeface(binding.emptyViewText.getTypeface(), Typeface.NORMAL);
binding.emptyViewImage.setVisibility(View.VISIBLE);
binding.topLoadingThrob.setVisibility(View.INVISIBLE);
bottomProgressView.setVisibility(View.INVISIBLE);
return;
}
if (cursorSeenYet && adapter.getRawStoryCount() > 0 && UIUtils.needsPremiumAccess(requireContext(), getFeedSet())) {
fleuronBinding.getRoot().setVisibility(View.VISIBLE);
fleuronBinding.containerSubscribe.setVisibility(View.VISIBLE);