Merge pull request #101 from tobexyz/feat/prepare_release

Feat/prepare release
tobexyz · Feb 3, 2024 · 693eff6 · 693eff6
2 parents 438e50e + e8a57d0
commit 693eff6
Show file tree

Hide file tree

Showing 25 changed files with 9 additions and 4 deletions.
diff --git a/...reenshots/4.x.x/browse_content_folder.png → ...reenshots/4.0.x/browse_content_folder.png b/...reenshots/4.x.x/browse_content_folder.png → ...reenshots/4.0.x/browse_content_folder.png
diff --git a/...screenshots/4.x.x/browse_image_folder.png → ...screenshots/4.0.x/browse_image_folder.png b/...screenshots/4.x.x/browse_image_folder.png → ...screenshots/4.0.x/browse_image_folder.png
diff --git a/...screenshots/4.x.x/browse_music_folder.png → ...screenshots/4.0.x/browse_music_folder.png b/...screenshots/4.x.x/browse_music_folder.png → ...screenshots/4.0.x/browse_music_folder.png
diff --git a/doc/screenshots/4.x.x/browse_player.png → doc/screenshots/4.0.x/browse_player.png b/doc/screenshots/4.x.x/browse_player.png → doc/screenshots/4.0.x/browse_player.png
diff --git a/doc/screenshots/4.x.x/browse_receiver.png → doc/screenshots/4.0.x/browse_receiver.png b/doc/screenshots/4.x.x/browse_receiver.png → doc/screenshots/4.0.x/browse_receiver.png
diff --git a/doc/screenshots/4.x.x/browse_servers.png → doc/screenshots/4.0.x/browse_servers.png b/doc/screenshots/4.x.x/browse_servers.png → doc/screenshots/4.0.x/browse_servers.png
diff --git a/doc/screenshots/4.x.x/image_player.png → doc/screenshots/4.0.x/image_player.png b/doc/screenshots/4.x.x/image_player.png → doc/screenshots/4.0.x/image_player.png
diff --git a/...eenshots/4.x.x/image_player_show_menu.png → ...eenshots/4.0.x/image_player_show_menu.png b/...eenshots/4.x.x/image_player_show_menu.png → ...eenshots/4.0.x/image_player_show_menu.png
diff --git a/doc/screenshots/4.x.x/music_player.png → doc/screenshots/4.0.x/music_player.png b/doc/screenshots/4.x.x/music_player.png → doc/screenshots/4.0.x/music_player.png
diff --git a/doc/screenshots/4.1.x/browse_content_folder.png b/doc/screenshots/4.1.x/browse_content_folder.png
diff --git a/doc/screenshots/4.1.x/browse_content_folder_landscape.png b/doc/screenshots/4.1.x/browse_content_folder_landscape.png
diff --git a/doc/screenshots/4.1.x/browse_image_folder.png b/doc/screenshots/4.1.x/browse_image_folder.png
diff --git a/doc/screenshots/4.1.x/browse_music_folder.png b/doc/screenshots/4.1.x/browse_music_folder.png
diff --git a/doc/screenshots/4.1.x/browse_player.png b/doc/screenshots/4.1.x/browse_player.png
diff --git a/doc/screenshots/4.1.x/browse_receiver.png b/doc/screenshots/4.1.x/browse_receiver.png
diff --git a/doc/screenshots/4.1.x/browse_servers.png b/doc/screenshots/4.1.x/browse_servers.png
diff --git a/doc/screenshots/4.1.x/image_player.png b/doc/screenshots/4.1.x/image_player.png
diff --git a/doc/screenshots/4.1.x/image_player_show_menu.png b/doc/screenshots/4.1.x/image_player_show_menu.png
diff --git a/doc/screenshots/4.1.x/music_player.png b/doc/screenshots/4.1.x/music_player.png
diff --git a/doc/screenshots/4.1.x/music_player_landscape.png b/doc/screenshots/4.1.x/music_player_landscape.png
diff --git a/doc/screenshots/4.1.x/playlist_during_playing_partially_editable.png b/doc/screenshots/4.1.x/playlist_during_playing_partially_editable.png
diff --git a/doc/screenshots/4.1.x/playlist_fully_editable.png b/doc/screenshots/4.1.x/playlist_fully_editable.png
diff --git a/yaacc/src/main/AndroidManifest.xml b/yaacc/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:versionCode="40100"
-    android:versionName="4.1.0-SNAPSHOT">
+    android:versionName="4.1.0">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/yaacc/src/main/java/de/yaacc/browser/TabBrowserActivity.java b/yaacc/src/main/java/de/yaacc/browser/TabBrowserActivity.java
@@ -460,7 +460,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
                 volumeToast.show();
             }
             if (viewPager != null && tabLayout != null && tabLayout.getSelectedTabPosition() == BrowserTabs.RECEIVER.ordinal() && tabLayout.getTabAt(tabLayout.getSelectedTabPosition()).view != null) {
-                ((RecyclerView) getSupportFragmentManager().getFragments().get(viewPager.getCurrentItem()).getView().findViewById(R.id.receiverList)).getAdapter().notifyDataSetChanged();
+                List<Fragment> fragments = getSupportFragmentManager().getFragments();
+                if (fragments.size() > viewPager.getCurrentItem()) {
+                    ((RecyclerView) fragments.get(viewPager.getCurrentItem()).getView().findViewById(R.id.receiverList)).getAdapter().notifyDataSetChanged();
+                }
             }
         }
 

diff --git a/yaacc/src/main/java/de/yaacc/player/PlaylistItemAdapter.java b/yaacc/src/main/java/de/yaacc/player/PlaylistItemAdapter.java
@@ -77,8 +77,10 @@ public void onBindViewHolder(final PlaylistItemAdapter.ViewHolder holder, final
     }
 
     private void removeItem(int listPosition) {
-        player.getItems().remove(listPosition);
-        setItems(player.getItems());
+        if (player.getItems().size() > listPosition && listPosition > 0) {
+            player.getItems().remove(listPosition);
+            setItems(player.getItems());
+        }
     }
 
     public void setItems(List<PlayableItem> items) {