From aee2e0d0497b8463699f6406e0f11e6ec846dd60 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Wed, 10 Feb 2016 10:04:15 +0800 Subject: [PATCH] fixed #346 --- .../twidere/fragment/support/AbsActivitiesFragment.java | 6 ++++-- .../twidere/fragment/support/AbsStatusesFragment.java | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsActivitiesFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsActivitiesFragment.java index a8c56a760..2e68af1ba 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsActivitiesFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsActivitiesFragment.java @@ -259,9 +259,9 @@ public abstract class AbsActivitiesFragment extends AbsContentListRecycler } else { lastVisiblePos = layoutManager.findFirstVisibleItemPosition(); } - final int activityStartIndex = adapter.getActivityStartIndex(); - final int activityEndIndex = activityStartIndex + adapter.getActivityCount(); if (lastVisiblePos != RecyclerView.NO_POSITION && lastVisiblePos < adapter.getItemCount()) { + final int activityStartIndex = adapter.getActivityStartIndex(); + final int activityEndIndex = activityStartIndex + adapter.getActivityCount(); final int lastItemIndex = Math.min(activityEndIndex, lastVisiblePos); lastReadId = adapter.getTimestamp(lastItemIndex); final View positionView = layoutManager.findViewByPosition(lastItemIndex); @@ -275,6 +275,8 @@ public abstract class AbsActivitiesFragment extends AbsContentListRecycler } adapter.setData(data); setRefreshEnabled(true); + final int activityStartIndex = adapter.getActivityStartIndex(); + final int activityEndIndex = activityStartIndex + adapter.getActivityCount(); if (!(loader instanceof IExtendedLoader) || ((IExtendedLoader) loader).isFromUser()) { adapter.setLoadMoreSupportedPosition(hasMoreData(data) ? IndicatorPosition.END : IndicatorPosition.NONE); int pos = -1; diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java index 2e3cbcdce..40cfc1487 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java @@ -269,9 +269,9 @@ public abstract class AbsStatusesFragment extends AbsContentListRecyclerVi } else { lastVisiblePos = layoutManager.findFirstVisibleItemPosition(); } - final int statusStartIndex = adapter.getStatusStartIndex(); - final int statusEndIndex = statusStartIndex + adapter.getStatusCount(); if (lastVisiblePos != RecyclerView.NO_POSITION && lastVisiblePos < adapter.getItemCount()) { + final int statusStartIndex = adapter.getStatusStartIndex(); + final int statusEndIndex = statusStartIndex + adapter.getStatusCount(); final int lastItemIndex = Math.min(statusEndIndex, lastVisiblePos); lastReadId = adapter.getStatusId(lastItemIndex); final View positionView = layoutManager.findViewByPosition(lastItemIndex); @@ -285,6 +285,8 @@ public abstract class AbsStatusesFragment extends AbsContentListRecyclerVi } adapter.setData(data); setRefreshEnabled(true); + final int statusStartIndex = adapter.getStatusStartIndex(); + final int statusEndIndex = statusStartIndex + adapter.getStatusCount(); if (!(loader instanceof IExtendedLoader) || ((IExtendedLoader) loader).isFromUser()) { adapter.setLoadMoreSupportedPosition(hasMoreData(data) ? IndicatorPosition.END : IndicatorPosition.NONE); int pos = -1;