Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1427 from TomHennen/fix_scoll_position 

only restore scoll position if we're starting or resuming
This commit is contained in:
Tom Hennen 2015-11-28 11:35:36 -05:00
parent cc93cd8600 b5a753c1cd
commit 99f7aaa228
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java
View File

@ -100,7 +100,7 @@ public class QueueFragment extends Fragment {
public void onStart() {
super.onStart();
if (queue != null) {
onFragmentLoaded();
onFragmentLoaded(true);
}
}
@ -108,7 +108,7 @@ public class QueueFragment extends Fragment {
public void onResume() {
super.onResume();
recyclerView.setAdapter(recyclerAdapter);
loadItems();
loadItems(true);
EventDistributor.getInstance().register(contentUpdate);
EventBus.getDefault().registerSticky(this);
}
@ -156,7 +156,7 @@ public class QueueFragment extends Fragment {
return;
}
saveScrollPosition();
onFragmentLoaded();
onFragmentLoaded(false);
}
public void onEventMainThread(FeedItemEvent event) {
@ -450,7 +450,7 @@ public class QueueFragment extends Fragment {
return root;
}
private void onFragmentLoaded() {
private void onFragmentLoaded(final boolean restoreScrollPosition) {
if (recyclerAdapter == null) {
MainActivity activity = (MainActivity) getActivity();
recyclerAdapter = new QueueRecyclerAdapter(activity, itemAccess,
@ -465,7 +465,9 @@ public class QueueFragment extends Fragment {
recyclerView.setVisibility(View.VISIBLE);
}
restoreScrollPosition();
if (restoreScrollPosition) {
restoreScrollPosition();
}
// we need to refresh the options menu because it sometimes
// needs data that may have just been loaded.
@ -554,7 +556,7 @@ public class QueueFragment extends Fragment {
public void update(EventDistributor eventDistributor, Integer arg) {
if ((arg & EVENTS) != 0) {
Log.d(TAG, "arg: " + arg);
loadItems();
loadItems(false);
if (isUpdatingFeeds != updateRefreshMenuItemChecker.isRefreshing()) {
getActivity().supportInvalidateOptionsMenu();
}
@ -562,7 +564,7 @@ public class QueueFragment extends Fragment {
}
};
private void loadItems() {
private void loadItems(final boolean restoreScrollPosition) {
Log.d(TAG, "loadItems()");
if(subscription != null) {
subscription.unsubscribe();
@ -579,7 +581,7 @@ public class QueueFragment extends Fragment {
if(items != null) {
progLoading.setVisibility(View.GONE);
queue = items;
onFragmentLoaded();
onFragmentLoaded(restoreScrollPosition);
if(recyclerAdapter != null) {
recyclerAdapter.notifyDataSetChanged();
}