1 files changed, 6 insertions, 42 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
index e0fb65c61..5d52eb263 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/SubscriptionsAdapter.java
@@ -1,7 +1,7 @@
 package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,7 +30,6 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
     public static final Object ADD_ITEM_OBJ = new Object();
 
     /** the position in the view that holds the add item; 0 is the first, -1 is the last position */
-    private static final int ADD_POSITION = -1;
     private static final String TAG = "SubscriptionsAdapter";
 
     private final WeakReference<MainActivity> mainActivityRef;
@@ -41,28 +40,14 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
         this.itemAccess = itemAccess;
     }
 
-    private int getAddTilePosition() {
-        if(ADD_POSITION < 0) {
-            return ADD_POSITION + getCount();
-        }
-        return ADD_POSITION;
-    }
-
-    private int getAdjustedPosition(int origPosition) {
-        return origPosition < getAddTilePosition() ? origPosition : origPosition - 1;
-    }
-
     @Override
     public int getCount() {
-        return 1 + itemAccess.getCount();
+        return itemAccess.getCount();
     }
 
     @Override
     public Object getItem(int position) {
-        if (position == getAddTilePosition()) {
-            return ADD_ITEM_OBJ;
-        }
-        return itemAccess.getItem(getAdjustedPosition(position));
+        return itemAccess.getItem(position);
     }
 
     @Override
@@ -72,10 +57,7 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
 
     @Override
     public long getItemId(int position) {
-        if (position == getAddTilePosition()) {
-            return 0;
-        }
-        return itemAccess.getItem(getAdjustedPosition(position)).getId();
+        return itemAccess.getItem(position).getId();
     }
 
     @Override
@@ -98,20 +80,6 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
             holder = (Holder) convertView.getTag();
         }
 
-        if (position == getAddTilePosition()) {
-            holder.feedTitle.setText("{md-add 500%}\n\n" + mainActivityRef.get().getString(R.string.add_feed_label));
-                    holder.feedTitle.setVisibility(View.VISIBLE);
-            // prevent any accidental re-use of old values (not sure how that would happen...)
-            holder.count.setPrimaryText("");
-            // make it go away, we don't need it for add feed
-            holder.count.setVisibility(View.INVISIBLE);
-
-            // when this holder is reused, we could else end up with a cover image
-            Glide.with(mainActivityRef.get()).clear(holder.imageView);
-
-            return convertView;
-        }
-
         final Feed feed = (Feed) getItem(position);
         if (feed == null) return null;
 
@@ -137,12 +105,8 @@ public class SubscriptionsAdapter extends BaseAdapter implements AdapterView.OnI
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        if (position == getAddTilePosition()) {
-            mainActivityRef.get().loadChildFragment(new AddFeedFragment());
-        } else {
-            Fragment fragment = FeedItemlistFragment.newInstance(getItemId(position));
-            mainActivityRef.get().loadChildFragment(fragment);
-        }
+        Fragment fragment = FeedItemlistFragment.newInstance(getItemId(position));
+        mainActivityRef.get().loadChildFragment(fragment);
     }
 
     static class Holder {