Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-15 03:00:52 +01:00
Code Issues Releases Wiki Activity

Remove unused parameter

Browse Source
This commit is contained in:
tzugen 2021-04-27 18:24:32 +02:00
parent 237f7ab181
commit ce2f5a95d9
No known key found for this signature in database
GPG Key ID: 61E9C34BC10EC930
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ class SelectAlbumFragment : Fragment() {
model.getPodcastEpisodes(podcastChannelId) model.getPodcastEpisodes(podcastChannelId)
} else if (shareId != null) { } else if (shareId != null) {
setTitle(shareName) setTitle(shareName)
model.getShare(shareId, shareName) model.getShare(shareId)
} else if (albumListType != null) { } else if (albumListType != null) {
setTitle(albumListTitle) setTitle(albumListTitle)
model.getAlbumList(albumListType, albumListSize, albumListOffset) model.getAlbumList(albumListType, albumListSize, albumListOffset)

15
ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumModel.kt
View File

@ -1,8 +1,7 @@
package org.moire.ultrasonic.fragment package org.moire.ultrasonic.fragment
import android.app.Application import android.app.Application
import android.os.Handler import android.content.Context
import android.os.Looper
import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import java.util.LinkedList import java.util.LinkedList
@ -16,7 +15,6 @@ import org.moire.ultrasonic.api.subsonic.models.AlbumListType
import org.moire.ultrasonic.data.ActiveServerProvider import org.moire.ultrasonic.data.ActiveServerProvider
import org.moire.ultrasonic.domain.MusicDirectory import org.moire.ultrasonic.domain.MusicDirectory
import org.moire.ultrasonic.domain.MusicFolder import org.moire.ultrasonic.domain.MusicFolder
import org.moire.ultrasonic.service.CommunicationErrorHandler
import org.moire.ultrasonic.service.MusicServiceFactory import org.moire.ultrasonic.service.MusicServiceFactory
import org.moire.ultrasonic.util.Util import org.moire.ultrasonic.util.Util
@ -24,7 +22,8 @@ import org.moire.ultrasonic.util.Util
@KoinApiExtension @KoinApiExtension
class SelectAlbumModel(application: Application) : AndroidViewModel(application), KoinComponent { class SelectAlbumModel(application: Application) : AndroidViewModel(application), KoinComponent {
private val context = getApplication<Application>().applicationContext private val context: Context
get() = getApplication<Application>().applicationContext
private val activeServerProvider: ActiveServerProvider by inject() private val activeServerProvider: ActiveServerProvider by inject()
@ -43,13 +42,7 @@ class SelectAlbumModel(application: Application) : AndroidViewModel(application)
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
if (!ActiveServerProvider.isOffline(context)) { if (!ActiveServerProvider.isOffline(context)) {
val musicService = MusicServiceFactory.getMusicService(context) val musicService = MusicServiceFactory.getMusicService(context)
try {
musicFolders.postValue(musicService.getMusicFolders(refresh, context)) musicFolders.postValue(musicService.getMusicFolders(refresh, context))
} catch (exception: Exception) {
Handler(Looper.getMainLooper()).post {
CommunicationErrorHandler.handleError(exception, context)
}
}
} }
} }
} }
@ -286,7 +279,7 @@ class SelectAlbumModel(application: Application) : AndroidViewModel(application)
} }
} }
suspend fun getShare(shareId: String, shareName: CharSequence?) { suspend fun getShare(shareId: String) {
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
if (!ActiveServerProvider.isOffline(context)) { if (!ActiveServerProvider.isOffline(context)) {