Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into NPE

This commit is contained in:
tzugen 2021-03-30 14:39:09 +02:00
parent 05067aaf3c 97d68eb08f
commit f738bca1ad
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ultrasonic/src/main/java/org/moire/ultrasonic/fragment/BookmarksFragment.java
View File

@ -104,7 +104,7 @@ public class BookmarksFragment extends Fragment {
{
if (entry.isVideo())
{
videoPlayer.getValue().playVideo(entry);
videoPlayer.getValue().playVideo(getContext(), entry);
}
else
{

2
ultrasonic/src/main/java/org/moire/ultrasonic/fragment/SearchFragment.java
View File

@ -576,7 +576,7 @@ public class SearchFragment extends Fragment {
private void onVideoSelected(MusicDirectory.Entry entry)
{
videoPlayer.getValue().playVideo(entry);
videoPlayer.getValue().playVideo(getContext(), entry);
}
private void autoplay()

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt
View File

@ -85,6 +85,6 @@ val musicServiceModule = module {
single { DownloadHandler(get(), get()) }
single { NetworkAndStorageChecker(androidContext()) }
single { VideoPlayer(androidContext()) }
single { VideoPlayer() }
single { ShareHandler(androidContext()) }
}

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt
View File

@ -134,7 +134,7 @@ class SelectAlbumFragment : Fragment() {
bundle
)
} else if (entry != null && entry.isVideo) {
videoPlayer.playVideo(entry)
videoPlayer.playVideo(requireContext(), entry)
} else {
enableButtons()
}

2
ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt
View File

@ -649,7 +649,7 @@ open class RESTMusicService(
"Get-Video-Url"
).start()
latch.await(3, TimeUnit.SECONDS)
latch.await(5, TimeUnit.SECONDS)
return expectedResult[0]!!
}

6
ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/VideoPlayer.kt
View File

@ -8,8 +8,8 @@ import org.moire.ultrasonic.util.Util
/**
* This utility class helps starting video playback
*/
class VideoPlayer(val context: Context) {
fun playVideo(entry: MusicDirectory.Entry?) {
class VideoPlayer() {
fun playVideo(context: Context, entry: MusicDirectory.Entry?) {
if (!Util.isNetworkConnected(context)) {
Util.toast(context, R.string.select_album_no_network)
return
@ -18,7 +18,7 @@ class VideoPlayer(val context: Context) {
try {
player.playVideo(context, entry)
} catch (e: Exception) {
Util.toast(context, e.message, false)
Util.toast(context, e.toString(), false)
}
}
}