From 25ec60b1e5370df903af4f3f513435fd74d26db7 Mon Sep 17 00:00:00 2001
From: Ryan Harg <ryan.harg@mailbox.org>
Date: Fri, 17 Sep 2021 19:14:18 +0200
Subject: [PATCH] #99: Initialize repository before using it
---
.../audio/funkwhale/ffa/activities/SearchActivity.kt | 10 +++++-----
.../funkwhale/ffa/fragments/LandscapeQueueFragment.kt | 3 +++
.../funkwhale/ffa/fragments/PlaylistTracksFragment.kt | 5 +++--
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/audio/funkwhale/ffa/activities/SearchActivity.kt b/app/src/main/java/audio/funkwhale/ffa/activities/SearchActivity.kt
index e0fc0401..d0b8c8b2 100644
--- a/app/src/main/java/audio/funkwhale/ffa/activities/SearchActivity.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/activities/SearchActivity.kt
@@ -48,6 +48,11 @@ class SearchActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ artistsRepository = ArtistsSearchRepository(this@SearchActivity, "")
+ albumsRepository = AlbumsSearchRepository(this@SearchActivity, "")
+ tracksRepository = TracksSearchRepository(this@SearchActivity, "")
+ favoritesRepository = FavoritesRepository(this@SearchActivity)
+
binding = ActivitySearchBinding.inflate(layoutInflater)
setContentView(binding.root)
@@ -81,11 +86,6 @@ class SearchActivity : AppCompatActivity() {
}
}
- artistsRepository = ArtistsSearchRepository(this@SearchActivity, "")
- albumsRepository = AlbumsSearchRepository(this@SearchActivity, "")
- tracksRepository = TracksSearchRepository(this@SearchActivity, "")
- favoritesRepository = FavoritesRepository(this@SearchActivity)
-
adapter =
SearchAdapter(
layoutInflater,
diff --git a/app/src/main/java/audio/funkwhale/ffa/fragments/LandscapeQueueFragment.kt b/app/src/main/java/audio/funkwhale/ffa/fragments/LandscapeQueueFragment.kt
index 749b846e..97a78e87 100644
--- a/app/src/main/java/audio/funkwhale/ffa/fragments/LandscapeQueueFragment.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/fragments/LandscapeQueueFragment.kt
@@ -35,6 +35,8 @@ class LandscapeQueueFragment : Fragment() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
+ favoritesRepository = FavoritesRepository(context)
+
watchEventBus()
}
@@ -44,6 +46,7 @@ class LandscapeQueueFragment : Fragment() {
savedInstanceState: Bundle?
): View {
_binding = PartialQueueBinding.inflate(inflater)
+
return binding.root.apply {
adapter = TracksAdapter(
layoutInflater,
diff --git a/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt b/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
index 2a0a2b9f..5622c7d3 100644
--- a/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/fragments/PlaylistTracksFragment.kt
@@ -72,11 +72,12 @@ class PlaylistTracksFragment : FFAFragment<PlaylistTrack, PlaylistTracksAdapter>
albumCover = getString("albumCover") ?: ""
}
- adapter = PlaylistTracksAdapter(layoutInflater, context, FavoriteListener(favoritesRepository), PlaylistListener())
- repository = PlaylistTracksRepository(context, albumId)
favoritesRepository = FavoritesRepository(context)
playlistsRepository = ManagementPlaylistsRepository(context)
+ adapter = PlaylistTracksAdapter(layoutInflater, context, FavoriteListener(favoritesRepository), PlaylistListener())
+ repository = PlaylistTracksRepository(context, albumId)
+
watchEventBus()
}
--
GitLab