[android] cleanup, build fix.

frostwire · Feb 4, 2016 · 0faaf64 · 0faaf64
1 parent 63a0a42
commit 0faaf64
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/android/apollo/src/com/andrew/apollo/adapters/ApolloFragmentAdapter.java b/android/apollo/src/com/andrew/apollo/adapters/ApolloFragmentAdapter.java
@@ -49,11 +49,6 @@ public interface Cacheable {
 
     static Logger LOGGER = Logger.getLogger(ApolloFragmentAdapter.class);
 
-    /**
-     * The resource Id of the layout to inflate
-     */
-    protected final int mLayoutId;
-
     /**
      * Used to set the size of the data in the adapter
      */
@@ -74,6 +69,8 @@ public interface Cacheable {
      */
     protected boolean mLoadExtraData = false;
 
+    protected final int mLayoutId;
+
     public ApolloFragmentAdapter(Context context, int mLayoutId) {
         super(context, mLayoutId);
         this.mLayoutId = mLayoutId;
@@ -147,15 +144,15 @@ public void setPauseDiskCache(final boolean pause) {
         }
     }
 
-    /**
-     * @param album The key used to find the cached album to remove
-     */
-    public void removeFromCache(final Album album) {
-        if (mImageFetcher != null) {
-            mImageFetcher.removeFromCache(
-                    ImageFetcher.generateAlbumCacheKey(album.mAlbumName, album.mArtistName));
-        }
-    }
+//    /**
+//     * @param album The key used to find the cached album to remove
+//     */
+//    public void removeFromCache(final Album album) {
+//        if (mImageFetcher != null) {
+//            mImageFetcher.removeFromCache(
+//                    ImageFetcher.generateAlbumCacheKey(album.mAlbumName, album.mArtistName));
+//        }
+//    }
 
     /**
      * {@inheritDoc}

diff --git a/android/apollo/src/com/andrew/apollo/loaders/QueueLoader.java b/android/apollo/src/com/andrew/apollo/loaders/QueueLoader.java
@@ -36,6 +36,8 @@ public QueueLoader(final Context context) {
      * @return The {@link Cursor} used to run the song query.
      */
     public Cursor makeCursor(final Context context) {
-        return new NowPlayingCursor(context);
+        return makeQueueCursor(context);
     }
+
+    public static Cursor makeQueueCursor(final Context context) { return new NowPlayingCursor(context); }
 }