From 187f4e5d8a2df6463771035fd4e13d1a0cf2a5d9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 17 May 2025 14:09:59 +0300 Subject: fix crash on startup if getPositionOf is requested for null feed (i.e. no feed is open) --- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'org.fox.ttrss/src') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index e6daed4b..87bdc96f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -559,17 +559,21 @@ public class FeedsFragment extends Fragment implements OnSharedPreferenceChangeL } public int getPositionOf(Feed feed) { - List feeds = getCurrentList(); - - return IntStream.range(0, feeds.size()) - .sequential() - .filter(i -> { - Feed f = feeds.get(i); + if (feed != null) { + List feeds = getCurrentList(); + + return IntStream.range(0, feeds.size()) + .sequential() + .filter(i -> { + Feed f = feeds.get(i); + + return f.id == feed.id && f.is_cat == feed.is_cat; + }) + .findFirst() + .orElse(-1); + } - return f.id == feed.id && f.is_cat == feed.is_cat; - }) - .findFirst() - .orElse(-1); + return -1; } } -- cgit v1.2.3-54-g00ecf