[android] fixes issue where last added favorite wasn't displaying. ot…

…her refresh issues remain.

android/apollo/src/com/andrew/apollo/adapters/ApolloFragmentAdapter.java

@@ -209,20 +209,12 @@ public int getOffset() {
     @Override
     public int getCount() {
         if (mDataList != null) {
-            return mDataList.size();
+            int size = mDataList.size();
+            return size == 0 ? 0 : size + getOffset();
         }
         return super.getCount();
     }
 
-    /**
-     * The view count, including a header element if present for this adapter.
-     *
-     * @return
-     */
-    public int getViewCount() {
-        return getCount() + getOffset();
-    }
-
     /**
      * @param position - The ACTUAL position in the model container. If you're using an offset based on a list view that has a header element at 0, you must subtract to the position you might have.
      * @return The element at the indexed position in the model container (not the view). null if position is out of bounds.

android/apollo/src/com/andrew/apollo/adapters/ProfileSongAdapter.java

@@ -16,19 +16,11 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-
-import com.andrew.apollo.utils.Ref;
-import com.frostwire.android.R;
 import com.andrew.apollo.model.Song;
 import com.andrew.apollo.ui.MusicViewHolder;
-import com.andrew.apollo.ui.fragments.profile.AlbumSongFragment;
-import com.andrew.apollo.ui.fragments.profile.ArtistSongFragment;
-import com.andrew.apollo.ui.fragments.profile.FavoriteFragment;
-import com.andrew.apollo.ui.fragments.profile.GenreSongFragment;
-import com.andrew.apollo.ui.fragments.profile.LastAddedFragment;
-import com.andrew.apollo.ui.fragments.profile.PlaylistSongFragment;
+import com.andrew.apollo.ui.fragments.profile.*;
 import com.andrew.apollo.utils.MusicUtils;
-import com.frostwire.logging.Logger;
+import com.frostwire.android.R;
 
 /**
  * This {@link ArrayAdapter} is used to display the songs for a particular
@@ -41,7 +33,7 @@
  */
 public class ProfileSongAdapter extends ApolloFragmentAdapter<Song> {
 
-    public static final Logger LOGGER = Logger.getLogger(ProfileSongAdapter.class);
+    //public static final Logger LOGGER = Logger.getLogger(ProfileSongAdapter.class);
 
     /**
      * Default display setting: title/album
@@ -97,7 +89,7 @@ public ProfileSongAdapter(final Context context, final int layoutId, final int s
         // Cache the header
         mHeader = mInflater.inflate(R.layout.faux_carousel, null);
         // Know what to put in line two
-         mDisplaySetting = setting;
+        mDisplaySetting = setting;
 
         setNotifyOnChange(true);
     }
@@ -135,6 +127,7 @@ public View getView(final int position, View convertView, final ViewGroup parent
         }
 
         // Retrieve the album
+        LOGGER.info("getView(position=="+position+") : getOffset() -> " + getOffset() + " => position - getOffset() => " + (position - getOffset()));
         final Song song = getItem(position - getOffset());
 
         // Set each track name (line one)

android/apollo/src/com/andrew/apollo/ui/fragments/profile/ApolloFragment.java

@@ -44,6 +44,7 @@
 import com.andrew.apollo.widgets.VerticalScrollListener;
 import com.devspark.appmsg.AppMsg;
 import com.frostwire.android.R;
+import com.frostwire.logging.Logger;
 import com.viewpagerindicator.TitlePageIndicator;
 
 import java.util.List;
@@ -61,7 +62,7 @@ public abstract class ApolloFragment<T extends ApolloFragmentAdapter<I>, I>
         AbsListView.OnScrollListener,
         MusicStateListener {
 
-    //private static Logger LOGGER = Logger.getLogger(ApolloFragment.class);
+    private static Logger LOGGER = Logger.getLogger(ApolloFragment.class);
 
     private final int GROUP_ID;
     /**
@@ -300,7 +301,7 @@ public boolean onContextItemSelected(final android.view.MenuItem item) {
     private boolean onRemoveFromRecent()  {
         RecentStore.getInstance(getActivity()).removeItem(mSelectedId);
         MusicUtils.refresh();
-        refresh();
+        restartLoader(true);
         return true;
     }
 
@@ -325,6 +326,7 @@ public void onDelete(long[] id) {
                 refresh();
             }
         }).show(getFragmentManager(), "DeleteDialog");
+        restartLoader(true);
         return true;
     }
 
@@ -334,7 +336,7 @@ private boolean onRemoveFromPlaylist() {
         if (mItem instanceof Song) {
             Song song = (Song) mItem;
             MusicUtils.removeFromPlaylist(getActivity(), song.mSongId, mPlaylistId);
-            refresh();
+            restartLoader(true);
             return true;
         }
         return false;
@@ -369,7 +371,7 @@ private void onRemoveFromFavorites() {
         mAdapter.remove(mItem);
         mAdapter.notifyDataSetChanged();
         FavoritesStore.getInstance(getActivity()).removeItem(mSelectedId);
-        restartLoader(true);
+        refresh();
     }
 
     /**
@@ -380,7 +382,7 @@ public void onActivityCreated(final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         // Enable the options menu
         setHasOptionsMenu(true);
-        restartLoader(true);
+        initLoader();
     }
 
     @Override
@@ -465,7 +467,7 @@ public void refresh() {
             mAdapter.clear();
         }
 
-        restartLoader(true);
+        restartLoader(); // this won't be executed if it was recently called. no risk of endless loop.
 
         if (mAdapter != null) {
             mAdapter.notifyDataSetChanged();
@@ -493,9 +495,14 @@ public void restartLoader(boolean force) {
         if (force || (System.currentTimeMillis() - lastRestartLoader) >= 5000) {
             lastRestartLoader = System.currentTimeMillis();
             getLoaderManager().restartLoader(LOADER_ID, getArguments(), this);
+            refresh(); // won't end up in recursive call because we just refreshed.
         }
     }
 
+    public void initLoader() {
+        getLoaderManager().initLoader(LOADER_ID, null, this);
+    }
+
     public void onMetaChanged() {
         restartLoader();
     }

android/apollo/src/com/andrew/apollo/ui/fragments/profile/FavoriteFragment.java

@@ -48,11 +48,7 @@ public FavoriteFragment() {
 
     @Override
     protected ProfileSongAdapter createAdapter() {
-        return new ProfileSongAdapter(
-                getActivity(),
-                R.layout.list_item_simple,
-                ProfileSongAdapter.DISPLAY_PLAYLIST_SETTING
-        );
+        return new ProfileSongAdapter(getActivity(), R.layout.list_item_simple, ProfileSongAdapter.DISPLAY_PLAYLIST_SETTING);
     }
 
     @Override