Skip to content

Commit 2e053ea

Browse files
committed
Fix crash when refreshing feed
1 parent cb1a138 commit 2e053ea

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
9797

9898
private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null
9999
private var updateListViewModeOnResume = false
100+
private var isRefreshing = false
100101

101102
init {
102103
setHasOptionsMenu(true)
@@ -268,6 +269,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
268269
feedBinding.refreshRootView.animate(false, 0)
269270
feedBinding.loadingProgressText.animate(true, 200)
270271
feedBinding.swipeRefreshLayout.isRefreshing = true
272+
isRefreshing = true
271273
}
272274

273275
override fun hideLoading() {
@@ -276,6 +278,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
276278
feedBinding.refreshRootView.animate(true, 200)
277279
feedBinding.loadingProgressText.animate(false, 0)
278280
feedBinding.swipeRefreshLayout.isRefreshing = false
281+
isRefreshing = false
279282
}
280283

281284
override fun showEmptyState() {
@@ -302,6 +305,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
302305
feedBinding.refreshRootView.animate(false, 0)
303306
feedBinding.loadingProgressText.animate(false, 0)
304307
feedBinding.swipeRefreshLayout.isRefreshing = false
308+
isRefreshing = false
305309
}
306310

307311
private fun handleProgressState(progressState: FeedState.ProgressState) {
@@ -363,7 +367,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
363367

364368
private val listenerStreamItem = object : OnItemClickListener, OnItemLongClickListener {
365369
override fun onItemClick(item: Item<*>, view: View) {
366-
if (item is StreamItem && !feedBinding.swipeRefreshLayout.isRefreshing) {
370+
if (item is StreamItem && !isRefreshing) {
367371
val stream = item.streamWithState.stream
368372
NavigationHelper.openVideoDetailFragment(
369373
requireContext(), fm,
@@ -373,7 +377,7 @@ class FeedFragment : BaseStateFragment<FeedState>() {
373377
}
374378

375379
override fun onItemLongClick(item: Item<*>, view: View): Boolean {
376-
if (item is StreamItem && !feedBinding.swipeRefreshLayout.isRefreshing) {
380+
if (item is StreamItem && !isRefreshing) {
377381
showStreamDialog(item.streamWithState.stream.toStreamInfoItem())
378382
return true
379383
}

0 commit comments

Comments
 (0)