Merge branch 'develop' into rxjava2

1 files changed, 8 insertions, 14 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
index d5dc851fb..e5fda97ce 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java
@@ -412,13 +412,10 @@ public class ItemlistFragment extends ListFragment {
 
     }
 
-    private boolean insideOnFragmentLoaded = false;
-
     private void onFragmentLoaded() {
         if(!isVisible()) {
             return;
         }
-        insideOnFragmentLoaded = true;
         if (adapter == null) {
             setListAdapter(null);
             setupHeaderView();
@@ -435,9 +432,6 @@ public class ItemlistFragment extends ListFragment {
         if (feed != null && feed.getNextPageLink() == null && listFooter != null) {
             getListView().removeFooterView(listFooter.getRoot());
         }
-
-        insideOnFragmentLoaded = false;
-
     }
 
     private void refreshHeaderView() {
@@ -481,14 +475,14 @@ public class ItemlistFragment extends ListFragment {
         View header = inflater.inflate(R.layout.feeditemlist_header, lv, false);
         lv.addHeaderView(header);
 
-        txtvTitle = (TextView) header.findViewById(R.id.txtvTitle);
-        TextView txtvAuthor = (TextView) header.findViewById(R.id.txtvAuthor);
-        imgvBackground = (ImageView) header.findViewById(R.id.imgvBackground);
-        imgvCover = (ImageView) header.findViewById(R.id.imgvCover);
-        ImageButton butShowInfo = (ImageButton) header.findViewById(R.id.butShowInfo);
-        ImageButton butShowSettings = (ImageButton) header.findViewById(R.id.butShowSettings);
-        txtvInformation = (TextView) header.findViewById(R.id.txtvInformation);
-        txtvFailure = (IconTextView) header.findViewById(R.id.txtvFailure);
+        txtvTitle = header.findViewById(R.id.txtvTitle);
+        TextView txtvAuthor = header.findViewById(R.id.txtvAuthor);
+        imgvBackground = header.findViewById(R.id.imgvBackground);
+        imgvCover = header.findViewById(R.id.imgvCover);
+        ImageButton butShowInfo = header.findViewById(R.id.butShowInfo);
+        ImageButton butShowSettings = header.findViewById(R.id.butShowSettings);
+        txtvInformation = header.findViewById(R.id.txtvInformation);
+        txtvFailure = header.findViewById(R.id.txtvFailure);
 
         txtvTitle.setText(feed.getTitle());
         txtvAuthor.setText(feed.getAuthor());