Bugfix/issue 1/no items exception (#102)

Issue-1 - made fix and improved automation
goldy1992 · Nov 15, 2019 · e6d1d04 · e6d1d04
1 parent 8e525cc
commit e6d1d04
Show file tree

Hide file tree

Showing 26 changed files with 357 additions and 750 deletions.
diff --git a/...a/com/github/goldy1992/mp3player/dagger/modules/AndroidTestContentRetrieverMapModule.java b/...a/com/github/goldy1992/mp3player/dagger/modules/AndroidTestContentRetrieverMapModule.java
@@ -7,6 +7,7 @@
 import com.github.goldy1992.mp3player.service.library.content.parser.ResultsParser;
 import com.github.goldy1992.mp3player.service.library.content.retriever.ContentRetriever;
 import com.github.goldy1992.mp3player.service.library.content.retriever.FoldersRetriever;
+import com.github.goldy1992.mp3player.service.library.content.retriever.FoldersRetrieverTestImpl;
 import com.github.goldy1992.mp3player.service.library.content.retriever.RootRetriever;
 import com.github.goldy1992.mp3player.service.library.content.retriever.SongsFromFolderRetriever;
 import com.github.goldy1992.mp3player.service.library.content.retriever.SongsRetriever;
@@ -39,7 +40,7 @@ public Map<Class<? extends ContentRetriever>, ContentRetriever> provideContentRe
         mapToReturn.put(RootRetriever.class, rootRetriever);
         SongsRetriever songsRetriever = new SongsRetrieverTestImpl(contentResolver, mediaItemBuilderMap.get(MediaItemType.SONG), searchDatabase.songDao(), handler);
         mapToReturn.put(SongsRetriever.class, songsRetriever);
-        FoldersRetriever foldersRetriever = new FoldersRetriever(contentResolver, mediaItemBuilderMap.get(FOLDER), searchDatabase.folderDao(), handler);
+        FoldersRetriever foldersRetriever = new FoldersRetrieverTestImpl(contentResolver, mediaItemBuilderMap.get(FOLDER), searchDatabase.folderDao(), handler);
         mapToReturn.put(FoldersRetriever.class, foldersRetriever);
         SongsFromFolderRetriever songsFromFolderRetriever = new SongsFromFolderRetriever(contentResolver, mediaItemBuilderMap.get(SONG), searchDatabase.songDao(), handler);
         mapToReturn.put(SongsFromFolderRetriever.class, songsFromFolderRetriever);

diff --git a/...ithub/goldy1992/mp3player/service/library/content/retriever/FoldersRetrieverTestImpl.java b/...ithub/goldy1992/mp3player/service/library/content/retriever/FoldersRetrieverTestImpl.java
@@ -0,0 +1,28 @@
+package com.github.goldy1992.mp3player.service.library.content.retriever;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.os.Handler;
+import android.provider.MediaStore;
+
+import com.github.goldy1992.mp3player.service.library.content.parser.ResultsParser;
+import com.github.goldy1992.mp3player.service.library.search.FolderDao;
+
+import static com.github.goldy1992.mp3player.TestConstants.TEST_DATA_DIR;
+
+public class FoldersRetrieverTestImpl extends FoldersRetriever {
+    public FoldersRetrieverTestImpl(ContentResolver contentResolver, ResultsParser resultsParser, FolderDao folderDao, Handler handler) {
+        super(contentResolver, resultsParser, folderDao, handler);
+    }
+
+    private final String WHERE_CLAUSE = MediaStore.Audio.Media.DATA + " LIKE ?";
+
+
+    private final String[] WHERE_ARGS = {"%" + TEST_DATA_DIR + "%"};
+
+    @Override
+    Cursor performGetChildrenQuery(String id) {
+        return contentResolver.query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, getProjection(),
+                WHERE_CLAUSE, WHERE_ARGS, null);
+    }
+}
diff --git a/app/src/main/java/com/github/goldy1992/mp3player/client/MediaControllerAdapter.java b/app/src/main/java/com/github/goldy1992/mp3player/client/MediaControllerAdapter.java
@@ -207,15 +207,16 @@ public long getActiveQueueItemId() {
 
     public int getCurrentQueuePosition() {
         List<QueueItem> queue = getQueue();
-        long id = getActiveQueueItemId();
-
-        for (int i = 0; i < queue.size(); i++) {
-            QueueItem queueItem = queue.get(i);
-            if (queueItem.getQueueId() == id) {
-                return i;
+        if (queue != null) {
+            long id = getActiveQueueItemId();
+
+            for (int i = 0; i < queue.size(); i++) {
+                QueueItem queueItem = queue.get(i);
+                if (queueItem.getQueueId() == id) {
+                    return i;
+                }
             }
         }
-
         return -1;
     }
 

diff --git a/...src/main/java/com/github/goldy1992/mp3player/client/views/adapters/MySongViewAdapter.java b/...src/main/java/com/github/goldy1992/mp3player/client/views/adapters/MySongViewAdapter.java
@@ -21,6 +21,7 @@
 import java.util.List;
 
 import static com.github.goldy1992.mp3player.commons.MediaItemUtils.getAlbumArtUri;
+import static org.apache.commons.collections4.CollectionUtils.isNotEmpty;
 
 
 public class MySongViewAdapter extends MyGenericRecycleViewAdapter {
@@ -58,7 +59,13 @@ public void onBindViewHolder(@NonNull MediaItemViewHolder holder, int position)
     @NonNull
     @Override
     public String getSectionText(int position) {
-        return items.get(position).getDescription().getTitle().toString().substring(0, 1);
+        if (isNotEmpty(items)) {
+            CharSequence title = items.get(position).getDescription().getTitle();
+            if (null != title) {
+                return title.toString().substring(0, 1);
+            }
+        }
+        return "";
     }
 
     @NonNull

diff --git a/app/src/main/java/com/github/goldy1992/mp3player/client/views/adapters/TrackViewAdapter.java b/app/src/main/java/com/github/goldy1992/mp3player/client/views/adapters/TrackViewAdapter.java
@@ -26,6 +26,7 @@ public TrackViewAdapter(AlbumArtPainter albumArtPainter,
                             List<QueueItem> queue) {
         super();
         this.queue = queue;
+        // TODO: if there is no queue make an empty view holder
         this.albumArtPainter = albumArtPainter;
         this.mainHandler = mainHandler;
     }
@@ -48,7 +49,10 @@ public void onBindViewHolder(@NonNull MediaPlayerTrackViewHolder holder, int pos
 
     @Override
     public int getItemCount() {
-        return queue.size();
+        if (null != queue) {
+            return queue.size();
+        }
+        return -1;
     }
 
     /**

diff --git a/app/src/main/java/com/github/goldy1992/mp3player/client/views/buttons/PlayPauseButton.java b/app/src/main/java/com/github/goldy1992/mp3player/client/views/buttons/PlayPauseButton.java
@@ -23,20 +23,23 @@
 
 public class PlayPauseButton extends MediaButton implements PlaybackStateListener {
 
+    @PlaybackStateCompat.State
+    public static final int INITIAL_PLAYBACK_STATE = PlaybackStateCompat.STATE_STOPPED;
+
     private static final String LOG_TAG = "PLAY_PAUSE_BUTTON";
     @PlaybackStateCompat.State
-    private int state = PlaybackStateCompat.STATE_NONE;
+    private int state = INITIAL_PLAYBACK_STATE;
 
     @Inject
     public PlayPauseButton(Context context, @NonNull MediaControllerAdapter mediaControllerAdapter,
                            @Named("main") Handler mainUpdater) {
         super(context, mediaControllerAdapter, mainUpdater);
-        updateState(mediaControllerAdapter.getPlaybackState())  ;
     }
 
     @Override
     public void init(ImageView view) {
         super.init(view);
+        updateState(this.mediaControllerAdapter.getPlaybackState());
         this.mediaControllerAdapter.registerPlaybackStateListener(this);
     }
 

diff --git a/...om/github/goldy1992/mp3player/client/views/fragments/viewpager/MediaItemListFragment.java b/...om/github/goldy1992/mp3player/client/views/fragments/viewpager/MediaItemListFragment.java
@@ -69,12 +69,12 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
     public void onViewCreated(@NonNull View view, Bundle bundle) {
         this.recyclerView = view.findViewById(R.id.recycler_view);
         this.recyclerView.setAdapter(myViewAdapter);
-        this.recyclerView.setHideScrollbar(false);
         this.recyclerView.addOnItemTouchListener(myGenericItemTouchListener);
         this.myGenericItemTouchListener.setParentView(recyclerView);
         this.recyclerView.setItemAnimator(new DefaultItemAnimator());
         this.recyclerView.setLayoutManager(linearLayoutManager);
         this.recyclerView.addOnScrollListener(albumArtPainter.createPreloader(myViewAdapter));
+        this.recyclerView.setHideScrollbar(true);
     }
 
     @Inject

diff --git a/...java/com/github/goldy1992/mp3player/dagger/modules/PlaybackNotificationManagerModule.java b/...java/com/github/goldy1992/mp3player/dagger/modules/PlaybackNotificationManagerModule.java
@@ -8,7 +8,7 @@
 
 import com.github.goldy1992.mp3player.R;
 import com.github.goldy1992.mp3player.service.MyDescriptionAdapter;
-import com.github.goldy1992.mp3player.service.PlaybackManager;
+import com.github.goldy1992.mp3player.service.PlaylistManager;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ui.PlayerNotificationManager;
 
@@ -47,7 +47,7 @@ public PlayerNotificationManager providesPlayerNotificationManager(
     @Singleton
     public MyDescriptionAdapter providesMyDescriptionAdapter(Context context,
                                                              MediaSessionCompat.Token token,
-                                                             PlaybackManager playbackManager) {
-        return new MyDescriptionAdapter(context, token, playbackManager);
+                                                             PlaylistManager playlistManager) {
+        return new MyDescriptionAdapter(context, token, playlistManager);
     }
 }
diff --git a/...va/com/github/goldy1992/mp3player/dagger/modules/service/MediaSessionConnectorModule.java b/...va/com/github/goldy1992/mp3player/dagger/modules/service/MediaSessionConnectorModule.java
@@ -5,7 +5,7 @@
 import android.support.v4.media.session.MediaSessionCompat;
 
 import com.github.goldy1992.mp3player.service.MyControlDispatcher;
-import com.github.goldy1992.mp3player.service.PlaybackManager;
+import com.github.goldy1992.mp3player.service.PlaylistManager;
 import com.github.goldy1992.mp3player.service.library.ContentManager;
 import com.github.goldy1992.mp3player.service.player.AudioBecomingNoisyBroadcastReceiver;
 import com.github.goldy1992.mp3player.service.player.DecreaseSpeedProvider;
@@ -64,8 +64,8 @@ public MyPlaybackPreparer provideMyPlaybackPreparer(ExoPlayer exoPlayer,
                                                         @Named("starting_playlist") List<MediaBrowserCompat.MediaItem> items,
                                                         MyControlDispatcher myControlDispatcher,
                                                         MediaSourceFactory mediaSourceFactory,
-                                                        PlaybackManager playbackManager) {
-        return new MyPlaybackPreparer(exoPlayer, contentManager, items, mediaSourceFactory, myControlDispatcher, playbackManager);
+                                                        PlaylistManager playlistManager) {
+        return new MyPlaybackPreparer(exoPlayer, contentManager, items, mediaSourceFactory, myControlDispatcher, playlistManager);
     }
 
     @Provides
@@ -82,15 +82,15 @@ public ContentDataSource providesContentDataSource(Context context) {
 
     @Provides
     @Singleton
-    public MyMetadataProvider providesMyMetadataProvider(PlaybackManager playbackManager) {
-        return new MyMetadataProvider(playbackManager);
+    public MyMetadataProvider providesMyMetadataProvider(PlaylistManager playlistManager) {
+        return new MyMetadataProvider(playlistManager);
     }
 
     @Provides
     @Singleton
     public MyTimelineQueueNavigator providesMyTimelineQueueNavigator(MediaSessionCompat mediaSessionCompat,
-                                                                     PlaybackManager playbackManager) {
-        return new MyTimelineQueueNavigator(mediaSessionCompat, playbackManager);
+                                                                     PlaylistManager playlistManager) {
+        return new MyTimelineQueueNavigator(mediaSessionCompat, playlistManager);
     }
 
     @Provides

diff --git a/...ain/java/com/github/goldy1992/mp3player/dagger/modules/service/PlaybackManagerModule.java b/...ain/java/com/github/goldy1992/mp3player/dagger/modules/service/PlaybackManagerModule.java
@@ -2,7 +2,7 @@
 
 import android.support.v4.media.MediaBrowserCompat;
 
-import com.github.goldy1992.mp3player.service.PlaybackManager;
+import com.github.goldy1992.mp3player.service.PlaylistManager;
 import com.github.goldy1992.mp3player.service.library.ContentManager;
 
 import java.util.List;
@@ -17,8 +17,8 @@
 public class PlaybackManagerModule {
     @Singleton
     @Provides
-    public PlaybackManager providePlaybackManager(ContentManager contentManager,
+    public PlaylistManager providePlaybackManager(ContentManager contentManager,
                                                   @Named("starting_playlist")List<MediaBrowserCompat.MediaItem> items) {
-        return new PlaybackManager(items, 0);
+        return new PlaylistManager(items, 0);
     }
 }
diff --git a/app/src/main/java/com/github/goldy1992/mp3player/service/MyDescriptionAdapter.java b/app/src/main/java/com/github/goldy1992/mp3player/service/MyDescriptionAdapter.java
@@ -19,17 +19,17 @@
 import static com.github.goldy1992.mp3player.commons.Constants.MEDIA_SESSION;
 
 public class MyDescriptionAdapter implements PlayerNotificationManager.MediaDescriptionAdapter {
-    private final PlaybackManager playbackManager;
+    private final PlaylistManager playlistManager;
     private final Context context;
     private final Token token;
     private static final int REQUEST_CODE = 501;
 
     public MyDescriptionAdapter(Context context,
                                 Token token,
-                                PlaybackManager playbackManager) {
+                                PlaylistManager playlistManager) {
         this.context = context;
         this.token = token;
-        this.playbackManager = playbackManager;
+        this.playlistManager = playlistManager;
     }
 
     @Override
@@ -63,6 +63,6 @@ public Bitmap getCurrentLargeIcon(Player player, PlayerNotificationManager.Bitma
 
     private final MediaItem getCurrentMediaItem(Player player) {
         int position = player.getCurrentWindowIndex();
-        return playbackManager.getItemAtIndex(position);
+        return playlistManager.getItemAtIndex(position);
     }
 }