From ce2f5a95d97cf13845d6e5370325a5efcfe0d139 Mon Sep 17 00:00:00 2001 From: tzugen Date: Tue, 27 Apr 2021 18:24:32 +0200 Subject: [PATCH] Remove unused parameter --- .../ultrasonic/fragment/SelectAlbumFragment.kt | 2 +- .../ultrasonic/fragment/SelectAlbumModel.kt | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt index 8d9cf740..ee80d0a7 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumFragment.kt @@ -278,7 +278,7 @@ class SelectAlbumFragment : Fragment() { model.getPodcastEpisodes(podcastChannelId) } else if (shareId != null) { setTitle(shareName) - model.getShare(shareId, shareName) + model.getShare(shareId) } else if (albumListType != null) { setTitle(albumListTitle) model.getAlbumList(albumListType, albumListSize, albumListOffset) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumModel.kt index 2be09aec..1cbdc1c6 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SelectAlbumModel.kt @@ -1,8 +1,7 @@ package org.moire.ultrasonic.fragment import android.app.Application -import android.os.Handler -import android.os.Looper +import android.content.Context import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.MutableLiveData 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.domain.MusicDirectory import org.moire.ultrasonic.domain.MusicFolder -import org.moire.ultrasonic.service.CommunicationErrorHandler import org.moire.ultrasonic.service.MusicServiceFactory import org.moire.ultrasonic.util.Util @@ -24,7 +22,8 @@ import org.moire.ultrasonic.util.Util @KoinApiExtension class SelectAlbumModel(application: Application) : AndroidViewModel(application), KoinComponent { - private val context = getApplication().applicationContext + private val context: Context + get() = getApplication().applicationContext private val activeServerProvider: ActiveServerProvider by inject() @@ -43,13 +42,7 @@ class SelectAlbumModel(application: Application) : AndroidViewModel(application) withContext(Dispatchers.IO) { if (!ActiveServerProvider.isOffline(context)) { val musicService = MusicServiceFactory.getMusicService(context) - try { - musicFolders.postValue(musicService.getMusicFolders(refresh, context)) - } catch (exception: Exception) { - Handler(Looper.getMainLooper()).post { - CommunicationErrorHandler.handleError(exception, context) - } - } + musicFolders.postValue(musicService.getMusicFolders(refresh, 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) { if (!ActiveServerProvider.isOffline(context)) {