From 364270d3387b9a6182d14a5e0793fab169e638c2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 5 Nov 2023 17:31:25 +0000 Subject: [PATCH 01/14] Update dependency org.junit.vintage:junit-vintage-engine to v5.10.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a584032f..aec48f71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -32,7 +32,7 @@ koin = "3.5.0" picasso = "2.8" junit4 = "4.13.2" -junit5 = "5.10.0" +junit5 = "5.10.1" mockito = "5.7.0" mockitoKotlin = "5.1.0" kluent = "1.73" From ee6d03db35f8ee00013d3becc62e14630e676af0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 15 Nov 2023 18:31:49 +0000 Subject: [PATCH 02/14] Update dependency androidx.activity:activity-ktx to v1.8.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a584032f..a6edbcfa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ media3 = "1.1.1" androidSupport = "1.7.0" materialDesign = "1.10.0" constraintLayout = "2.1.4" -activity = "1.8.0" +activity = "1.8.1" multidex = "2.0.1" room = "2.6.0" kotlin = "1.9.20" From 8e6e9d4e8edc484f7d4f05b7397f528ea1560943 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 16 Nov 2023 01:31:37 +0000 Subject: [PATCH 03/14] Update dependency com.fasterxml.jackson.module:jackson-module-kotlin to v2.16.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a584032f..2181c0be 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,7 +26,7 @@ swipeRefresh = "1.1.0" retrofit = "2.9.0" ## KEEP ON 2.13 branch (https://github.com/FasterXML/jackson-databind/issues/3658#issuecomment-1312633064) for compatibility with API 24 -jackson = "2.15.3" +jackson = "2.16.0" okhttp = "4.12.0" koin = "3.5.0" picasso = "2.8" From a0b04099305035e7410006c571cb9a2196619a43 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 23 Nov 2023 12:31:20 +0000 Subject: [PATCH 04/14] Update kotlin monorepo to v1.9.21 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a584032f..62bc13ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ constraintLayout = "2.1.4" activity = "1.8.0" multidex = "2.0.1" room = "2.6.0" -kotlin = "1.9.20" +kotlin = "1.9.21" ksp = "1.9.10-1.0.13" kotlinxCoroutines = "1.7.3" viewModelKtx = "2.6.2" From 4832876e548424851a1d512d25b03ffa7142e01d Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 26 Nov 2023 12:31:21 +0000 Subject: [PATCH 05/14] Update dependency io.gitlab.arturbosch.detekt:detekt-gradle-plugin to v1.23.4 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a584032f..f2d316e7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ androidxcar = "1.2.0" androidxcore = "1.12.0" ktlint = "0.43.2" ktlintGradle = "11.6.1" -detekt = "1.23.3" +detekt = "1.23.4" preferences = "1.2.1" media3 = "1.1.1" From 3d8abdc65b3972ce65109c3cf64664ee0dfd1bd9 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 29 Nov 2023 14:33:08 +0000 Subject: [PATCH 06/14] Update dependency gradle to v8.5 --- gradle/wrapper/gradle-wrapper.jar | Bin 63721 -> 43462 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c49b765f8051ef9d0a6055ff8e46073d8..d64cd4917707c1f8861d8cb53dd15194d4248596 100644 GIT binary patch literal 43462 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 literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8838ba97..e6aba251 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 8063814bdc5263420a1408f6a62d3035fa445a39 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 30 Nov 2023 18:32:19 +0000 Subject: [PATCH 07/14] Update dependency com.android.tools.build:gradle to v8.2.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a584032f..25815b87 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ gradle = "8.1.1" navigation = "2.7.5" -gradlePlugin = "8.1.2" +gradlePlugin = "8.2.0" androidxcar = "1.2.0" androidxcore = "1.12.0" ktlint = "0.43.2" From c452030fe1d91ed447ec65101d2ec33e2680cb7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?jos=C3=A9=20m?= Date: Sat, 2 Dec 2023 05:25:37 +0000 Subject: [PATCH 08/14] Translated using Weblate (Galician) Currently translated at 27.9% (119 of 426 strings) Translation: Ultrasonic/app Translate-URL: https://hosted.weblate.org/projects/ultrasonic/app/gl/ --- ultrasonic/src/main/res/values-gl/strings.xml | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/ultrasonic/src/main/res/values-gl/strings.xml b/ultrasonic/src/main/res/values-gl/strings.xml index 4eee6eae..a699dc05 100644 --- a/ultrasonic/src/main/res/values-gl/strings.xml +++ b/ultrasonic/src/main/res/values-gl/strings.xml @@ -58,4 +58,68 @@ %d canción desancorada %d cancións desancoradas + Modo barallado activado + Inglés + Repetición desactivada + Repetir Canción + Non está permitido o control remoto. Activa o modo jukebox en Usuarias > Axustes no teu servidor Subsonic. + Queres eliminar %1$s + Activado + Gardouse a lista. + Francés + Engadido recente + Vídeos + Non se atopa a letra + Tes certeza de querer eliminar a selección actual? + Artistas + Gardando a lista \"%s\"… + Español + Escribe un nome para a lista: + Por Nome + Neerlandés + Barallar + Pantalla apagada + Polaco + Chinés (China) + Jukebox por Defecto + Elexir Preselección + Cancións + Repetir Todo + Xéneros + Pantalla acendida + Ir a Álbum + Chinés (Taiwan) + Cronolóxico + Eliminado o marcador. + Ruso + Por Artista + Húngaro + Máis valorado + Con estrela + A lista está baleira + Portugués + Erro + Non se gardou a lista, inténtao máis tarde. + Marcador establecido en %s. + Reprodución barallada + Gardar Lista de reprodución + Alemán + Álbums + Varios Artistas + Gardar Lista + Almacenando… + Máis reproducido + Portugués (Brasil) + Checo + Ao chou + Ao chou + Italiano + Modo barallado desactivado + Sen conexión + Non está a descargar nada + Con estrela + Seguir ao sistema + Ecualizador + %s - Configurar Servidor + Reproducido recente \ No newline at end of file From bf5d41ab3036bb7c94961639533a2717d6227719 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Dec 2023 10:31:52 +0000 Subject: [PATCH 09/14] Update dependency com.google.devtools.ksp to v1.9.21-1.0.15 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94483819..719428e9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -19,7 +19,7 @@ activity = "1.8.1" multidex = "2.0.1" room = "2.6.0" kotlin = "1.9.21" -ksp = "1.9.10-1.0.13" +ksp = "1.9.21-1.0.15" kotlinxCoroutines = "1.7.3" viewModelKtx = "2.6.2" swipeRefresh = "1.1.0" From c0926b1e13bb37fc4d4f131579781cc1d2845119 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Dec 2023 10:31:56 +0000 Subject: [PATCH 10/14] Update room to v2.6.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94483819..d5a97829 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ materialDesign = "1.10.0" constraintLayout = "2.1.4" activity = "1.8.1" multidex = "2.0.1" -room = "2.6.0" +room = "2.6.1" kotlin = "1.9.21" ksp = "1.9.10-1.0.13" kotlinxCoroutines = "1.7.3" From d2ef76a2c5cbf16c3a3800b2a29bcab6af3d3d35 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Dec 2023 10:32:00 +0000 Subject: [PATCH 11/14] Update dependency org.mockito.kotlin:mockito-kotlin to v5.2.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 94483819..6278f47f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -34,7 +34,7 @@ picasso = "2.8" junit4 = "4.13.2" junit5 = "5.10.1" mockito = "5.7.0" -mockitoKotlin = "5.1.0" +mockitoKotlin = "5.2.1" kluent = "1.73" apacheCodecs = "1.16.0" robolectric = "4.11.1" From 9736ae451a34e68ba91963840100a66206a37bc1 Mon Sep 17 00:00:00 2001 From: birdbird <6892457-tzugen@users.noreply.gitlab.com> Date: Sun, 3 Dec 2023 14:12:10 +0000 Subject: [PATCH 12/14] Avoid two exceptions --- .../ultrasonic/fragment/SettingsFragment.kt | 7 +--- .../ultrasonic/service/DownloadService.kt | 40 +++++++++---------- .../service/ExternalStorageMonitor.kt | 6 ++- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt index 8d697581..a67d1782 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt @@ -17,7 +17,6 @@ import androidx.preference.PreferenceFragmentCompat import java.io.File import kotlin.math.ceil import org.koin.core.component.KoinComponent -import org.koin.core.component.inject import org.moire.ultrasonic.R import org.moire.ultrasonic.app.UApp import org.moire.ultrasonic.fragment.FragmentTitle.setTitle @@ -28,7 +27,7 @@ import org.moire.ultrasonic.log.FileLoggerTree.Companion.getLogFileSizes import org.moire.ultrasonic.log.FileLoggerTree.Companion.plantToTimberForest import org.moire.ultrasonic.log.FileLoggerTree.Companion.uprootFromTimberForest import org.moire.ultrasonic.provider.SearchSuggestionProvider -import org.moire.ultrasonic.service.MediaPlayerManager +import org.moire.ultrasonic.service.DownloadService import org.moire.ultrasonic.service.RxBus import org.moire.ultrasonic.util.ConfirmationDialog import org.moire.ultrasonic.util.Constants @@ -62,8 +61,6 @@ class SettingsFragment : private var debugLogToFile: CheckBoxPreference? = null private var customCacheLocation: CheckBoxPreference? = null - private val mediaPlayerManager: MediaPlayerManager by inject() - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.settings, rootKey) } @@ -344,7 +341,7 @@ class SettingsFragment : Settings.cacheLocationUri = path // Clear download queue. - mediaPlayerManager.clear() + DownloadService.clearDownloads() Storage.reset() Storage.checkForErrorsWithCustomRoot() } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt index 0bf444a5..f414ce05 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt @@ -200,26 +200,6 @@ class DownloadService : Service(), KoinComponent { } } - private fun updateLiveData() { - val temp: MutableList = ArrayList() - temp.addAll(activeDownloads.values.map { it.downloadTrack.track }) - temp.addAll(downloadQueue.map { x -> x.track }) - observableDownloads.postValue(temp.distinct().sorted()) - } - - private fun clearDownloads() { - // Clear the pending queue - while (!downloadQueue.isEmpty()) { - postState(downloadQueue.remove().track, DownloadState.IDLE) - } - // Cancel all active downloads - for (download in activeDownloads) { - download.value.cancel() - } - activeDownloads.clear() - updateLiveData() - } - // We should use a single notification builder, otherwise the notification may not be updated // Set some values that never change private val notificationBuilder: NotificationCompat.Builder by lazy { @@ -344,6 +324,26 @@ class DownloadService : Service(), KoinComponent { } } + private fun updateLiveData() { + val temp: MutableList = ArrayList() + temp.addAll(activeDownloads.values.map { it.downloadTrack.track }) + temp.addAll(downloadQueue.map { x -> x.track }) + observableDownloads.postValue(temp.distinct().sorted()) + } + + fun clearDownloads() { + // Clear the pending queue + while (!downloadQueue.isEmpty()) { + postState(downloadQueue.remove().track, DownloadState.IDLE) + } + // Cancel all active downloads + for (download in activeDownloads) { + download.value.cancel() + } + activeDownloads.clear() + updateLiveData() + } + private fun setSaveFlagForTracks( shouldPin: Boolean, tracks: List diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ExternalStorageMonitor.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ExternalStorageMonitor.kt index 86cee2b8..1ad026f7 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ExternalStorageMonitor.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/ExternalStorageMonitor.kt @@ -42,6 +42,10 @@ class ExternalStorageMonitor { } fun onDestroy() { - applicationContext().unregisterReceiver(ejectEventReceiver) + // avoid race conditions + try { + applicationContext().unregisterReceiver(ejectEventReceiver) + } catch (ignored: Exception) { + } } } From 37e43b73a72a38dda1d4c7b03069e0bd29a79308 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Dec 2023 14:31:46 +0000 Subject: [PATCH 13/14] Update dependency org.mockito:mockito-core to v5.8.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d2c9153a..ce1590ca 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ picasso = "2.8" junit4 = "4.13.2" junit5 = "5.10.1" -mockito = "5.7.0" +mockito = "5.8.0" mockitoKotlin = "5.2.1" kluent = "1.73" apacheCodecs = "1.16.0" From 94979aeaab8127beb97f959c626d2e1bbfec3b21 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 3 Dec 2023 19:45:20 +0000 Subject: [PATCH 14/14] Update dependency org.jlleitschuh.gradle:ktlint-gradle to v12 --- .editorconfig | 2 + .../org/moire/ultrasonic/domain/Album.kt | 2 +- .../moire/ultrasonic/domain/MusicDirectory.kt | 5 +- .../api/subsonic/SubsonicAPIClientTest.kt | 3 +- .../interceptors/BaseInterceptorTest.kt | 3 +- .../api/subsonic/ApiVersionCheckWrapper.kt | 27 ++- .../api/subsonic/SubsonicAPIDefinition.kt | 13 +- .../api/subsonic/SubsonicAPIVersions.kt | 13 +- .../VersionAwareJacksonConverterFactory.kt | 7 +- .../interceptors/RangeHeaderInterceptor.kt | 1 + .../api/subsonic/models/AlbumListType.kt | 3 +- .../api/subsonic/models/JukeboxAction.kt | 3 +- .../subsonic/response/BookmarksResponse.kt | 3 +- .../subsonic/response/ChatMessagesResponse.kt | 3 +- .../api/subsonic/response/GenresResponse.kt | 3 +- .../response/GetAlbumList2Response.kt | 3 +- .../subsonic/response/GetAlbumListResponse.kt | 3 +- .../subsonic/response/GetPodcastsResponse.kt | 3 +- .../response/GetRandomSongsResponse.kt | 3 +- .../response/GetSongsByGenreResponse.kt | 3 +- .../api/subsonic/response/JukeboxResponse.kt | 6 +- .../subsonic/response/MusicFoldersResponse.kt | 3 +- .../api/subsonic/response/SharesResponse.kt | 3 +- .../api/subsonic/response/SubsonicResponse.kt | 3 +- .../api/subsonic/response/VideosResponse.kt | 3 +- .../ProxyPasswordInterceptorTest.kt | 10 +- gradle/libs.versions.toml | 4 +- .../ultrasonic/activity/NavigationActivity.kt | 30 ++- .../ultrasonic/adapters/AlbumRowDelegate.kt | 9 +- .../ultrasonic/adapters/DividerBinder.kt | 5 +- .../adapters/FolderSelectorBinder.kt | 5 +- .../ultrasonic/adapters/HeaderViewBinder.kt | 4 +- .../ultrasonic/adapters/ServerRowAdapter.kt | 1 - .../ultrasonic/adapters/TrackViewHolder.kt | 20 +- .../ultrasonic/audiofx/EqualizerController.kt | 3 +- .../ultrasonic/data/ActiveServerProvider.kt | 3 +- .../org/moire/ultrasonic/data/AppDatabase.kt | 20 +- .../moire/ultrasonic/data/CachedDataSource.kt | 8 +- .../org/moire/ultrasonic/data/MetaDatabase.kt | 26 ++- .../moire/ultrasonic/di/MusicServiceModule.kt | 1 + .../ultrasonic/domain/APIAlbumConverter.kt | 1 + .../ultrasonic/domain/APIArtistConverter.kt | 1 + .../domain/APIChatMessageConverter.kt | 1 + .../ultrasonic/domain/APIGenreConverter.kt | 1 + .../ultrasonic/domain/APIJukeboxCoverter.kt | 1 + .../ultrasonic/domain/APILyricsConverter.kt | 1 + .../domain/APIMusicDirectoryConverter.kt | 16 +- .../domain/APIMusicFolderConverter.kt | 12 +- .../ultrasonic/domain/APIPlaylistConverter.kt | 7 +- .../ultrasonic/domain/APIPodcastConverter.kt | 7 +- .../ultrasonic/domain/APISearchConverter.kt | 4 +- .../ultrasonic/domain/APIShareConverter.kt | 1 + .../ultrasonic/domain/APIUserConverter.kt | 1 + .../ultrasonic/fragment/AlbumListFragment.kt | 5 +- .../ultrasonic/fragment/BookmarksFragment.kt | 1 - .../ultrasonic/fragment/EditServerFragment.kt | 54 +++-- .../ultrasonic/fragment/EntryListFragment.kt | 2 +- .../ultrasonic/fragment/EqualizerFragment.kt | 10 +- .../moire/ultrasonic/fragment/MainFragment.kt | 7 +- .../ultrasonic/fragment/MultiListFragment.kt | 6 +- .../ultrasonic/fragment/PlayerFragment.kt | 54 +++-- .../ultrasonic/fragment/SearchFragment.kt | 8 - .../ultrasonic/fragment/SettingsFragment.kt | 3 +- .../fragment/TrackCollectionFragment.kt | 19 +- .../fragment/legacy/ChatFragment.kt | 10 +- .../fragment/legacy/PlaylistsFragment.kt | 24 +- .../fragment/legacy/SelectGenreFragment.kt | 4 +- .../fragment/legacy/SharesFragment.kt | 37 +-- .../imageloader/CoverArtRequestHandler.kt | 11 +- .../ultrasonic/imageloader/ImageLoader.kt | 22 +- .../ultrasonic/imageloader/RequestCreator.kt | 24 +- .../moire/ultrasonic/model/AlbumListModel.kt | 6 +- .../moire/ultrasonic/model/EditServerModel.kt | 55 +++-- .../ultrasonic/model/GenericListModel.kt | 10 +- .../moire/ultrasonic/model/SearchListModel.kt | 7 +- .../ultrasonic/model/TrackCollectionModel.kt | 21 +- .../provider/AlbumArtContentProvider.kt | 4 +- .../provider/UltrasonicAppWidgetProvider.kt | 6 +- .../receiver/BluetoothIntentReceiver.kt | 3 +- .../ultrasonic/service/CachedMusicService.kt | 9 +- .../ultrasonic/service/DownloadService.kt | 6 +- .../moire/ultrasonic/service/DownloadState.kt | 13 +- .../moire/ultrasonic/service/DownloadTask.kt | 9 +- .../ultrasonic/service/JukeboxMediaPlayer.kt | 21 +- .../service/MediaLibrarySessionCallback.kt | 173 ++++++++------ .../service/MediaPlayerLifecycleSupport.kt | 12 +- .../ultrasonic/service/MediaPlayerManager.kt | 39 ++-- .../moire/ultrasonic/service/MusicService.kt | 1 - .../ultrasonic/service/OfflineMusicService.kt | 28 +-- .../ultrasonic/service/PlaybackService.kt | 6 +- .../moire/ultrasonic/service/PlaybackState.kt | 2 +- .../service/PlaybackStateSerializer.kt | 1 - .../ultrasonic/service/PlaylistTimeline.kt | 28 ++- .../ultrasonic/service/RESTMusicService.kt | 218 +++++------------- .../moire/ultrasonic/service/RatingManager.kt | 7 +- .../org/moire/ultrasonic/service/RxBus.kt | 1 + .../subsonic/ImageLoaderProvider.kt | 4 +- .../ultrasonic/subsonic/RestErrorMapper.kt | 46 ++-- .../moire/ultrasonic/subsonic/ShareHandler.kt | 48 ++-- .../ultrasonic/util/CommunicationError.kt | 12 +- .../ultrasonic/util/CoroutinePatterns.kt | 8 +- .../org/moire/ultrasonic/util/DownloadUtil.kt | 25 +- .../util/EntryByDiscAndTrackComparator.kt | 14 +- .../org/moire/ultrasonic/util/FileUtil.kt | 18 +- .../org/moire/ultrasonic/util/LayoutType.kt | 3 +- .../ultrasonic/util/MediaItemConverter.kt | 64 +++-- .../util/SettableAsyncListDiffer.kt | 27 +-- .../org/moire/ultrasonic/util/Settings.kt | 3 +- .../moire/ultrasonic/util/SettingsDelegate.kt | 3 +- .../org/moire/ultrasonic/util/StorageFile.kt | 9 +- .../moire/ultrasonic/util/TimeSpanPicker.kt | 21 +- .../ultrasonic/util/TimeSpanPreference.kt | 7 +- .../util/UncaughtExceptionHandler.kt | 4 +- .../kotlin/org/moire/ultrasonic/util/Util.kt | 120 +++------- .../moire/ultrasonic/view/AutoRepeatButton.kt | 7 +- .../org/moire/ultrasonic/view/ChatAdapter.kt | 9 +- .../org/moire/ultrasonic/view/ShareAdapter.kt | 4 +- .../org/moire/ultrasonic/view/SortOrder.kt | 2 +- ultrasonic/src/main/res/values-cs/strings.xml | 4 - ultrasonic/src/main/res/values-de/strings.xml | 4 - ultrasonic/src/main/res/values-es/strings.xml | 4 - ultrasonic/src/main/res/values-fr/strings.xml | 4 - ultrasonic/src/main/res/values-hu/strings.xml | 4 - ultrasonic/src/main/res/values-it/strings.xml | 4 - ultrasonic/src/main/res/values-ja/strings.xml | 4 - .../src/main/res/values-nb-rNO/strings.xml | 4 - ultrasonic/src/main/res/values-nl/strings.xml | 4 - ultrasonic/src/main/res/values-pl/strings.xml | 4 - .../src/main/res/values-pt-rBR/strings.xml | 4 - ultrasonic/src/main/res/values-pt/strings.xml | 4 - ultrasonic/src/main/res/values-ru/strings.xml | 4 - .../src/main/res/values-zh-rCN/strings.xml | 4 - .../src/main/res/values-zh-rTW/strings.xml | 4 - ultrasonic/src/main/res/values/strings.xml | 4 - .../domain/APIArtistConverterTest.kt | 4 +- .../domain/APIBookmarkConverterTest.kt | 8 +- .../domain/APIIndexConverterTest.kt | 3 +- .../domain/APIMusicDirectoryConverterTest.kt | 15 +- .../domain/APIPodcastConverterTest.kt | 11 +- .../ultrasonic/domain/APIUserConverterTest.kt | 7 +- .../imageloader/AvatarRequestHandlerTest.kt | 3 +- .../imageloader/CoverArtRequestHandlerTest.kt | 3 +- 142 files changed, 930 insertions(+), 960 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..3f25798e --- /dev/null +++ b/.editorconfig @@ -0,0 +1,2 @@ +[*.{kt,kts}] +ktlint_code_style = android_studio \ No newline at end of file diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt index 28af9da0..b581d6a9 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/Album.kt @@ -31,7 +31,7 @@ data class Album( override var genre: String? = null, override var starred: Boolean = false, override var path: String? = null, - override var closeness: Int = 0, + override var closeness: Int = 0 ) : MusicDirectory.Child() { override var isDirectory = true override var isVideo = false diff --git a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt index 23ba8663..852694e6 100644 --- a/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt +++ b/core/domain/src/main/kotlin/org/moire/ultrasonic/domain/MusicDirectory.kt @@ -13,10 +13,7 @@ class MusicDirectory : ArrayList() { var name: String? = null @JvmOverloads - fun getChildren( - includeDirs: Boolean = true, - includeFiles: Boolean = true - ): List { + fun getChildren(includeDirs: Boolean = true, includeFiles: Boolean = true): List { if (includeDirs && includeFiles) { return toList() } diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt index 8fcacecb..8ec08853 100644 --- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt +++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIClientTest.kt @@ -8,7 +8,8 @@ import org.moire.ultrasonic.api.subsonic.rules.MockWebServerRule * Base class for integration tests for [SubsonicAPIClient] class. */ abstract class SubsonicAPIClientTest { - @JvmField @Rule val mockWebServerRule = MockWebServerRule() + @JvmField @Rule + val mockWebServerRule = MockWebServerRule() protected lateinit var config: SubsonicClientConfiguration protected lateinit var client: SubsonicAPIClient diff --git a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/BaseInterceptorTest.kt b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/BaseInterceptorTest.kt index 81cc2833..d1eef5cb 100644 --- a/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/BaseInterceptorTest.kt +++ b/core/subsonic-api/src/integrationTest/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/BaseInterceptorTest.kt @@ -11,7 +11,8 @@ import org.moire.ultrasonic.api.subsonic.rules.MockWebServerRule * Base class for testing [okhttp3.Interceptor] implementations. */ abstract class BaseInterceptorTest { - @Rule @JvmField val mockWebServerRule = MockWebServerRule() + @Rule @JvmField + val mockWebServerRule = MockWebServerRule() lateinit var client: OkHttpClient diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/ApiVersionCheckWrapper.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/ApiVersionCheckWrapper.kt index 732de75d..8bd3488f 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/ApiVersionCheckWrapper.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/ApiVersionCheckWrapper.kt @@ -92,7 +92,13 @@ internal class ApiVersionCheckWrapper( checkVersion(V1_4_0) checkParamVersion(musicFolderId, V1_12_0) return api.search2( - query, artistCount, artistOffset, albumCount, albumOffset, songCount, musicFolderId + query, + artistCount, + artistOffset, + albumCount, + albumOffset, + songCount, + musicFolderId ) } @@ -108,7 +114,13 @@ internal class ApiVersionCheckWrapper( checkVersion(V1_8_0) checkParamVersion(musicFolderId, V1_12_0) return api.search3( - query, artistCount, artistOffset, albumCount, albumOffset, songCount, musicFolderId + query, + artistCount, + artistOffset, + albumCount, + albumOffset, + songCount, + musicFolderId ) } @@ -228,7 +240,13 @@ internal class ApiVersionCheckWrapper( checkParamVersion(estimateContentLength, V1_8_0) checkParamVersion(converted, V1_14_0) return api.stream( - id, maxBitRate, format, timeOffset, videoSize, estimateContentLength, converted + id, + maxBitRate, + format, + timeOffset, + videoSize, + estimateContentLength, + converted ) } @@ -335,8 +353,9 @@ internal class ApiVersionCheckWrapper( private fun checkVersion(expectedVersion: SubsonicAPIVersions) { // If it is true, it is probably the first call with this server if (!isRealProtocolVersion) return - if (currentApiVersion < expectedVersion) + if (currentApiVersion < expectedVersion) { throw ApiNotSupportedException(currentApiVersion) + } } private fun checkParamVersion(param: Any?, expectedVersion: SubsonicAPIVersions) { diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt index c6a7559a..15294079 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIDefinition.kt @@ -90,10 +90,7 @@ interface SubsonicAPIDefinition { ): Call @GET("setRating.view") - fun setRating( - @Query("id") id: String, - @Query("rating") rating: Int - ): Call + fun setRating(@Query("id") id: String, @Query("rating") rating: Int): Call @GET("getArtist.view") fun getArtist(@Query("id") id: String): Call @@ -158,8 +155,7 @@ interface SubsonicAPIDefinition { @Query("public") public: Boolean? = null, @Query("songIdToAdd") songIdsToAdd: List? = null, @Query("songIndexToRemove") songIndexesToRemove: List? = null - ): - Call + ): Call @GET("getPodcasts.view") fun getPodcasts( @@ -227,10 +223,7 @@ interface SubsonicAPIDefinition { @Streaming @GET("getCoverArt.view") - fun getCoverArt( - @Query("id") id: String, - @Query("size") size: Long? = null - ): Call + fun getCoverArt(@Query("id") id: String, @Query("size") size: Long? = null): Call @Streaming @GET("stream.view") diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt index 1b7e6a66..a5e902e7 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/SubsonicAPIVersions.kt @@ -29,10 +29,12 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion: V1_13_0("5.3", "1.13.0"), V1_14_0("6.0", "1.14.0"), V1_15_0("6.1", "1.15.0"), - V1_16_0("6.1.2", "1.16.0"); + V1_16_0("6.1.2", "1.16.0") + ; companion object { - @JvmStatic @Throws(IllegalArgumentException::class) + @JvmStatic + @Throws(IllegalArgumentException::class) fun getClosestKnownClientApiVersion(apiVersion: String): SubsonicAPIVersions { val versionComponents = apiVersion.split(".") @@ -41,8 +43,11 @@ enum class SubsonicAPIVersions(val subsonicVersions: String, val restApiVersion: try { val majorVersion = versionComponents[0].toInt() val minorVersion = versionComponents[1].toInt() - val patchVersion = if (versionComponents.size > 2) versionComponents[2].toInt() - else 0 + val patchVersion = if (versionComponents.size > 2) { + versionComponents[2].toInt() + } else { + 0 + } when (majorVersion) { 1 -> when { diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactory.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactory.kt index b5c73e64..f68771b8 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactory.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/VersionAwareJacksonConverterFactory.kt @@ -48,7 +48,10 @@ class VersionAwareJacksonConverterFactory( retrofit: Retrofit ): Converter<*, RequestBody>? { return jacksonConverterFactory?.requestBodyConverter( - type, parameterAnnotations, methodAnnotations, retrofit + type, + parameterAnnotations, + methodAnnotations, + retrofit ) } @@ -63,7 +66,7 @@ class VersionAwareJacksonConverterFactory( } } - class VersionAwareResponseBodyConverter ( + class VersionAwareResponseBodyConverter( private val notifier: (SubsonicAPIVersions) -> Unit = {}, private val adapter: ObjectReader ) : Converter { diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt index 1bdb0153..08311d04 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/RangeHeaderInterceptor.kt @@ -6,6 +6,7 @@ import okhttp3.Interceptor.Chain import okhttp3.Response internal const val SOCKET_READ_TIMEOUT_DOWNLOAD = 30 * 1000 + // Allow 20 seconds extra timeout pear MB offset. internal const val TIMEOUT_MILLIS_PER_OFFSET_BYTE = 0.02 diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListType.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListType.kt index f30f389b..8d2b6069 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListType.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/AlbumListType.kt @@ -23,7 +23,8 @@ enum class AlbumListType(val typeName: String) { SORTED_BY_ARTIST("alphabeticalByArtist"), STARRED("starred"), BY_YEAR("byYear"), - BY_GENRE("byGenre"); + BY_GENRE("byGenre") + ; override fun toString(): String { return typeName diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/JukeboxAction.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/JukeboxAction.kt index 19502d02..ae5415c2 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/JukeboxAction.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/models/JukeboxAction.kt @@ -16,7 +16,8 @@ enum class JukeboxAction(val action: String) { CLEAR("clear"), REMOVE("remove"), SHUFFLE("shuffle"), - SET_GAIN("setGain"); + SET_GAIN("setGain") + ; override fun toString(): String { return action diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/BookmarksResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/BookmarksResponse.kt index 5cbd8bbd..1aaaeecc 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/BookmarksResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/BookmarksResponse.kt @@ -10,7 +10,8 @@ class BookmarksResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("bookmarks") private val bookmarksWrapper = BookmarkWrapper() + @JsonProperty("bookmarks") + private val bookmarksWrapper = BookmarkWrapper() val bookmarkList: List get() = bookmarksWrapper.bookmarkList } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/ChatMessagesResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/ChatMessagesResponse.kt index 71055616..bfdbce59 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/ChatMessagesResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/ChatMessagesResponse.kt @@ -10,7 +10,8 @@ class ChatMessagesResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("chatMessages") private val wrapper = ChatMessagesWrapper() + @JsonProperty("chatMessages") + private val wrapper = ChatMessagesWrapper() val chatMessages: List get() = wrapper.messagesList } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GenresResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GenresResponse.kt index 85fbb35c..1108f2ec 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GenresResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GenresResponse.kt @@ -10,7 +10,8 @@ class GenresResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("genres") private val genresWrapper = GenresWrapper() + @JsonProperty("genres") + private val genresWrapper = GenresWrapper() val genresList: List get() = genresWrapper.genresList } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumList2Response.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumList2Response.kt index 264ba727..3d6f23de 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumList2Response.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumList2Response.kt @@ -11,7 +11,8 @@ class GetAlbumList2Response( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("albumList2") private val albumWrapper2 = AlbumWrapper2() + @JsonProperty("albumList2") + private val albumWrapper2 = AlbumWrapper2() val albumList: List get() = albumWrapper2.albumList diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumListResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumListResponse.kt index 81c6be5b..79212a4c 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumListResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetAlbumListResponse.kt @@ -10,7 +10,8 @@ class GetAlbumListResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("albumList") private val albumWrapper = AlbumWrapper() + @JsonProperty("albumList") + private val albumWrapper = AlbumWrapper() val albumList: List get() = albumWrapper.albumList diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetPodcastsResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetPodcastsResponse.kt index 3fa0fd1d..83a357f4 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetPodcastsResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetPodcastsResponse.kt @@ -10,7 +10,8 @@ class GetPodcastsResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("podcasts") private val channelsWrapper = PodcastChannelWrapper() + @JsonProperty("podcasts") + private val channelsWrapper = PodcastChannelWrapper() val podcastChannels: List get() = channelsWrapper.channelsList diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetRandomSongsResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetRandomSongsResponse.kt index c987db12..a5215a58 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetRandomSongsResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetRandomSongsResponse.kt @@ -10,7 +10,8 @@ class GetRandomSongsResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("randomSongs") private val songsWrapper = RandomSongsWrapper() + @JsonProperty("randomSongs") + private val songsWrapper = RandomSongsWrapper() val songsList get() = songsWrapper.songsList diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetSongsByGenreResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetSongsByGenreResponse.kt index 61b8274f..bc9d7e88 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetSongsByGenreResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/GetSongsByGenreResponse.kt @@ -10,7 +10,8 @@ class GetSongsByGenreResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("songsByGenre") private val songsByGenreList = SongsByGenreWrapper() + @JsonProperty("songsByGenre") + private val songsByGenreList = SongsByGenreWrapper() val songsList get() = songsByGenreList.songsList } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/JukeboxResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/JukeboxResponse.kt index eb936ef5..6a909246 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/JukeboxResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/JukeboxResponse.kt @@ -11,11 +11,13 @@ class JukeboxResponse( error: SubsonicError?, var jukebox: JukeboxStatus = JukeboxStatus() ) : SubsonicResponse(status, version, error) { - @JsonSetter("jukeboxStatus") fun setJukeboxStatus(jukebox: JukeboxStatus) { + @JsonSetter("jukeboxStatus") + fun setJukeboxStatus(jukebox: JukeboxStatus) { this.jukebox = jukebox } - @JsonSetter("jukeboxPlaylist") fun setJukeboxPlaylist(jukebox: JukeboxStatus) { + @JsonSetter("jukeboxPlaylist") + fun setJukeboxPlaylist(jukebox: JukeboxStatus) { this.jukebox = jukebox } } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt index 1cd6edcc..d8989a7f 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/MusicFoldersResponse.kt @@ -10,7 +10,8 @@ class MusicFoldersResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("musicFolders") private val wrapper = MusicFoldersWrapper() + @JsonProperty("musicFolders") + private val wrapper = MusicFoldersWrapper() val musicFolders get() = wrapper.musicFolders } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SharesResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SharesResponse.kt index a57d8b23..c457e8ed 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SharesResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SharesResponse.kt @@ -10,7 +10,8 @@ class SharesResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("shares") private val wrappedShares = SharesWrapper() + @JsonProperty("shares") + private val wrappedShares = SharesWrapper() val shares get() = wrappedShares.share } diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt index abbe64b8..7fe6fa86 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/SubsonicResponse.kt @@ -20,7 +20,8 @@ open class SubsonicResponse( ) { @JsonDeserialize(using = Status.Companion.StatusJsonDeserializer::class) enum class Status(val jsonValue: String) { - OK("ok"), ERROR("failed"); + OK("ok"), + ERROR("failed"); companion object { fun getStatusFromJson(jsonValue: String) = diff --git a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/VideosResponse.kt b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/VideosResponse.kt index e6f8d0eb..f16d1dba 100644 --- a/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/VideosResponse.kt +++ b/core/subsonic-api/src/main/kotlin/org/moire/ultrasonic/api/subsonic/response/VideosResponse.kt @@ -10,7 +10,8 @@ class VideosResponse( version: SubsonicAPIVersions, error: SubsonicError? ) : SubsonicResponse(status, version, error) { - @JsonProperty("videos") private val videosWrapper = VideosWrapper() + @JsonProperty("videos") + private val videosWrapper = VideosWrapper() val videosList: List get() = videosWrapper.videosList } diff --git a/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/ProxyPasswordInterceptorTest.kt b/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/ProxyPasswordInterceptorTest.kt index f9fde4b4..42f8e09d 100644 --- a/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/ProxyPasswordInterceptorTest.kt +++ b/core/subsonic-api/src/test/kotlin/org/moire/ultrasonic/api/subsonic/interceptors/ProxyPasswordInterceptorTest.kt @@ -18,7 +18,9 @@ class ProxyPasswordInterceptorTest { private val proxyInterceptor = ProxyPasswordInterceptor( V1_12_0, - mockPasswordHexInterceptor, mockPasswordMd5Interceptor, false + mockPasswordHexInterceptor, + mockPasswordMd5Interceptor, + false ) @Test @@ -40,8 +42,10 @@ class ProxyPasswordInterceptorTest { @Test fun `Should use hex password if forceHex is true`() { val interceptor = ProxyPasswordInterceptor( - V1_16_0, mockPasswordHexInterceptor, - mockPasswordMd5Interceptor, true + V1_16_0, + mockPasswordHexInterceptor, + mockPasswordMd5Interceptor, + true ) interceptor.intercept(mockChain) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d2c9153a..e4499c93 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,8 +6,8 @@ navigation = "2.7.5" gradlePlugin = "8.2.0" androidxcar = "1.2.0" androidxcore = "1.12.0" -ktlint = "0.43.2" -ktlintGradle = "11.6.1" +ktlint = "1.0.1" +ktlintGradle = "12.0.2" detekt = "1.23.4" preferences = "1.2.1" media3 = "1.1.1" diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt index b6b6f8e4..862e9dda 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/NavigationActivity.kt @@ -204,10 +204,11 @@ class NavigationActivity : ScopeActivity() { } rxBusSubscription += RxBus.playerStateObservable.subscribe { - if (it.state == STATE_READY) + if (it.state == STATE_READY) { showNowPlaying() - else + } else { hideNowPlaying() + } } rxBusSubscription += RxBus.themeChangedEventObservable.subscribe { @@ -314,8 +315,11 @@ class NavigationActivity : ScopeActivity() { // Lifecycle support's constructor registers some event receivers so it should be created early lifecycleSupport.onCreate() - if (!nowPlayingHidden) showNowPlaying() - else hideNowPlaying() + if (!nowPlayingHidden) { + showNowPlaying() + } else { + hideNowPlaying() + } } /* @@ -334,21 +338,24 @@ class NavigationActivity : ScopeActivity() { val activeServer = activeServerProvider.getActiveServer() - if (cachedServerCount == 0) + if (cachedServerCount == 0) { selectServerButton?.text = getString(R.string.main_setup_server, activeServer.name) - else selectServerButton?.text = activeServer.name + } else { + selectServerButton?.text = activeServer.name + } val foregroundColor = ServerColor.getForegroundColor(this, activeServer.color, showVectorBackground) val backgroundColor = ServerColor.getBackgroundColor(this, activeServer.color) - if (activeServer.index == 0) + if (activeServer.index == 0) { selectServerButton?.icon = ContextCompat.getDrawable(this, R.drawable.ic_menu_screen_on_off) - else + } else { selectServerButton?.icon = ContextCompat.getDrawable(this, R.drawable.ic_menu_select_server) + } selectServerButton?.iconTint = ColorStateList.valueOf(foregroundColor) selectServerButton?.setTextColor(foregroundColor) @@ -406,8 +413,9 @@ class NavigationActivity : ScopeActivity() { navigationView?.getHeaderView(0)?.findViewById(R.id.edit_server_button) val onClick: (View) -> Unit = { - if (drawerLayout?.isDrawerVisible(GravityCompat.START) == true) + if (drawerLayout?.isDrawerVisible(GravityCompat.START) == true) { this.drawerLayout?.closeDrawer(GravityCompat.START) + } navController.navigate(R.id.serverSelectorFragment) } @@ -473,7 +481,8 @@ class NavigationActivity : ScopeActivity() { private fun handleSearchIntent(query: String?, autoPlay: Boolean) { val suggestions = SearchRecentSuggestions( this, - SearchSuggestionProvider.AUTHORITY, SearchSuggestionProvider.MODE + SearchSuggestionProvider.AUTHORITY, + SearchSuggestionProvider.MODE ) suggestions.saveRecentQuery(query, null) @@ -528,7 +537,6 @@ class NavigationActivity : ScopeActivity() { private fun showWelcomeDialog() { if (!UApp.instance!!.setupDialogDisplayed) { - Settings.firstInstalledVersion = Util.getVersionCode(UApp.applicationContext()) InfoDialog.Builder(this) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowDelegate.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowDelegate.kt index c54cb32a..e7d79cbb 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowDelegate.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/AlbumRowDelegate.kt @@ -32,7 +32,7 @@ import org.moire.ultrasonic.util.LayoutType */ open class AlbumRowDelegate( open val onItemClick: (Album) -> Unit, - open val onContextMenuClick: (MenuItem, Album) -> Boolean, + open val onContextMenuClick: (MenuItem, Album) -> Boolean ) : ItemViewDelegate(), KoinComponent { private val starDrawable: Int = R.drawable.ic_star_full @@ -61,8 +61,11 @@ open class AlbumRowDelegate( val imageLoaderProvider: ImageLoaderProvider by inject() imageLoaderProvider.executeOn { it.loadImage( - holder.coverArt, item, - false, 0, R.drawable.unknown_album + holder.coverArt, + item, + false, + 0, + R.drawable.unknown_album ) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/DividerBinder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/DividerBinder.kt index eae411dd..160e90b7 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/DividerBinder.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/adapters/DividerBinder.kt @@ -23,10 +23,7 @@ class DividerBinder : ItemViewBinder { + DownloadState.QUEUED + -> { showIndefiniteProgress() } else -> { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/audiofx/EqualizerController.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/audiofx/EqualizerController.kt index 80b25bbc..4727202b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/audiofx/EqualizerController.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/audiofx/EqualizerController.kt @@ -50,7 +50,8 @@ class EqualizerController : CoroutineScope by CoroutineScope(Dispatchers.IO) { launch { try { val settings = deserialize( - UApp.applicationContext(), "equalizer.dat" + UApp.applicationContext(), + "equalizer.dat" ) settings?.apply(equalizer!!) } catch (all: Throwable) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt index 0d1d51c1..b41f630d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/ActiveServerProvider.kt @@ -51,7 +51,8 @@ class ActiveServerProvider( } Timber.d( "getActiveServer retrieved from DataBase, id: %s cachedServer: %s", - serverId, cachedServer + serverId, + cachedServer ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt index ef23f36f..ead1205a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/AppDatabase.kt @@ -1,3 +1,5 @@ +@file:Suppress("ktlint:standard:max-line-length") + package org.moire.ultrasonic.data import androidx.room.Database @@ -265,21 +267,27 @@ val MIGRATION_5_4: Migration = object : Migration(5, 4) { database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`") } } -/* ktlint-disable max-line-length */ val MIGRATION_5_6: Migration = object : Migration(5, 6) { override fun migrate(database: SupportSQLiteDatabase) { - database.execSQL("CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `forcePlainTextPassword` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER, `jukeboxSupport` INTEGER, `videoSupport` INTEGER)") - database.execSQL("INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`") + database.execSQL( + "CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `forcePlainTextPassword` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER, `jukeboxSupport` INTEGER, `videoSupport` INTEGER)" + ) + database.execSQL( + "INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`" + ) database.execSQL("DROP TABLE `ServerSetting`") database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`") } } val MIGRATION_6_5: Migration = object : Migration(6, 5) { override fun migrate(database: SupportSQLiteDatabase) { - database.execSQL("CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `ldapSupport` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER)") - database.execSQL("INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`") + database.execSQL( + "CREATE TABLE IF NOT EXISTS `_new_ServerSetting` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `index` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, `color` INTEGER, `userName` TEXT NOT NULL, `password` TEXT NOT NULL, `jukeboxByDefault` INTEGER NOT NULL, `allowSelfSignedCertificate` INTEGER NOT NULL, `ldapSupport` INTEGER NOT NULL, `musicFolderId` TEXT, `minimumApiVersion` TEXT, `chatSupport` INTEGER, `bookmarkSupport` INTEGER, `shareSupport` INTEGER, `podcastSupport` INTEGER)" + ) + database.execSQL( + "INSERT INTO `_new_ServerSetting` (`musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`ldapSupport`,`id`,`allowSelfSignedCertificate`,`chatSupport`) SELECT `musicFolderId`,`color`,`index`,`userName`,`minimumApiVersion`,`jukeboxByDefault`,`url`,`password`,`shareSupport`,`bookmarkSupport`,`name`,`podcastSupport`,`forcePlainTextPassword`,`id`,`allowSelfSignedCertificate`,`chatSupport` FROM `ServerSetting`" + ) database.execSQL("DROP TABLE `ServerSetting`") database.execSQL("ALTER TABLE `_new_ServerSetting` RENAME TO `ServerSetting`") } } -/* ktlint-enable max-line-length */ diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/CachedDataSource.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/CachedDataSource.kt index 9f67f7f2..e0f833df 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/CachedDataSource.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/CachedDataSource.kt @@ -39,9 +39,7 @@ class CachedDataSource( ) } - private fun createDataSourceInternal( - upstreamDataSource: DataSource - ): CachedDataSource { + private fun createDataSourceInternal(upstreamDataSource: DataSource): CachedDataSource { return CachedDataSource( upstreamDataSource ) @@ -93,7 +91,9 @@ class CachedDataSource( readInternal(buffer, offset, length) } catch (e: IOException) { throw HttpDataSourceException.createForIOException( - e, Util.castNonNull(dataSpec), HttpDataSourceException.TYPE_READ + e, + Util.castNonNull(dataSpec), + HttpDataSourceException.TYPE_READ ) } } else { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt index 3ecbe54d..daf50d4c 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/data/MetaDatabase.kt @@ -5,6 +5,8 @@ * Distributed under terms of the GNU GPLv3 license. */ +@file:Suppress("ktlint:standard:max-line-length") + package org.moire.ultrasonic.data import androidx.room.AutoMigration @@ -37,7 +39,7 @@ import org.moire.ultrasonic.domain.Track AutoMigration( from = 1, to = 2 - ), + ) ], exportSchema = true, version = 3 @@ -67,7 +69,6 @@ class Converters { } } -/* ktlint-disable max-line-length */ val META_MIGRATION_2_3: Migration = object : Migration(2, 3) { override fun migrate(database: SupportSQLiteDatabase) { database.execSQL("DROP TABLE `albums`") @@ -75,11 +76,20 @@ val META_MIGRATION_2_3: Migration = object : Migration(2, 3) { database.execSQL("DROP TABLE `artists`") database.execSQL("DROP TABLE `tracks`") database.execSQL("DROP TABLE `music_folders`") - database.execSQL("CREATE TABLE IF NOT EXISTS `albums` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `album` TEXT, `title` TEXT, `name` TEXT, `discNumber` INTEGER, `coverArt` TEXT, `songCount` INTEGER, `created` INTEGER, `artist` TEXT, `artistId` TEXT, `duration` INTEGER, `year` INTEGER, `genre` TEXT, `starred` INTEGER NOT NULL, `path` TEXT, `closeness` INTEGER NOT NULL, `isDirectory` INTEGER NOT NULL, `isVideo` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))") - database.execSQL("CREATE TABLE IF NOT EXISTS `indexes` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, `musicFolderId` TEXT, PRIMARY KEY(`id`, `serverId`))") - database.execSQL("CREATE TABLE IF NOT EXISTS `artists` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))") - database.execSQL("CREATE TABLE IF NOT EXISTS `music_folders` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`id`, `serverId`))") - database.execSQL("CREATE TABLE IF NOT EXISTS `tracks` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `isDirectory` INTEGER NOT NULL, `title` TEXT, `album` TEXT, `albumId` TEXT, `artist` TEXT, `artistId` TEXT, `track` INTEGER, `year` INTEGER, `genre` TEXT, `contentType` TEXT, `suffix` TEXT, `transcodedContentType` TEXT, `transcodedSuffix` TEXT, `coverArt` TEXT, `size` INTEGER, `songCount` INTEGER, `duration` INTEGER, `bitRate` INTEGER, `path` TEXT, `isVideo` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `discNumber` INTEGER, `type` TEXT, `created` INTEGER, `closeness` INTEGER NOT NULL, `bookmarkPosition` INTEGER NOT NULL, `userRating` INTEGER, `averageRating` REAL, `name` TEXT, PRIMARY KEY(`id`, `serverId`))") + database.execSQL( + "CREATE TABLE IF NOT EXISTS `albums` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `album` TEXT, `title` TEXT, `name` TEXT, `discNumber` INTEGER, `coverArt` TEXT, `songCount` INTEGER, `created` INTEGER, `artist` TEXT, `artistId` TEXT, `duration` INTEGER, `year` INTEGER, `genre` TEXT, `starred` INTEGER NOT NULL, `path` TEXT, `closeness` INTEGER NOT NULL, `isDirectory` INTEGER NOT NULL, `isVideo` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))" + ) + database.execSQL( + "CREATE TABLE IF NOT EXISTS `indexes` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, `musicFolderId` TEXT, PRIMARY KEY(`id`, `serverId`))" + ) + database.execSQL( + "CREATE TABLE IF NOT EXISTS `artists` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `name` TEXT, `index` TEXT, `coverArt` TEXT, `albumCount` INTEGER, `closeness` INTEGER NOT NULL, PRIMARY KEY(`id`, `serverId`))" + ) + database.execSQL( + "CREATE TABLE IF NOT EXISTS `music_folders` (`id` TEXT NOT NULL, `name` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, PRIMARY KEY(`id`, `serverId`))" + ) + database.execSQL( + "CREATE TABLE IF NOT EXISTS `tracks` (`id` TEXT NOT NULL, `serverId` INTEGER NOT NULL DEFAULT -1, `parent` TEXT, `isDirectory` INTEGER NOT NULL, `title` TEXT, `album` TEXT, `albumId` TEXT, `artist` TEXT, `artistId` TEXT, `track` INTEGER, `year` INTEGER, `genre` TEXT, `contentType` TEXT, `suffix` TEXT, `transcodedContentType` TEXT, `transcodedSuffix` TEXT, `coverArt` TEXT, `size` INTEGER, `songCount` INTEGER, `duration` INTEGER, `bitRate` INTEGER, `path` TEXT, `isVideo` INTEGER NOT NULL, `starred` INTEGER NOT NULL, `discNumber` INTEGER, `type` TEXT, `created` INTEGER, `closeness` INTEGER NOT NULL, `bookmarkPosition` INTEGER NOT NULL, `userRating` INTEGER, `averageRating` REAL, `name` TEXT, PRIMARY KEY(`id`, `serverId`))" + ) } } -/* ktlint-enable max-line-length */ diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt index 6f723c89..ce88f983 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/di/MusicServiceModule.kt @@ -1,4 +1,5 @@ @file:JvmName("MusicServiceModule") + package org.moire.ultrasonic.di import kotlin.math.abs diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt index a0754803..b22096a2 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIAlbumConverter.kt @@ -8,6 +8,7 @@ // Converts Album entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @file:JvmName("APIAlbumConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.Album diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt index 497eae75..073a32f1 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIArtistConverter.kt @@ -8,6 +8,7 @@ // Converts Artist entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @file:JvmName("APIArtistConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.Artist as APIArtist diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt index edd8f51f..fa35cc02 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIChatMessageConverter.kt @@ -1,5 +1,6 @@ // Contains helper functions to convert from api ChatMessage entity to domain entity @file:JvmName("APIChatMessageConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.ChatMessage as ApiChatMessage diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt index 1cd23f60..968567bd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIGenreConverter.kt @@ -1,5 +1,6 @@ // Collection of functions to convert api Genre entity to domain entity @file:JvmName("ApiGenreConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.Genre as APIGenre diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt index 23f22a4f..0e8373b9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIJukeboxCoverter.kt @@ -1,5 +1,6 @@ // Collection of function to convert subsonic api jukebox responses to app entities @file:JvmName("APIJukeboxConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.JukeboxStatus as ApiJukeboxStatus diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt index 2bebc6bb..4e449760 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APILyricsConverter.kt @@ -1,6 +1,7 @@ // Converts Lyrics entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @file:JvmName("APILyricsConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.Lyrics as APILyrics diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt index 9d800369..0cafa7bf 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverter.kt @@ -6,6 +6,7 @@ */ @file:JvmName("APIMusicDirectoryConverter") + package org.moire.ultrasonic.domain import java.text.DateFormat @@ -35,10 +36,7 @@ fun MusicDirectoryChild.toAlbumEntity(serverId: Int): Album = Album(id, serverId populateCommonProps(this, this@toAlbumEntity) } -private fun populateCommonProps( - entry: MusicDirectory.Child, - source: MusicDirectoryChild -) { +private fun populateCommonProps(entry: MusicDirectory.Child, source: MusicDirectoryChild) { entry.parent = source.parent entry.isDirectory = source.isDir entry.title = source.title @@ -63,10 +61,7 @@ private fun populateCommonProps( } } -private fun populateTrackProps( - track: Track, - source: MusicDirectoryChild -) { +private fun populateTrackProps(track: Track, source: MusicDirectoryChild) { track.size = source.size track.contentType = source.contentType track.suffix = source.suffix @@ -84,10 +79,11 @@ fun List.toDomainEntityList(serverId: Int): List = mutableListOf() forEach { - if (it.isDir) + if (it.isDir) { newList.add(it.toAlbumEntity(serverId)) - else + } else { newList.add(it.toTrackEntity(serverId)) + } } return newList diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt index e0cbd6f9..39fb3e3d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIMusicFolderConverter.kt @@ -8,6 +8,7 @@ // Converts MusicFolder entity from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @file:JvmName("APIMusicFolderConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.MusicFolder as APIMusicFolder @@ -18,9 +19,8 @@ fun APIMusicFolder.toDomainEntity(serverId: Int): MusicFolder = MusicFolder( name = this.name ) -fun List.toDomainEntityList(serverId: Int): List = - this.map { - val item = it.toDomainEntity(serverId) - item.serverId = serverId - item - } +fun List.toDomainEntityList(serverId: Int): List = this.map { + val item = it.toDomainEntity(serverId) + item.serverId = serverId + item +} diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt index 3be0e3f1..d2c63f31 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPlaylistConverter.kt @@ -31,8 +31,11 @@ fun APIPlaylist.toMusicDirectoryDomainEntity(serverId: Int): MusicDirectory = } fun APIPlaylist.toDomainEntity(): Playlist = Playlist( - this.id, this.name, this.owner, - this.comment, this.songCount.toString(), + this.id, + this.name, + this.owner, + this.comment, + this.songCount.toString(), this.created.ifNotNull { playlistDateFormat.format(it.time) } ?: "", public ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt index 3d7ee383..e0f9c2fa 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIPodcastConverter.kt @@ -1,12 +1,17 @@ // Converts podcasts entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @file:JvmName("APIPodcastConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.PodcastChannel fun PodcastChannel.toDomainEntity(): PodcastsChannel = PodcastsChannel( - this.id, this.title, this.url, this.description, this.status + this.id, + this.title, + this.url, + this.description, + this.status ) fun List.toDomainEntitiesList(): List = this diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt index ed1af67d..1220642b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APISearchConverter.kt @@ -8,6 +8,7 @@ // Converts SearchResult entities from [org.moire.ultrasonic.api.subsonic.SubsonicAPIClient] // to app domain entities. @file:JvmName("APISearchConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.SearchResult as APISearchResult @@ -15,7 +16,8 @@ import org.moire.ultrasonic.api.subsonic.models.SearchThreeResult import org.moire.ultrasonic.api.subsonic.models.SearchTwoResult fun APISearchResult.toDomainEntity(serverId: Int): SearchResult = SearchResult( - emptyList(), emptyList(), + emptyList(), + emptyList(), this.matchList.map { it.toTrackEntity(serverId) } ) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt index 7fb8a9a4..fa860231 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIShareConverter.kt @@ -7,6 +7,7 @@ // Contains helper method to convert subsonic api share to domain model @file:JvmName("APIShareConverter") + package org.moire.ultrasonic.domain import java.text.SimpleDateFormat diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt index 37dc53ad..7e341463 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/APIUserConverter.kt @@ -1,5 +1,6 @@ // Helper functions to convert User entity to domain entity @file:JvmName("APIUserConverter") + package org.moire.ultrasonic.domain import org.moire.ultrasonic.api.subsonic.models.User diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt index 2a8c29c3..01b8348a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/AlbumListFragment.kt @@ -65,10 +65,7 @@ class AlbumListFragment( /** * The central function to pass a query to the model and return a LiveData object */ - override fun getLiveData( - refresh: Boolean, - append: Boolean - ): LiveData> { + override fun getLiveData(refresh: Boolean, append: Boolean): LiveData> { fetchAlbums(refresh) return listModel.list diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/BookmarksFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/BookmarksFragment.kt index 7c235e5e..0a8f7180 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/BookmarksFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/BookmarksFragment.kt @@ -68,7 +68,6 @@ class BookmarksFragment : TrackCollectionFragment() { */ private fun playNow(songs: List) { if (songs.isNotEmpty()) { - mediaPlayerManager.addToPlaylist( songs = songs, autoPlay = false, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt index b50cfb67..13b700bd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EditServerFragment.kt @@ -86,7 +86,8 @@ class EditServerFragment : Fragment() { override fun onAttach(context: Context) { requireActivity().onBackPressedDispatcher.addCallback( - this, confirmCloseCallback + this, + confirmCloseCallback ) super.onAttach(context) } @@ -186,7 +187,7 @@ class EditServerFragment : Fragment() { } ) .setNegativeButton(getString(R.string.common_cancel)) { - dialogInterface, _ -> + dialogInterface, _ -> dialogInterface.dismiss() } .setBottomSpace(DIALOG_PADDING) @@ -199,7 +200,8 @@ class EditServerFragment : Fragment() { } private val confirmCloseCallback = object : OnBackPressedCallback( - true // default to enabled + // default to enabled + true ) { override fun handleOnBackPressed() { finishActivity() @@ -231,35 +233,46 @@ class EditServerFragment : Fragment() { } override fun onSaveInstanceState(savedInstanceState: Bundle) { savedInstanceState.putString( - ::serverNameEditText.name, serverNameEditText!!.editText?.text.toString() + ::serverNameEditText.name, + serverNameEditText!!.editText?.text.toString() ) savedInstanceState.putString( - ::serverAddressEditText.name, serverAddressEditText!!.editText?.text.toString() + ::serverAddressEditText.name, + serverAddressEditText!!.editText?.text.toString() ) savedInstanceState.putString( - ::userNameEditText.name, userNameEditText!!.editText?.text.toString() + ::userNameEditText.name, + userNameEditText!!.editText?.text.toString() ) savedInstanceState.putString( - ::passwordEditText.name, passwordEditText!!.editText?.text.toString() + ::passwordEditText.name, + passwordEditText!!.editText?.text.toString() ) savedInstanceState.putBoolean( - ::selfSignedSwitch.name, selfSignedSwitch!!.isChecked + ::selfSignedSwitch.name, + selfSignedSwitch!!.isChecked ) savedInstanceState.putBoolean( - ::plaintextSwitch.name, plaintextSwitch!!.isChecked + ::plaintextSwitch.name, + plaintextSwitch!!.isChecked ) savedInstanceState.putBoolean( - ::jukeboxSwitch.name, jukeboxSwitch!!.isChecked + ::jukeboxSwitch.name, + jukeboxSwitch!!.isChecked ) savedInstanceState.putInt( - ::serverColorImageView.name, currentColor + ::serverColorImageView.name, + currentColor ) - if (selectedColor != null) + if (selectedColor != null) { savedInstanceState.putInt( - ::selectedColor.name, selectedColor!! + ::selectedColor.name, + selectedColor!! ) + } savedInstanceState.putBoolean( - ::isInstanceStateSaved.name, true + ::isInstanceStateSaved.name, + true ) super.onSaveInstanceState(savedInstanceState) @@ -286,8 +299,9 @@ class EditServerFragment : Fragment() { plaintextSwitch!!.isChecked = savedInstanceState.getBoolean(::plaintextSwitch.name) jukeboxSwitch!!.isChecked = savedInstanceState.getBoolean(::jukeboxSwitch.name) updateColor(savedInstanceState.getInt(::serverColorImageView.name)) - if (savedInstanceState.containsKey(::selectedColor.name)) + if (savedInstanceState.containsKey(::selectedColor.name)) { selectedColor = savedInstanceState.getInt(::selectedColor.name) + } isInstanceStateSaved = savedInstanceState.getBoolean(::isInstanceStateSaved.name) } @@ -434,7 +448,7 @@ class EditServerFragment : Fragment() { serverSetting.shareSupport, serverSetting.podcastSupport, serverSetting.videoSupport, - serverSetting.jukeboxSupport, + serverSetting.jukeboxSupport ).any { x -> x == false } var progressString = String.format( @@ -445,7 +459,7 @@ class EditServerFragment : Fragment() { |%s - ${resources.getString(R.string.button_bar_podcasts)} |%s - ${resources.getString(R.string.main_videos)} |%s - ${resources.getString(R.string.jukebox)} - """.trimMargin(), + """.trimMargin(), boolToMark(serverSetting.chatSupport), boolToMark(serverSetting.bookmarkSupport), boolToMark(serverSetting.shareSupport), @@ -453,15 +467,17 @@ class EditServerFragment : Fragment() { boolToMark(serverSetting.videoSupport), boolToMark(serverSetting.jukeboxSupport) ) - if (isAnyDisabled) + if (isAnyDisabled) { progressString += "\n\n" + resources.getString(R.string.server_editor_disabled_feature) + } return progressString } private fun boolToMark(value: Boolean?): String { - if (value == null) + if (value == null) { return "⌛" + } return if (value) "✔️" else "❌" } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EntryListFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EntryListFragment.kt index 4b1eed22..dc3ae5d2 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EntryListFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EntryListFragment.kt @@ -54,7 +54,7 @@ abstract class EntryListFragment : MultiListFragment(), Koi id = item.id, name = item.name, parentId = item.id, - isArtist = (item is Artist), + isArtist = (item is Artist) ) findNavController().navigate(action) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt index 047ed65d..510adea2 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/EqualizerFragment.kt @@ -92,7 +92,9 @@ class EqualizerFragment : Fragment() { } for (preset in 0 until equalizer!!.numberOfPresets) { val menuItem = menu.add( - MENU_GROUP_PRESET, preset, preset, + MENU_GROUP_PRESET, + preset, + preset, equalizer!!.getPresetName( preset.toShort() ) @@ -188,11 +190,7 @@ class EqualizerFragment : Fragment() { updateLevelText(levelTextView, bandLevel) bar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener { - override fun onProgressChanged( - seekBar: SeekBar, - progress: Int, - fromUser: Boolean - ) { + override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) { val level = (progress + minEQLevel).toShort() if (fromUser) { try { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt index 6ef9e248..10509f70 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MainFragment.kt @@ -58,7 +58,6 @@ class MainFragment : ScopeFragment(), KoinScopeComponent { } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - FragmentTitle.setTitle(this, R.string.music_library_label) // Load last layout from settings @@ -133,10 +132,7 @@ class MainFragment : ScopeFragment(), KoinScopeComponent { return findFragmentAtPosition(childFragmentManager, viewPager.currentItem) } - private fun findFragmentAtPosition( - fragmentManager: FragmentManager, - position: Int - ): Fragment? { + private fun findFragmentAtPosition(fragmentManager: FragmentManager, position: Int): Fragment? { // If a fragment was recently created and never shown the fragment manager might not // hold a reference to it. Fallback on the WeakMap instead. return fragmentManager.findFragmentByTag("f$position") @@ -172,7 +168,6 @@ class MusicCollectionAdapter(fragment: Fragment, initialType: LayoutType = Layou } override fun createFragment(position: Int): Fragment { - Timber.i("Creating new fragment at position: $position") val action = when (position) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MultiListFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MultiListFragment.kt index 43cc9b2a..505f1ffd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MultiListFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/MultiListFragment.kt @@ -96,9 +96,11 @@ abstract class MultiListFragment : ScopeFragment(), Refreshabl if (title == null) { FragmentTitle.setTitle( this, - if (listModel.isOffline()) + if (listModel.isOffline()) { R.string.music_library_label_offline - else R.string.music_library_label + } else { + R.string.music_library_label + } ) } else { FragmentTitle.setTitle(this, title) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt index a7249b40..d9dada0a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/PlayerFragment.kt @@ -180,6 +180,7 @@ class PlayerFragment : private lateinit var fullStarDrawable: Drawable private var _binding: CurrentPlayingBinding? = null + // This property is only valid between onCreateView and // onDestroyView. private val binding get() = _binding!! @@ -333,8 +334,9 @@ class PlayerFragment : } playButton.setOnClickListener { - if (!mediaPlayerManager.isJukeboxEnabled) + if (!mediaPlayerManager.isJukeboxEnabled) { networkAndStorageChecker.warnIfNetworkOrStorageUnavailable() + } launch(CommunicationError.getHandler(context)) { mediaPlayerManager.play() @@ -637,10 +639,7 @@ class PlayerFragment : return popup } - private fun onContextMenuItemSelected( - menuItem: MenuItem, - item: MusicDirectory.Child - ): Boolean { + private fun onContextMenuItemSelected(menuItem: MenuItem, item: MusicDirectory.Child): Boolean { if (item !is Track) return false return menuItemSelected(menuItem.itemId, item) } @@ -707,8 +706,11 @@ class PlayerFragment : val jukeboxEnabled = !mediaPlayerManager.isJukeboxEnabled mediaPlayerManager.isJukeboxEnabled = jukeboxEnabled toast( - if (jukeboxEnabled) R.string.download_jukebox_on - else R.string.download_jukebox_off, + if (jukeboxEnabled) { + R.string.download_jukebox_on + } else { + R.string.download_jukebox_off + }, false ) return true @@ -783,7 +785,7 @@ class PlayerFragment : } shareHandler.createShare( this, - tracks = tracks, + tracks = tracks ) return true } @@ -792,7 +794,7 @@ class PlayerFragment : shareHandler.createShare( this, - listOf(track), + listOf(track) ) return true } @@ -876,7 +878,7 @@ class PlayerFragment : onContextMenuClick = { menu, id -> onContextMenuItemSelected(menu, id) }, checkable = false, draggable = true, - lifecycleOwner = viewLifecycleOwner, + lifecycleOwner = viewLifecycleOwner ) { view, track -> onCreateContextMenu(view, track) }.apply { this.startDrag = { holder -> dragTouchHelper.startDrag(holder) @@ -898,7 +900,6 @@ class PlayerFragment : viewHolder: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder ): Boolean { - val from = viewHolder.bindingAdapterPosition val to = target.bindingAdapterPosition @@ -951,10 +952,7 @@ class PlayerFragment : mediaPlayerManager.removeFromPlaylist(pos) } - override fun onSelectedChanged( - viewHolder: RecyclerView.ViewHolder?, - actionState: Int - ) { + override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) { super.onSelectedChanged(viewHolder, actionState) if (actionState == ACTION_STATE_DRAG) { @@ -1009,8 +1007,10 @@ class PlayerFragment : if (dX > 0) { canvas.clipRect( - itemView.left.toFloat(), itemView.top.toFloat(), - dX, itemView.bottom.toFloat() + itemView.left.toFloat(), + itemView.top.toFloat(), + dX, + itemView.bottom.toFloat() ) canvas.drawColor(backgroundColor) val left = itemView.left + Util.dpToPx(16, activity!!) @@ -1019,8 +1019,10 @@ class PlayerFragment : drawable?.draw(canvas) } else { canvas.clipRect( - itemView.right.toFloat() + dX, itemView.top.toFloat(), - itemView.right.toFloat(), itemView.bottom.toFloat(), + itemView.right.toFloat() + dX, + itemView.top.toFloat(), + itemView.right.toFloat(), + itemView.bottom.toFloat() ) canvas.drawColor(backgroundColor) val left = itemView.right - Util.dpToPx(16, activity!!) - iconSize @@ -1034,7 +1036,13 @@ class PlayerFragment : viewHolder.itemView.translationX = dX } else { super.onChildDraw( - canvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive + canvas, + recyclerView, + viewHolder, + dX, + dY, + actionState, + isCurrentlyActive ) } } @@ -1070,8 +1078,9 @@ class PlayerFragment : songTitleTextView.text = currentSong!!.title artistTextView.text = currentSong!!.artist albumTextView.text = currentSong!!.album - if (currentSong!!.year != null && Settings.showNowPlayingDetails) + if (currentSong!!.year != null && Settings.showNowPlayingDetails) { albumTextView.append(String.format(Locale.ROOT, " (%d)", currentSong!!.year)) + } if (Settings.showNowPlayingDetails) { genreTextView.text = currentSong!!.genre @@ -1079,11 +1088,12 @@ class PlayerFragment : (currentSong!!.genre != null && currentSong!!.genre!!.isNotBlank()) var bitRate = "" - if (currentSong!!.bitRate != null && currentSong!!.bitRate!! > 0) + if (currentSong!!.bitRate != null && currentSong!!.bitRate!! > 0) { bitRate = String.format( Util.appContext().getString(R.string.song_details_kbps), currentSong!!.bitRate ) + } bitrateFormatTextView.text = String.format( Locale.ROOT, "%s %s", bitRate, currentSong!!.suffix diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt index 9074fe16..0d570ecd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SearchFragment.kt @@ -41,7 +41,6 @@ import org.moire.ultrasonic.subsonic.VideoPlayer.Companion.playVideo import org.moire.ultrasonic.util.ContextMenuUtil.handleContextMenu import org.moire.ultrasonic.util.ContextMenuUtil.handleContextMenuTracks import org.moire.ultrasonic.util.RefreshableFragment -import org.moire.ultrasonic.util.Settings import org.moire.ultrasonic.util.Util import org.moire.ultrasonic.util.Util.toast import org.moire.ultrasonic.util.toastingExceptionHandler @@ -143,7 +142,6 @@ class SearchFragment : MultiListFragment(), KoinScopeComponent, Re val artists = result.artists if (artists.isNotEmpty()) { - list.add(DividerBinder.Divider(R.string.search_artists)) list.addAll(artists) if (searchResult!!.artists.size > artists.size) { @@ -283,10 +281,4 @@ class SearchFragment : MultiListFragment(), KoinScopeComponent, Re ) } } - - companion object { - var DEFAULT_ARTISTS = Settings.defaultArtists - var DEFAULT_ALBUMS = Settings.defaultAlbums - var DEFAULT_SONGS = Settings.defaultSongs - } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt index a67d1782..eb85b9dd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/SettingsFragment.kt @@ -258,7 +258,8 @@ class SettingsFragment : val choice = intArrayOf(defaultChoice) ConfirmationDialog.Builder(requireContext()).setTitle(title) .setSingleChoiceItems( - R.array.bluetoothDeviceSettingNames, defaultChoice + R.array.bluetoothDeviceSettingNames, + defaultChoice ) { _: DialogInterface?, i: Int -> choice[0] = i } .setNegativeButton(R.string.common_cancel) { dialogInterface: DialogInterface, _: Int -> dialogInterface.cancel() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt index 7f7543f0..2e6d6bbd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt @@ -365,9 +365,7 @@ open class TrackCollectionFragment( ) } - private fun playSelectedOrAllTracks( - insertionMode: MediaPlayerManager.InsertionMode - ) { + private fun playSelectedOrAllTracks(insertionMode: MediaPlayerManager.InsertionMode) { mediaPlayerManager.playTracksAndToast( fragment = this, insertionMode = insertionMode, @@ -403,9 +401,7 @@ open class TrackCollectionFragment( listModel.calculateButtonState(selection, ::updateButtonState) } - private fun updateButtonState( - show: TrackCollectionModel.Companion.ButtonStates, - ) { + private fun updateButtonState(show: TrackCollectionModel.Companion.ButtonStates) { // We are coming back from unknown context // and need to ensure Main Thread in order to manipulate the UI // If view is null, our view was disposed in the meantime @@ -484,10 +480,11 @@ open class TrackCollectionFragment( internal fun getSelectedTracks(): List { // Walk through selected set and get the Entries based on the saved ids. return viewAdapter.getCurrentList().mapNotNull { - if (it is Track && viewAdapter.isSelected(it.longId)) + if (it is Track && viewAdapter.isSelected(it.longId)) { it - else + } else { null + } } } @@ -586,7 +583,6 @@ open class TrackCollectionFragment( menuItem: MenuItem, item: MusicDirectory.Child ): Boolean { - val tracks = getClickedSong(item) return ContextMenuUtil.handleContextMenuTracks( @@ -600,10 +596,11 @@ open class TrackCollectionFragment( private fun getClickedSong(item: MusicDirectory.Child): List { // This can probably be done better return viewAdapter.getCurrentList().mapNotNull { - if (it is Track && (it.id == item.id)) + if (it is Track && (it.id == item.id)) { it - else + } else { null + } } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/ChatFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/ChatFragment.kt index 9f7e4744..2245daa7 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/ChatFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/ChatFragment.kt @@ -112,9 +112,10 @@ class ChatFragment : Fragment(), KoinComponent, RefreshableFragment { }) messageEditText.setOnEditorActionListener( OnEditorActionListener { - _: TextView?, - actionId: Int, - event: KeyEvent -> + _: TextView?, + actionId: Int, + event: KeyEvent + -> if (actionId == EditorInfo.IME_ACTION_SEND || (actionId == EditorInfo.IME_NULL && event.action == KeyEvent.ACTION_DOWN) ) { @@ -170,7 +171,8 @@ class ChatFragment : Fragment(), KoinComponent, RefreshableFragment { requireActivity().runOnUiThread { load() } } }, - refreshInterval.toLong(), refreshInterval.toLong() + refreshInterval.toLong(), + refreshInterval.toLong() ) } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/PlaylistsFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/PlaylistsFragment.kt index d8a51c02..5e389308 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/PlaylistsFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/PlaylistsFragment.kt @@ -87,7 +87,7 @@ class PlaylistsFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragme id = id, playlistId = id, name = name, - playlistName = name, + playlistName = name ) findNavController().navigate(action) } @@ -120,10 +120,14 @@ class PlaylistsFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragme override fun onCreateContextMenu(menu: ContextMenu, view: View, menuInfo: ContextMenuInfo?) { super.onCreateContextMenu(menu, view, menuInfo) val inflater = requireActivity().menuInflater - if (isOffline()) inflater.inflate( - R.menu.select_playlist_context_offline, - menu - ) else inflater.inflate(R.menu.select_playlist_context, menu) + if (isOffline()) { + inflater.inflate( + R.menu.select_playlist_context_offline, + menu + ) + } else { + inflater.inflate(R.menu.select_playlist_context, menu) + } val downloadMenuItem = menu.findItem(R.id.playlist_menu_download) if (downloadMenuItem != null) { downloadMenuItem.isVisible = !isOffline() @@ -236,13 +240,17 @@ class PlaylistsFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragme Comments: ${playlist.comment} Song Count: ${playlist.songCount} """.trimIndent() + - if (playlist.public == null) "" else """ + if (playlist.public == null) { + "" + } else { + """ Public: ${playlist.public} - """.trimIndent() + """ + """.trimIndent() + """ Creation Date: ${playlist.created.replace('T', ' ')} - """.trimIndent() + """.trimIndent() + } ) Linkify.addLinks(message, Linkify.WEB_URLS) textView.text = message diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SelectGenreFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SelectGenreFragment.kt index 879dafe2..8a9cf538 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SelectGenreFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SelectGenreFragment.kt @@ -53,8 +53,8 @@ class SelectGenreFragment : Fragment(), RefreshableFragment { swipeRefresh?.setOnRefreshListener { load(true) } genreListView?.setOnItemClickListener { - parent: AdapterView<*>, _: View?, - position: Int, _: Long + parent: AdapterView<*>, _: View?, + position: Int, _: Long -> val genre = parent.getItemAtPosition(position) as Genre diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt index a3336730..e9ceaec8 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/legacy/SharesFragment.kt @@ -80,8 +80,9 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment swipeRefresh!!.setOnRefreshListener { load(true) } emptyTextView = view.findViewById(R.id.select_share_empty) sharesListView!!.onItemClickListener = AdapterView.OnItemClickListener { - parent, _, - position, _ -> + parent, _, + position, _ + -> val share = parent.getItemAtPosition(position) as Share val action = NavigationGraphDirections.toTrackCollection( @@ -171,7 +172,7 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment insertionMode = MediaPlayerManager.InsertionMode.CLEAR, id = share.id, name = share.name, - shuffle = true, + shuffle = true ) } R.id.share_menu_delete -> { @@ -235,21 +236,33 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment Visit Count: ${share.visitCount} """.trimIndent() + ( - if (share.created == null) "" else """ + if (share.created == null) { + "" + } else { + """ Creation Date: ${share.created!!.replace('T', ' ')} - """.trimIndent() + """.trimIndent() + } ) + ( - if (share.lastVisited == null) "" else """ + if (share.lastVisited == null) { + "" + } else { + """ Last Visited Date: ${share.lastVisited!!.replace('T', ' ')} - """.trimIndent() + """.trimIndent() + } ) + - if (share.expires == null) "" else """ + if (share.expires == null) { + "" + } else { + """ Expiration Date: ${share.expires!!.replace('T', ' ')} - """.trimIndent() + """.trimIndent() + } ) Linkify.addLinks(message, Linkify.WEB_URLS) textView.text = message @@ -289,11 +302,7 @@ class SharesFragment : ScopeFragment(), KoinScopeComponent, RefreshableFragment alertDialog.show() } - private fun updateShareOnServer( - millis: Long, - description: String, - share: Share - ) { + private fun updateShareOnServer(millis: Long, description: String, share: Share) { launchWithToast { withContext(Dispatchers.IO) { val musicService = MusicServiceFactory.getMusicService() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandler.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandler.kt index c54f74b9..379d79f9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandler.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandler.kt @@ -65,10 +65,7 @@ class CoverArtRequestHandler(private val client: SubsonicAPIClient) : RequestHan throw IOException("${response.apiError}") } - private fun getAlbumArtBitmapFromDisk( - filename: String, - size: Int? - ): Bitmap? { + private fun getAlbumArtBitmapFromDisk(filename: String, size: Int?): Bitmap? { val albumArtFile = FileUtil.getAlbumArtFile(filename) val bitmap: Bitmap? = null if (File(albumArtFile).exists()) { @@ -77,11 +74,7 @@ class CoverArtRequestHandler(private val client: SubsonicAPIClient) : RequestHan return null } - private fun getBitmapFromDisk( - path: String, - size: Int?, - bitmap: Bitmap? - ): Bitmap? { + private fun getBitmapFromDisk(path: String, size: Int?, bitmap: Bitmap?): Bitmap? { var bitmap1 = bitmap val opt = BitmapFactory.Options() if (size != null && size > 0) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt index bb7a76c0..9c5e2566 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/ImageLoader.kt @@ -38,7 +38,7 @@ import timber.log.Timber class ImageLoader( context: Context, apiClient: SubsonicAPIClient, - private val config: ImageLoaderConfig, + private val config: ImageLoaderConfig ) : CoroutineScope by CoroutineScope(Dispatchers.Main + SupervisorJob()) { private val cacheInProgress: ConcurrentHashMap = ConcurrentHashMap() @@ -112,7 +112,10 @@ class ImageLoader( val requestedSize = resolveSize(size, large) val request = ImageRequest.CoverArt( - id!!, cacheKey!!, null, requestedSize, + id!!, + cacheKey!!, + null, + requestedSize, placeHolderDrawableRes = defaultResourceId, errorDrawableRes = defaultResourceId ) @@ -157,7 +160,10 @@ class ImageLoader( if (id != null && key != null && id.isNotEmpty() && view is ImageView) { val request = ImageRequest.CoverArt( - id, key, view, requestedSize, + id, + key, + view, + requestedSize, placeHolderDrawableRes = defaultResourceId, errorDrawableRes = defaultResourceId ) @@ -170,13 +176,11 @@ class ImageLoader( /** * Load the avatar of a given user into an ImageView */ - fun loadAvatarImage( - view: ImageView, - username: String - ) { + fun loadAvatarImage(view: ImageView, username: String) { if (username.isNotEmpty()) { val request = ImageRequest.Avatar( - username, view, + username, + view, placeHolderDrawableRes = R.drawable.ic_contact_picture, errorDrawableRes = R.drawable.ic_contact_picture ) @@ -284,7 +288,7 @@ sealed class ImageRequest( imageView: ImageView?, val size: Int, placeHolderDrawableRes: Int? = null, - errorDrawableRes: Int? = null, + errorDrawableRes: Int? = null ) : ImageRequest( placeHolderDrawableRes, errorDrawableRes, diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/RequestCreator.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/RequestCreator.kt index 37a11f5a..d2657ef3 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/RequestCreator.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/RequestCreator.kt @@ -13,17 +13,15 @@ internal const val QUERY_USERNAME = "username" * Picasso.load() only accepts an URI as parameter. Therefore we create a bogus URI, in which * we encode the data that we need in the RequestHandler. */ -internal fun createLoadCoverArtRequest(entityId: String, size: Long? = 0): Uri = - Uri.Builder() - .scheme(SCHEME) - .appendPath(COVER_ART_PATH) - .appendQueryParameter(QUERY_ID, entityId) - .appendQueryParameter(SIZE, size.toString()) - .build() +internal fun createLoadCoverArtRequest(entityId: String, size: Long? = 0): Uri = Uri.Builder() + .scheme(SCHEME) + .appendPath(COVER_ART_PATH) + .appendQueryParameter(QUERY_ID, entityId) + .appendQueryParameter(SIZE, size.toString()) + .build() -internal fun createLoadAvatarRequest(username: String): Uri = - Uri.Builder() - .scheme(SCHEME) - .appendPath(AVATAR_PATH) - .appendQueryParameter(QUERY_USERNAME, username) - .build() +internal fun createLoadAvatarRequest(username: String): Uri = Uri.Builder() + .scheme(SCHEME) + .appendPath(AVATAR_PATH) + .appendQueryParameter(QUERY_USERNAME, username) + .build() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/AlbumListModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/AlbumListModel.kt index 4fda6e60..e281562f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/AlbumListModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/AlbumListModel.kt @@ -22,11 +22,7 @@ class AlbumListModel(application: Application) : GenericListModel(application) { private var lastType: AlbumListType? = null private var loadedUntil: Int = 0 - suspend fun getAlbumsOfArtist( - refresh: Boolean, - id: String, - name: String? - ) { + suspend fun getAlbumsOfArtist(refresh: Boolean, id: String, name: String?) { withContext(Dispatchers.IO) { val service = MusicServiceFactory.getMusicService() list.postValue(service.getAlbumsOfArtist(id, name, refresh)) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt index 622f7b99..b89380f8 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/EditServerModel.kt @@ -59,36 +59,33 @@ class EditServerModel(val app: Application) : AndroidViewModel(app), KoinCompone return (this.status === SubsonicResponse.Status.OK) } - private fun requestFlow( - type: ServerFeature, - api: SubsonicAPIDefinition, - userName: String - ) = flow { - when (type) { - ServerFeature.CHAT -> emit( - serverFunctionAvailable(type, api::getChatMessagesSuspend) - ) - ServerFeature.BOOKMARK -> emit( - serverFunctionAvailable(type, api::getBookmarksSuspend) - ) - ServerFeature.SHARE -> emit( - serverFunctionAvailable(type, api::getSharesSuspend) - ) - ServerFeature.PODCAST -> emit( - serverFunctionAvailable(type, api::getPodcastsSuspend) - ) - ServerFeature.JUKEBOX -> emit( - serverFunctionAvailable(type) { - val response = api.getUserSuspend(userName) - if (!response.user.jukeboxRole) throw IOException() - response - } - ) - ServerFeature.VIDEO -> emit( - serverFunctionAvailable(type, api::getVideosSuspend) - ) + private fun requestFlow(type: ServerFeature, api: SubsonicAPIDefinition, userName: String) = + flow { + when (type) { + ServerFeature.CHAT -> emit( + serverFunctionAvailable(type, api::getChatMessagesSuspend) + ) + ServerFeature.BOOKMARK -> emit( + serverFunctionAvailable(type, api::getBookmarksSuspend) + ) + ServerFeature.SHARE -> emit( + serverFunctionAvailable(type, api::getSharesSuspend) + ) + ServerFeature.PODCAST -> emit( + serverFunctionAvailable(type, api::getPodcastsSuspend) + ) + ServerFeature.JUKEBOX -> emit( + serverFunctionAvailable(type) { + val response = api.getUserSuspend(userName) + if (!response.user.jukeboxRole) throw IOException() + response + } + ) + ServerFeature.VIDEO -> emit( + serverFunctionAvailable(type, api::getVideosSuspend) + ) + } } - } @OptIn(ExperimentalCoroutinesApi::class) suspend fun queryFeatureSupport(currentServerSetting: ServerSetting): Flow { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt index b0ab5481..23551022 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/GenericListModel.kt @@ -67,10 +67,7 @@ open class GenericListModel(application: Application) : /** * Trigger a load() and notify the UI that we are loading */ - fun backgroundLoadFromServer( - refresh: Boolean, - swipe: SwipeRefreshLayout - ) { + fun backgroundLoadFromServer(refresh: Boolean, swipe: SwipeRefreshLayout) { viewModelScope.launch { swipe.isRefreshing = true loadFromServer(refresh, swipe) @@ -81,10 +78,7 @@ open class GenericListModel(application: Application) : /** * Calls the load() function with error handling */ - private suspend fun loadFromServer( - refresh: Boolean, - swipe: SwipeRefreshLayout - ) { + private suspend fun loadFromServer(refresh: Boolean, swipe: SwipeRefreshLayout) { withContext(Dispatchers.IO) { val musicService = MusicServiceFactory.getMusicService() val isOffline = ActiveServerProvider.isOffline() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt index b0492475..26c8a3ae 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/SearchListModel.kt @@ -6,7 +6,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.moire.ultrasonic.domain.SearchCriteria import org.moire.ultrasonic.domain.SearchResult -import org.moire.ultrasonic.fragment.SearchFragment import org.moire.ultrasonic.service.MusicServiceFactory import org.moire.ultrasonic.util.Settings @@ -31,9 +30,9 @@ class SearchListModel(application: Application) : GenericListModel(application) fun trimResultLength( result: SearchResult, - maxArtists: Int = SearchFragment.DEFAULT_ARTISTS, - maxAlbums: Int = SearchFragment.DEFAULT_ALBUMS, - maxSongs: Int = SearchFragment.DEFAULT_SONGS + maxArtists: Int = Settings.defaultArtists, + maxAlbums: Int = Settings.defaultAlbums, + maxSongs: Int = Settings.defaultSongs ): SearchResult { return SearchResult( artists = result.artists.take(maxArtists), diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/TrackCollectionModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/TrackCollectionModel.kt index 22a92869..3cb5f7a5 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/TrackCollectionModel.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/model/TrackCollectionModel.kt @@ -30,13 +30,9 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat private var loadedUntil: Int = 0 /* - * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both! - */ - suspend fun getMusicDirectory( - refresh: Boolean, - id: String, - name: String? - ) { + * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both! + */ + suspend fun getMusicDirectory(refresh: Boolean, id: String, name: String?) { withContext(Dispatchers.IO) { val service = MusicServiceFactory.getMusicService() val musicDirectory = service.getMusicDirectory(id, name, refresh) @@ -46,9 +42,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat } suspend fun getAlbum(refresh: Boolean, id: String, name: String?) { - withContext(Dispatchers.IO) { - val service = MusicServiceFactory.getMusicService() val musicDirectory: MusicDirectory = service.getAlbumAsDir(id, name, refresh) currentListIsSortable = true @@ -74,9 +68,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat } suspend fun getStarred() { - withContext(Dispatchers.IO) { - val service = MusicServiceFactory.getMusicService() val musicDirectory: MusicDirectory @@ -122,7 +114,6 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat } suspend fun getPodcastEpisodes(podcastChannelId: String) { - withContext(Dispatchers.IO) { val service = MusicServiceFactory.getMusicService() val musicDirectory = service.getPodcastEpisodes(podcastChannelId) @@ -134,7 +125,6 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat } suspend fun getShare(shareId: String) { - withContext(Dispatchers.IO) { val service = MusicServiceFactory.getMusicService() val musicDirectory = MusicDirectory() @@ -174,10 +164,7 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat } @Synchronized - fun calculateButtonState( - selection: List, - onComplete: (ButtonStates) -> Unit - ) { + fun calculateButtonState(selection: List, onComplete: (ButtonStates) -> Unit) { val enabled = selection.isNotEmpty() var unpinEnabled = false var deleteEnabled = false diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/AlbumArtContentProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/AlbumArtContentProvider.kt index d55de716..f2d8606b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/AlbumArtContentProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/AlbumArtContentProvider.kt @@ -38,7 +38,9 @@ class AlbumArtContentProvider : ContentProvider(), KoinComponent { .path( String.format( Locale.ROOT, - "%s|%s", track!!.coverArt, FileUtil.getAlbumArtKey(track, true) + "%s|%s", + track!!.coverArt, + FileUtil.getAlbumArtKey(track, true) ) ) .build() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt index 193bbe52..18f889f8 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/provider/UltrasonicAppWidgetProvider.kt @@ -160,11 +160,7 @@ open class UltrasonicAppWidgetProvider : AppWidgetProvider() { /** * Update Track details in widgets */ - private fun updateTrack( - context: Context, - views: RemoteViews, - currentSong: Track? - ) { + private fun updateTrack(context: Context, views: RemoteViews, currentSong: Track?) { Timber.d("Updating Widget") val res = context.resources val title = currentSong?.title diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.kt index 54753ea9..4093f082 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/receiver/BluetoothIntentReceiver.kt @@ -45,7 +45,8 @@ class BluetoothIntentReceiver : BroadcastReceiver() { connectionStatus = Constants.PREFERENCE_VALUE_ALL } BluetoothDevice.ACTION_ACL_DISCONNECTED, - BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED -> { + BluetoothDevice.ACTION_ACL_DISCONNECT_REQUESTED + -> { disconnectionStatus = Constants.PREFERENCE_VALUE_ALL } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt index 965f8b6b..54aa8b6b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/CachedMusicService.kt @@ -155,8 +155,7 @@ class CachedMusicService(private val musicService: MusicService) : MusicService, * Cached in the RoomDB */ @Throws(Exception::class) - override fun getAlbumsOfArtist(id: String, name: String?, refresh: Boolean): - List { + override fun getAlbumsOfArtist(id: String, name: String?, refresh: Boolean): List { checkSettingsChanged() var result: List @@ -481,11 +480,7 @@ class CachedMusicService(private val musicService: MusicService) : MusicService, } @Throws(Exception::class) - override fun createShare( - ids: List, - description: String?, - expires: Long? - ): List { + override fun createShare(ids: List, description: String?, expires: Long?): List { return musicService.createShare(ids, description, expires) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt index f414ce05..429107ff 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadService.kt @@ -216,7 +216,6 @@ class DownloadService : Service(), KoinComponent { } private fun updateNotification() { - val notification = buildForegroundNotification() if (isInForeground) { @@ -344,10 +343,7 @@ class DownloadService : Service(), KoinComponent { updateLiveData() } - private fun setSaveFlagForTracks( - shouldPin: Boolean, - tracks: List - ): List { + private fun setSaveFlagForTracks(shouldPin: Boolean, tracks: List): List { // Walk through the tracks. If a track is pinned or complete and needs to be changed // to the other state, rename it, but don't return it, thereby excluding it from // further processing. diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadState.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadState.kt index 976184a1..c246046b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadState.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadState.kt @@ -8,7 +8,15 @@ package org.moire.ultrasonic.service enum class DownloadState { - IDLE, QUEUED, DOWNLOADING, RETRYING, FAILED, CANCELLED, DONE, PINNED, UNKNOWN; + IDLE, + QUEUED, + DOWNLOADING, + RETRYING, + FAILED, + CANCELLED, + DONE, + PINNED, + UNKNOWN; companion object { fun DownloadState.isFinalState(): Boolean { @@ -17,7 +25,8 @@ enum class DownloadState { FAILED, CANCELLED, DONE, - PINNED -> true + PINNED + -> true else -> false } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadTask.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadTask.kt index 443defb5..961f9b97 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadTask.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/DownloadTask.kt @@ -91,7 +91,8 @@ class DownloadTask( // Attempt partial HTTP GET, appending to the file if it exists. val (inStream, isPartial) = musicService.getDownloadInputStream( - downloadTrack.track, fileLength, + downloadTrack.track, + fileLength, if (downloadTrack.pinned) Settings.maxBitRatePinning else Settings.maxBitRate, downloadTrack.pinned && Settings.pinWithHighestQuality ) @@ -228,8 +229,9 @@ class DownloadTask( } // Cache the artist - if (artistId != null) + if (artistId != null) { directArtist = cacheArtist(onlineDB, offlineDB, artistId) + } // Now cache the album if (albumId != null) { @@ -246,8 +248,9 @@ class DownloadTask( offlineDB.albumDao().insert(album) // If the album is a Compilation, also cache the Album artist - if (album.artistId != null && album.artistId != artistId) + if (album.artistId != null && album.artistId != artistId) { compilationArtist = cacheArtist(onlineDB, offlineDB, album.artistId!!) + } } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt index ebbd6cba..7cd8b922 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/JukeboxMediaPlayer.kt @@ -109,8 +109,8 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player { stop() startProcessTasks() } - @Suppress("MagicNumber") + @Suppress("MagicNumber") override fun release() { tasks.clear() stop() @@ -210,7 +210,7 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player { Player.COMMAND_GET_TIMELINE, Player.COMMAND_GET_DEVICE_VOLUME, Player.COMMAND_ADJUST_DEVICE_VOLUME_WITH_FLAGS, - Player.COMMAND_SET_DEVICE_VOLUME_WITH_FLAGS, + Player.COMMAND_SET_DEVICE_VOLUME_WITH_FLAGS ) if (isPlaying) commandsBuilder.add(Player.COMMAND_STOP) if (playlist.isNotEmpty()) { @@ -227,10 +227,12 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player { Player.COMMAND_SEEK_TO_PREVIOUS, Player.COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM ) - if (currentIndex < playlist.size - 1) commandsBuilder.addAll( - Player.COMMAND_SEEK_TO_NEXT, - Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, - ) + if (currentIndex < playlist.size - 1) { + commandsBuilder.addAll( + Player.COMMAND_SEEK_TO_NEXT, + Player.COMMAND_SEEK_TO_NEXT_MEDIA_ITEM + ) + } } return commandsBuilder.build() } @@ -524,8 +526,11 @@ class JukeboxMediaPlayer : JukeboxUnimplementedFunctions(), Player { shouldUpdateCommands = true currentIndex = jukeboxStatus.currentPlayingIndex ?: 0 val currentMedia = - if (currentIndex > 0 && currentIndex < playlist.size) playlist[currentIndex] - else MediaItem.EMPTY + if (currentIndex > 0 && currentIndex < playlist.size) { + playlist[currentIndex] + } else { + MediaItem.EMPTY + } Handler(Looper.getMainLooper()).post { listeners.queueEvent(Player.EVENT_MEDIA_ITEM_TRANSITION) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt index e2525785..c2011004 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaLibrarySessionCallback.kt @@ -273,8 +273,9 @@ class MediaLibrarySessionCallback : var lastCarConnectionType = -1 CarConnection(UApp.applicationContext()).type.observeForever { - if (lastCarConnectionType == it) + if (lastCarConnectionType == it) { return@observeForever + } lastCarConnectionType = it @@ -296,8 +297,9 @@ class MediaLibrarySessionCallback : } } } - } else + } else { Timber.d("Car app library not available") + } } override fun onPostConnect(session: MediaSession, controller: MediaSession.ControllerInfo) { @@ -313,28 +315,29 @@ class MediaLibrarySessionCallback : private fun getHeartCommandButton(sessionCommand: SessionCommand, willHeart: Boolean) = CommandButton.Builder() .setDisplayName( - if (willHeart) + if (willHeart) { "Love" - else + } else { "Dislike" + } ) .setIconResId( - if (willHeart) + if (willHeart) { R.drawable.ic_star_hollow - else + } else { R.drawable.ic_star_full + } ) .setSessionCommand(sessionCommand) .setEnabled(true) .build() - private fun getShuffleCommandButton(sessionCommand: SessionCommand) = - CommandButton.Builder() - .setDisplayName("Shuffle") - .setIconResId(R.drawable.media_shuffle) - .setSessionCommand(sessionCommand) - .setEnabled(true) - .build() + private fun getShuffleCommandButton(sessionCommand: SessionCommand) = CommandButton.Builder() + .setDisplayName("Shuffle") + .setIconResId(R.drawable.media_shuffle) + .setSessionCommand(sessionCommand) + .setEnabled(true) + .build() private fun getPlaceholderButton() = CommandButton.Builder() .setDisplayName("Placeholder") @@ -514,22 +517,23 @@ class MediaLibrarySessionCallback : controller: MediaSession.ControllerInfo, mediaItems: MutableList ): ListenableFuture> { - Timber.i("onAddMediaItems") if (mediaItems.isEmpty()) return Futures.immediateFuture(mediaItems) // Return early if its a search - if (mediaItems[0].requestMetadata.searchQuery != null) + if (mediaItems[0].requestMetadata.searchQuery != null) { return playFromSearch(mediaItems[0].requestMetadata.searchQuery!!) + } val updatedMediaItems: List = mediaItems.mapNotNull { mediaItem -> - if (mediaItem.requestMetadata.mediaUri != null) + if (mediaItem.requestMetadata.mediaUri != null) { mediaItem.buildUpon() .setUri(mediaItem.requestMetadata.mediaUri) .build() - else + } else { null + } } return if (updatedMediaItems.isNotEmpty()) { @@ -552,12 +556,16 @@ class MediaLibrarySessionCallback : val tracks = when (mediaIdParts.first()) { MEDIA_PLAYLIST_ITEM -> playPlaylist(mediaIdParts[1], mediaIdParts[2]) MEDIA_PLAYLIST_SONG_ITEM -> playPlaylistSong( - mediaIdParts[1], mediaIdParts[2], mediaIdParts[3] + mediaIdParts[1], + mediaIdParts[2], + mediaIdParts[3] ) MEDIA_ALBUM_ITEM -> playAlbum(mediaIdParts[1], mediaIdParts[2]) MEDIA_ALBUM_SONG_ITEM -> playAlbumSong( - mediaIdParts[1], mediaIdParts[2], mediaIdParts[3] + mediaIdParts[1], + mediaIdParts[2], + mediaIdParts[3] ) MEDIA_SONG_STARRED_ID -> playStarredSongs() @@ -569,7 +577,8 @@ class MediaLibrarySessionCallback : MEDIA_BOOKMARK_ITEM -> playBookmark(mediaIdParts[1]) MEDIA_PODCAST_ITEM -> playPodcast(mediaIdParts[1]) MEDIA_PODCAST_EPISODE_ITEM -> playPodcastEpisode( - mediaIdParts[1], mediaIdParts[2] + mediaIdParts[1], + mediaIdParts[2] ) MEDIA_SEARCH_SONG_ITEM -> playSearch(mediaIdParts[1]) @@ -588,7 +597,7 @@ class MediaLibrarySessionCallback : @Suppress("ReturnCount", "ComplexMethod") private fun onLoadChildren( - parentId: String, + parentId: String ): ListenableFuture>> { Timber.d("AutoMediaBrowserService onLoadChildren called. ParentId: %s", parentId) @@ -601,7 +610,8 @@ class MediaLibrarySessionCallback : MEDIA_ARTIST_SECTION -> getArtists(parentIdParts[1]) MEDIA_ALBUM_ID -> getAlbums(AlbumListType.SORTED_BY_NAME) MEDIA_ALBUM_PAGE_ID -> getAlbums( - AlbumListType.fromName(parentIdParts[1]), parentIdParts[2].toInt() + AlbumListType.fromName(parentIdParts[1]), + parentIdParts[2].toInt() ) MEDIA_PLAYLIST_ID -> getPlaylists() @@ -617,7 +627,8 @@ class MediaLibrarySessionCallback : MEDIA_PODCAST_ID -> getPodcasts() MEDIA_PLAYLIST_ITEM -> getPlaylist(parentIdParts[1], parentIdParts[2]) MEDIA_ARTIST_ITEM -> getAlbumsForArtist( - parentIdParts[1], parentIdParts[2] + parentIdParts[1], + parentIdParts[2] ) MEDIA_ALBUM_ITEM -> getSongsForAlbum(parentIdParts[1], parentIdParts[2]) @@ -627,10 +638,7 @@ class MediaLibrarySessionCallback : } } - private fun playFromSearch( - query: String, - ): ListenableFuture> { - + private fun playFromSearch(query: String): ListenableFuture> { Timber.w("App state: %s", UApp.instance != null) Timber.i("AutoMediaBrowserService onSearch query: %s", query) @@ -651,7 +659,6 @@ class MediaLibrarySessionCallback : // TODO Add More... button to categories if (searchResult != null) { - searchResult.albums.map { album -> mediaItems.add( album.title ?: "", @@ -704,12 +711,16 @@ class MediaLibrarySessionCallback : return when (mediaIdParts.first()) { MEDIA_PLAYLIST_ITEM -> playPlaylist(mediaIdParts[1], mediaIdParts[2]) MEDIA_PLAYLIST_SONG_ITEM -> playPlaylistSong( - mediaIdParts[1], mediaIdParts[2], mediaIdParts[3] + mediaIdParts[1], + mediaIdParts[2], + mediaIdParts[3] ) MEDIA_ALBUM_ITEM -> playAlbum(mediaIdParts[1], mediaIdParts[2]) MEDIA_ALBUM_SONG_ITEM -> playAlbumSong( - mediaIdParts[1], mediaIdParts[2], mediaIdParts[3] + mediaIdParts[1], + mediaIdParts[2], + mediaIdParts[3] ) MEDIA_SONG_STARRED_ID -> playStarredSongs() @@ -721,7 +732,8 @@ class MediaLibrarySessionCallback : MEDIA_BOOKMARK_ITEM -> playBookmark(mediaIdParts[1]) MEDIA_PODCAST_ITEM -> playPodcast(mediaIdParts[1]) MEDIA_PODCAST_EPISODE_ITEM -> playPodcastEpisode( - mediaIdParts[1], mediaIdParts[2] + mediaIdParts[1], + mediaIdParts[2] ) MEDIA_SEARCH_SONG_ITEM -> playSearch(mediaIdParts[1]) @@ -743,7 +755,7 @@ class MediaLibrarySessionCallback : private fun getRootItems(): ListenableFuture>> { val mediaItems: MutableList = ArrayList() - if (!isOffline) + if (!isOffline) { mediaItems.add( R.string.music_library_label, MEDIA_LIBRARY_ID, @@ -752,6 +764,7 @@ class MediaLibrarySessionCallback : mediaType = MEDIA_TYPE_FOLDER_MIXED, icon = R.drawable.ic_library ) + } mediaItems.add( R.string.main_artists_title, @@ -762,7 +775,7 @@ class MediaLibrarySessionCallback : icon = R.drawable.ic_artist ) - if (!isOffline) + if (!isOffline) { mediaItems.add( R.string.main_albums_title, MEDIA_ALBUM_ID, @@ -771,6 +784,7 @@ class MediaLibrarySessionCallback : mediaType = MEDIA_TYPE_FOLDER_ALBUMS, icon = R.drawable.ic_menu_browse ) + } mediaItems.add( R.string.playlist_label, @@ -815,28 +829,28 @@ class MediaLibrarySessionCallback : R.string.main_albums_recent, MEDIA_ALBUM_RECENT_ID, R.string.main_albums_title, - mediaType = MEDIA_TYPE_FOLDER_ALBUMS, + mediaType = MEDIA_TYPE_FOLDER_ALBUMS ) mediaItems.add( R.string.main_albums_frequent, MEDIA_ALBUM_FREQUENT_ID, R.string.main_albums_title, - mediaType = MEDIA_TYPE_FOLDER_ALBUMS, + mediaType = MEDIA_TYPE_FOLDER_ALBUMS ) mediaItems.add( R.string.main_albums_random, MEDIA_ALBUM_RANDOM_ID, R.string.main_albums_title, - mediaType = MEDIA_TYPE_FOLDER_ALBUMS, + mediaType = MEDIA_TYPE_FOLDER_ALBUMS ) mediaItems.add( R.string.main_albums_starred, MEDIA_ALBUM_STARRED_ID, R.string.main_albums_title, - mediaType = MEDIA_TYPE_FOLDER_ALBUMS, + mediaType = MEDIA_TYPE_FOLDER_ALBUMS ) // Other @@ -869,10 +883,11 @@ class MediaLibrarySessionCallback : }.await() if (artists != null) { - if (section != null) + if (section != null) { artists = artists.filter { artist -> getSectionFromName(artist.name ?: "") == section } + } // If there are too many artists, create alphabetic index of them if (section == null && artists.count() > DISPLAY_LIMIT) { @@ -942,28 +957,30 @@ class MediaLibrarySessionCallback : if (songs != null) { if (songs.getChildren(includeDirs = true, includeFiles = false).isEmpty() && songs.getChildren(includeDirs = false, includeFiles = true).isNotEmpty() - ) + ) { mediaItems.addPlayAllItem(listOf(MEDIA_ALBUM_ITEM, id, name).joinToString("|")) + } // TODO: Paging is not implemented for songs, is it necessary at all? val items = songs.getChildren().take(DISPLAY_LIMIT).toMutableList() items.sortWith { o1, o2 -> - if (o1.isDirectory && o2.isDirectory) + if (o1.isDirectory && o2.isDirectory) { (o1.title ?: "").compareTo(o2.title ?: "") - else if (o1.isDirectory) + } else if (o1.isDirectory) { -1 - else + } else { 1 + } } items.map { item -> - if (item.isDirectory) + if (item.isDirectory) { mediaItems.add( item.title ?: "", listOf(MEDIA_ALBUM_ITEM, item.id, item.name).joinToString("|") ) - else if (item is Track) + } else if (item is Track) { mediaItems.add( item.toMediaItem( listOf( @@ -974,6 +991,7 @@ class MediaLibrarySessionCallback : ).joinToString("|") ) ) + } } } @@ -994,13 +1012,19 @@ class MediaLibrarySessionCallback : if (ActiveServerProvider.shouldUseId3Tags()) { callWithErrorHandling { musicService.getAlbumList2( - type, DISPLAY_LIMIT, offset, null + type, + DISPLAY_LIMIT, + offset, + null ) } } else { callWithErrorHandling { musicService.getAlbumList( - type, DISPLAY_LIMIT, offset, null + type, + DISPLAY_LIMIT, + offset, + null ) } } @@ -1014,12 +1038,13 @@ class MediaLibrarySessionCallback : ) } - if ((albums?.size ?: 0) >= DISPLAY_LIMIT) + if ((albums?.size ?: 0) >= DISPLAY_LIMIT) { mediaItems.add( R.string.search_more, listOf(MEDIA_ALBUM_PAGE_ID, type.typeName, (page ?: 0) + 1).joinToString("|"), null ) + } return@future LibraryResult.ofItemList(mediaItems, null) } @@ -1038,7 +1063,7 @@ class MediaLibrarySessionCallback : playlist.name, listOf(MEDIA_PLAYLIST_ITEM, playlist.id, playlist.name) .joinToString("|"), - mediaType = MEDIA_TYPE_PLAYLIST, + mediaType = MEDIA_TYPE_PLAYLIST ) } return@future LibraryResult.ofItemList(mediaItems, null) @@ -1047,7 +1072,7 @@ class MediaLibrarySessionCallback : private fun getPlaylist( id: String, - name: String, + name: String ): ListenableFuture>> { val mediaItems: MutableList = ArrayList() @@ -1057,10 +1082,11 @@ class MediaLibrarySessionCallback : }.await() if (content != null) { - if (content.size > 1) + if (content.size > 1) { mediaItems.addPlayAllItem( listOf(MEDIA_PLAYLIST_ITEM, id, name).joinToString("|") ) + } // Playlist should be cached as it may contain random elements playlistCache = content.getTracks() @@ -1132,7 +1158,7 @@ class MediaLibrarySessionCallback : mediaItems.add( podcast.title ?: "", listOf(MEDIA_PODCAST_ITEM, podcast.id).joinToString("|"), - mediaType = MEDIA_TYPE_FOLDER_MIXED, + mediaType = MEDIA_TYPE_FOLDER_MIXED ) } return@future LibraryResult.ofItemList(mediaItems, null) @@ -1149,8 +1175,9 @@ class MediaLibrarySessionCallback : }.await() if (episodes != null) { - if (episodes.getTracks().count() > 1) + if (episodes.getTracks().count() > 1) { mediaItems.addPlayAllItem(listOf(MEDIA_PODCAST_ITEM, id).joinToString("|")) + } episodes.getTracks().map { episode -> mediaItems.add( @@ -1235,7 +1262,7 @@ class MediaLibrarySessionCallback : share.name ?: "", listOf(MEDIA_SHARE_ITEM, share.id) .joinToString("|"), - mediaType = MEDIA_TYPE_FOLDER_MIXED, + mediaType = MEDIA_TYPE_FOLDER_MIXED ) } return@future LibraryResult.ofItemList(mediaItems, null) @@ -1254,9 +1281,9 @@ class MediaLibrarySessionCallback : val selectedShare = shares?.firstOrNull { share -> share.id == id } if (selectedShare != null) { - - if (selectedShare.getEntries().count() > 1) + if (selectedShare.getEntries().count() > 1) { mediaItems.addPlayAllItem(listOf(MEDIA_SHARE_ITEM, id).joinToString("|")) + } selectedShare.getEntries().map { song -> mediaItems.add( @@ -1302,8 +1329,9 @@ class MediaLibrarySessionCallback : }.await() if (songs != null) { - if (songs.songs.count() > 1) + if (songs.songs.count() > 1) { mediaItems.addPlayAllItem(listOf(MEDIA_SONG_STARRED_ID).joinToString("|")) + } // TODO: Paging is not implemented for songs, is it necessary at all? val items = songs.songs.take(DISPLAY_LIMIT) @@ -1350,8 +1378,9 @@ class MediaLibrarySessionCallback : }.await() if (songs != null) { - if (songs.size > 1) + if (songs.size > 1) { mediaItems.addPlayAllItem(listOf(MEDIA_SONG_RANDOM_ID).joinToString("|")) + } // TODO: Paging is not implemented for songs, is it necessary at all? val items = songs.getTracks() @@ -1416,7 +1445,6 @@ class MediaLibrarySessionCallback : mediaType: Int = MEDIA_TYPE_MIXED, isBrowsable: Boolean = false ) { - val mediaItem = buildMediaItem( title, mediaId, @@ -1446,19 +1474,21 @@ class MediaLibrarySessionCallback : isBrowsable = isBrowsable, imageUri = if (icon != null) { Util.getUriToDrawable(applicationContext, icon) - } else null, + } else { + null + }, group = if (groupNameId != null) { applicationContext.getString(groupNameId) - } else null, + } else { + null + }, mediaType = mediaType ) this.add(mediaItem) } - private fun MutableList.addPlayAllItem( - mediaId: String, - ) { + private fun MutableList.addPlayAllItem(mediaId: String) { this.add( R.string.select_album_play_all, mediaId, @@ -1513,8 +1543,7 @@ class MediaLibrarySessionCallback : } } - private fun MediaSession.canShuffle() = - player.mediaItemCount > 2 + private fun MediaSession.canShuffle() = player.mediaItemCount > 2 private fun MediaSession.buildCustomCommands( isHeart: Boolean = false, @@ -1531,22 +1560,25 @@ class MediaLibrarySessionCallback : if ( player.repeatMode != Player.REPEAT_MODE_ALL && player.currentMediaItemIndex == player.mediaItemCount - 1 - ) + ) { add(placeholderButton) + } // due to the previous placeholder this heart button will always appear to the left // of the default playback items add( - if (isHeart) + if (isHeart) { heartButtonToggleOff - else + } else { heartButtonToggleOn + } ) // both the shuffle and the active repeat mode button will end up in the overflow // menu if both are available at the same time - if (canShuffle) + if (canShuffle) { add(shuffleButton) + } add( when (player.repeatMode) { @@ -1564,8 +1596,9 @@ class MediaLibrarySessionCallback : // 3 was chosen because that leaves at least two other songs to be shuffled around @Suppress("MagicNumber") - if (player.mediaItemCount < 3) + if (player.mediaItemCount < 3) { return + } val mediaItemsToShuffle = mutableListOf() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt index 939c51ee..af8cc1d3 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerLifecycleSupport.kt @@ -58,7 +58,6 @@ class MediaPlayerLifecycleSupport( } private fun onCreate(autoPlay: Boolean, afterRestore: Runnable?) { - if (created) { afterRestore?.run() return @@ -87,7 +86,6 @@ class MediaPlayerLifecycleSupport( } private fun onDestroy() { - if (!created) return rxBusSubscription.dispose() @@ -100,7 +98,6 @@ class MediaPlayerLifecycleSupport( } fun receiveIntent(intent: Intent?) { - if (intent == null) return val intentAction = intent.action @@ -130,7 +127,6 @@ class MediaPlayerLifecycleSupport( * while Ultrasonic is running. */ private fun registerHeadsetReceiver() { - headsetEventReceiver = object : BroadcastReceiver() { override fun onReceive(context: Context, intent: Intent) { val extras = intent.extras ?: return @@ -161,7 +157,6 @@ class MediaPlayerLifecycleSupport( @Suppress("MagicNumber", "ComplexMethod") private fun handleKeyEvent(event: KeyEvent) { - if (event.action != KeyEvent.ACTION_DOWN || event.repeatCount > 0) return val keyCode: Int = event.keyCode @@ -177,7 +172,8 @@ class MediaPlayerLifecycleSupport( onCreate(autoStart) { when (keyCode) { KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, - KeyEvent.KEYCODE_HEADSETHOOK -> mediaPlayerManager.togglePlayPause() + KeyEvent.KEYCODE_HEADSETHOOK + -> mediaPlayerManager.togglePlayPause() KeyEvent.KEYCODE_MEDIA_PREVIOUS -> mediaPlayerManager.seekToPrevious() KeyEvent.KEYCODE_MEDIA_NEXT -> mediaPlayerManager.seekToNext() KeyEvent.KEYCODE_MEDIA_STOP -> mediaPlayerManager.stop() @@ -200,12 +196,12 @@ class MediaPlayerLifecycleSupport( */ @Suppress("ComplexMethod") private fun handleUltrasonicIntent(action: String) { - val isRunning = created // If Ultrasonic is not running, do nothing to stop or pause - if (!isRunning && (action == Constants.CMD_PAUSE || action == Constants.CMD_STOP)) + if (!isRunning && (action == Constants.CMD_PAUSE || action == Constants.CMD_STOP)) { return + } val autoStart = action == Constants.CMD_PLAY || action == Constants.CMD_RESUME_OR_PLAY || diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt index 6671a0f3..41c2f817 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MediaPlayerManager.kt @@ -325,10 +325,7 @@ class MediaPlayerManager( } @Synchronized - fun restore( - state: PlaybackState, - autoPlay: Boolean - ) { + fun restore(state: PlaybackState, autoPlay: Boolean) { val insertionMode = InsertionMode.APPEND addToPlaylist( @@ -398,7 +395,9 @@ class MediaPlayerManager( // This case would throw an exception in Media3. It can happen when an inconsistent state is saved. if (controller?.currentTimeline?.isEmpty != false || index >= controller!!.currentTimeline.windowCount - ) return + ) { + return + } Timber.i("SeekTo: %s %s", index, position) controller?.seekTo(index, position.toLong()) @@ -501,9 +500,7 @@ class MediaPlayerManager( shuffle: Boolean = false, isArtist: Boolean = false ) { - fragment.launchWithToast { - val list: List = tracks.ifEmpty { requireNotNull(id) @@ -514,7 +511,7 @@ class MediaPlayerManager( songs = list, insertionMode = insertionMode, autoPlay = (insertionMode == InsertionMode.CLEAR), - shuffle = shuffle, + shuffle = shuffle ) if (insertionMode == InsertionMode.CLEAR) { @@ -529,10 +526,11 @@ class MediaPlayerManager( quantize(R.plurals.n_songs_added_to_end, list) InsertionMode.CLEAR -> { - if (Settings.shouldTransitionOnPlayback) + if (Settings.shouldTransitionOnPlayback) { null - else + } else { quantize(R.plurals.n_songs_added_play_now, list) + } } } } @@ -585,12 +583,15 @@ class MediaPlayerManager( @Synchronized @JvmOverloads fun clear(serialize: Boolean = true) { - controller?.clearMediaItems() if (controller != null && serialize) { playbackStateSerializer.serializeAsync( - listOf(), -1, 0, isShufflePlayEnabled, repeatMode + listOf(), + -1, + 0, + isShufflePlayEnabled, + repeatMode ) } } @@ -731,8 +732,8 @@ class MediaPlayerManager( } /* - * Sets the rating of the current track - */ + * Sets the rating of the current track + */ private fun setRating(rating: Rating) { if (controller is MediaController) { (controller as MediaController).setRating(rating) @@ -740,9 +741,9 @@ class MediaPlayerManager( } /* - * This legacy function simply emits a rating update, - * which will then be processed by both the RatingManager as well as the controller - */ + * This legacy function simply emits a rating update, + * which will then be processed by both the RatingManager as well as the controller + */ fun legacyToggleStar() { if (currentMediaItem == null) return val track = currentMediaItem!!.toTrack() @@ -878,7 +879,9 @@ class MediaPlayerManager( } enum class InsertionMode { - CLEAR, APPEND, AFTER_CURRENT + CLEAR, + APPEND, + AFTER_CURRENT } enum class PlayerBackend { JUKEBOX, LOCAL } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt index 73f292f0..0831a37a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/MusicService.kt @@ -27,7 +27,6 @@ import org.moire.ultrasonic.domain.Track import org.moire.ultrasonic.domain.UserInfo @Suppress("TooManyFunctions") - interface MusicService { @Throws(Exception::class) fun ping() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt index 504cf4a0..94a08c30 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/OfflineMusicService.kt @@ -113,13 +113,9 @@ class OfflineMusicService : MusicService, KoinComponent { } /* - * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both! - */ - override fun getMusicDirectory( - id: String, - name: String?, - refresh: Boolean - ): MusicDirectory { + * Especially when dealing with indexes, this method can return Albums, Entries or a mix of both! + */ + override fun getMusicDirectory(id: String, name: String?, refresh: Boolean): MusicDirectory { val dir = Storage.getFromPath(id) val result = MusicDirectory() result.name = dir?.name ?: return result @@ -353,6 +349,7 @@ class OfflineMusicService : MusicService, KoinComponent { override fun stopJukebox(): JukeboxStatus { throw OfflineException("Jukebox not available in offline mode") } + @Throws(Exception::class) override fun clearJukebox(): JukeboxStatus { throw OfflineException("Jukebox not available in offline mode") @@ -394,11 +391,7 @@ class OfflineMusicService : MusicService, KoinComponent { } @Throws(Exception::class) - override fun createShare( - ids: List, - description: String?, - expires: Long? - ): List { + override fun createShare(ids: List, description: String?, expires: Long?): List { throw OfflineException("Creating shares not available in offline mode") } @@ -498,7 +491,6 @@ class OfflineMusicService : MusicService, KoinComponent { @Throws(OfflineException::class) override fun getAlbumAsDir(id: String, name: String?, refresh: Boolean): MusicDirectory { - Timber.i("Starting album query...") val list = cachedTracks @@ -637,10 +629,11 @@ class OfflineMusicService : MusicService, KoinComponent { val slashIndex = string.indexOf('/') - return if (slashIndex > 0) + return if (slashIndex > 0) { string.substring(0, slashIndex).toIntOrNull() - else + } else { string.toIntOrNull() + } } /* @@ -651,10 +644,11 @@ class OfflineMusicService : MusicService, KoinComponent { val duration: Long? = string.toLongOrNull() - return if (duration != null) + return if (duration != null) { TimeUnit.MILLISECONDS.toSeconds(duration).toInt() - else + } else { null + } } // TODO: Simplify this deeply nested and complicated function diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackService.kt index 34f6acc5..ed4dd5fb 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackService.kt @@ -240,8 +240,9 @@ class PlaybackService : // Create a renderer with HW rendering support val renderer = DefaultRenderersFactory(this) - if (Settings.useHwOffload) + if (Settings.useHwOffload) { renderer.setEnableAudioOffload(true) + } // Create the player val player = ExoPlayer.Builder(this) @@ -258,8 +259,9 @@ class PlaybackService : equalizer = EqualizerController.create(player.audioSessionId) // Enable audio offload - if (Settings.useHwOffload) + if (Settings.useHwOffload) { player.experimentalSetOffloadSchedulingEnabled(true) + } return player } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackState.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackState.kt index 3d81d21b..944fc20b 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackState.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackState.kt @@ -25,6 +25,6 @@ fun PlaybackState.toMediaItemsWithStartPosition(): MediaSession.MediaItemsWithSt return MediaSession.MediaItemsWithStartPosition( songs.map { it.toMediaItem() }, currentPlayingIndex, - currentPlayingPosition.toLong(), + currentPlayingPosition.toLong() ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackStateSerializer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackStateSerializer.kt index c1a7fa85..337b3485 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackStateSerializer.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaybackStateSerializer.kt @@ -101,7 +101,6 @@ class PlaybackStateSerializer : KoinComponent { } fun deserializeNow(): PlaybackState? { - val state = FileUtil.deserialize( context, Constants.FILENAME_PLAYLIST_SER ) ?: return null diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaylistTimeline.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaylistTimeline.kt index a94ef1dc..0a0247a1 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaylistTimeline.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/PlaylistTimeline.kt @@ -59,11 +59,17 @@ class PlaylistTimeline @JvmOverloads constructor( return windowIndex } if (windowIndex == getLastWindowIndex(shuffleModeEnabled)) { - return if (repeatMode == Player.REPEAT_MODE_ALL) getFirstWindowIndex(shuffleModeEnabled) - else C.INDEX_UNSET + return if (repeatMode == Player.REPEAT_MODE_ALL) { + getFirstWindowIndex(shuffleModeEnabled) + } else { + C.INDEX_UNSET + } + } + return if (shuffleModeEnabled) { + shuffledIndices[indicesInShuffled[windowIndex] + 1] + } else { + windowIndex + 1 } - return if (shuffleModeEnabled) shuffledIndices[indicesInShuffled[windowIndex] + 1] - else windowIndex + 1 } override fun getPreviousWindowIndex( @@ -75,11 +81,17 @@ class PlaylistTimeline @JvmOverloads constructor( return windowIndex } if (windowIndex == getFirstWindowIndex(shuffleModeEnabled)) { - return if (repeatMode == Player.REPEAT_MODE_ALL) getLastWindowIndex(shuffleModeEnabled) - else C.INDEX_UNSET + return if (repeatMode == Player.REPEAT_MODE_ALL) { + getLastWindowIndex(shuffleModeEnabled) + } else { + C.INDEX_UNSET + } + } + return if (shuffleModeEnabled) { + shuffledIndices[indicesInShuffled[windowIndex] - 1] + } else { + windowIndex - 1 } - return if (shuffleModeEnabled) shuffledIndices[indicesInShuffled[windowIndex] - 1] - else windowIndex - 1 } override fun getLastWindowIndex(shuffleModeEnabled: Boolean): Int { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt index bdf9d5ef..15b5a24f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RESTMusicService.kt @@ -72,9 +72,7 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun getMusicFolders( - refresh: Boolean - ): List { + override fun getMusicFolders(refresh: Boolean): List { val response = API.getMusicFolders().execute().throwOnFailure() return response.body()!!.musicFolders.toDomainEntityList(activeServerId) @@ -84,10 +82,7 @@ open class RESTMusicService( * Retrieves the artists for a given music folder * */ @Throws(Exception::class) - override fun getIndexes( - musicFolderId: String?, - refresh: Boolean - ): List { + override fun getIndexes(musicFolderId: String?, refresh: Boolean): List { val response = API.getIndexes(musicFolderId, null).execute().throwOnFailure() return response.body()!!.indexes.toIndexList( @@ -97,88 +92,57 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun getArtists( - refresh: Boolean - ): List { + override fun getArtists(refresh: Boolean): List { val response = API.getArtists(null).execute().throwOnFailure() return response.body()!!.indexes.toArtistList(activeServerId) } @Throws(Exception::class) - override fun star( - id: String?, - albumId: String?, - artistId: String? - ) { + override fun star(id: String?, albumId: String?, artistId: String?) { API.star(id, albumId, artistId).execute().throwOnFailure() } @Throws(Exception::class) - override fun unstar( - id: String?, - albumId: String?, - artistId: String? - ) { + override fun unstar(id: String?, albumId: String?, artistId: String?) { API.unstar(id, albumId, artistId).execute().throwOnFailure() } @Throws(Exception::class) - override fun setRating( - id: String, - rating: Int - ) { + override fun setRating(id: String, rating: Int) { API.setRating(id, rating).execute().throwOnFailure() } @Throws(Exception::class) - override fun getMusicDirectory( - id: String, - name: String?, - refresh: Boolean - ): MusicDirectory { + override fun getMusicDirectory(id: String, name: String?, refresh: Boolean): MusicDirectory { val response = API.getMusicDirectory(id).execute().throwOnFailure() return response.body()!!.musicDirectory.toDomainEntity(activeServerId) } @Throws(Exception::class) - override fun getAlbumsOfArtist( - id: String, - name: String?, - refresh: Boolean - ): List { + override fun getAlbumsOfArtist(id: String, name: String?, refresh: Boolean): List { val response = API.getArtist(id).execute().throwOnFailure() return response.body()!!.artist.toDomainEntityList(activeServerId) } @Throws(Exception::class) - override fun getAlbumAsDir( - id: String, - name: String?, - refresh: Boolean - ): MusicDirectory { + override fun getAlbumAsDir(id: String, name: String?, refresh: Boolean): MusicDirectory { val response = API.getAlbum(id).execute().throwOnFailure() return response.body()!!.album.toMusicDirectoryDomainEntity(activeServerId) } @Throws(Exception::class) - override fun getAlbum( - id: String, - name: String?, - refresh: Boolean - ): Album { + override fun getAlbum(id: String, name: String?, refresh: Boolean): Album { val response = API.getAlbum(id).execute().throwOnFailure() return response.body()!!.album.toDomainEntity(activeServerId) } @Throws(Exception::class) - override fun search( - criteria: SearchCriteria - ): SearchResult { + override fun search(criteria: SearchCriteria): SearchResult { return try { if (shouldUseId3Tags()) { search3(criteria) @@ -195,9 +159,7 @@ open class RESTMusicService( * Search using the "search" REST method. */ @Throws(Exception::class) - private fun searchOld( - criteria: SearchCriteria - ): SearchResult { + private fun searchOld(criteria: SearchCriteria): SearchResult { val response = API.search(null, null, null, criteria.query, criteria.songCount, null, null) .execute().throwOnFailure() @@ -209,36 +171,39 @@ open class RESTMusicService( * Search using the "search2" REST method, available in 1.4.0 and later. */ @Throws(Exception::class) - private fun search2( - criteria: SearchCriteria - ): SearchResult { + private fun search2(criteria: SearchCriteria): SearchResult { requireNotNull(criteria.query) { "Query param is null" } val response = API.search2( - criteria.query, criteria.artistCount, null, criteria.albumCount, null, - criteria.songCount, null + criteria.query, + criteria.artistCount, + null, + criteria.albumCount, + null, + criteria.songCount, + null ).execute().throwOnFailure() return response.body()!!.searchResult.toDomainEntity(activeServerId) } @Throws(Exception::class) - private fun search3( - criteria: SearchCriteria - ): SearchResult { + private fun search3(criteria: SearchCriteria): SearchResult { requireNotNull(criteria.query) { "Query param is null" } val response = API.search3( - criteria.query, criteria.artistCount, null, criteria.albumCount, null, - criteria.songCount, null + criteria.query, + criteria.artistCount, + null, + criteria.albumCount, + null, + criteria.songCount, + null ).execute().throwOnFailure() return response.body()!!.searchResult.toDomainEntity(activeServerId) } @Throws(Exception::class) - override fun getPlaylist( - id: String, - name: String - ): MusicDirectory { + override fun getPlaylist(id: String, name: String): MusicDirectory { val response = API.getPlaylist(id).execute().throwOnFailure() val playlist = response.body()!!.playlist.toMusicDirectoryDomainEntity(activeServerId) @@ -248,21 +213,17 @@ open class RESTMusicService( } @Throws(IOException::class) - private fun savePlaylist( - name: String, - playlist: MusicDirectory - ) { + private fun savePlaylist(name: String, playlist: MusicDirectory) { val playlistFile = FileUtil.getPlaylistFile( - activeServerProvider.getActiveServer().name, name + activeServerProvider.getActiveServer().name, + name ) FileUtil.savePlaylist(playlistFile, playlist, name) } @Throws(Exception::class) - override fun getPlaylists( - refresh: Boolean - ): List { + override fun getPlaylists(refresh: Boolean): List { val response = API.getPlaylists(null).execute().throwOnFailure() return response.body()!!.playlists.toDomainEntitiesList() @@ -274,11 +235,7 @@ open class RESTMusicService( * String is required when creating */ @Throws(Exception::class) - override fun createPlaylist( - id: String?, - name: String?, - tracks: List - ) { + override fun createPlaylist(id: String?, name: String?, tracks: List) { require(id != null || name != null) { "Either id or name is required." } val pSongIds: MutableList = ArrayList(tracks.size) @@ -290,36 +247,25 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun deletePlaylist( - id: String - ) { + override fun deletePlaylist(id: String) { API.deletePlaylist(id).execute().throwOnFailure() } @Throws(Exception::class) - override fun updatePlaylist( - id: String, - name: String?, - comment: String?, - pub: Boolean - ) { + override fun updatePlaylist(id: String, name: String?, comment: String?, pub: Boolean) { API.updatePlaylist(id, name, comment, pub, null, null) .execute().throwOnFailure() } @Throws(Exception::class) - override fun getPodcastsChannels( - refresh: Boolean - ): List { + override fun getPodcastsChannels(refresh: Boolean): List { val response = API.getPodcasts(false, null).execute().throwOnFailure() return response.body()!!.podcastChannels.toDomainEntitiesList() } @Throws(Exception::class) - override fun getPodcastEpisodes( - podcastChannelId: String? - ): MusicDirectory { + override fun getPodcastEpisodes(podcastChannelId: String?): MusicDirectory { val response = API.getPodcasts(true, podcastChannelId).execute().throwOnFailure() val podcastEntries = response.body()!!.podcastChannels[0].episodeList @@ -340,20 +286,14 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun getLyrics( - artist: String, - title: String - ): Lyrics { + override fun getLyrics(artist: String, title: String): Lyrics { val response = API.getLyrics(artist, title).execute().throwOnFailure() return response.body()!!.lyrics.toDomainEntity() } @Throws(Exception::class) - override fun scrobble( - id: String, - submission: Boolean - ) { + override fun scrobble(id: String, submission: Boolean) { API.scrobble(id, null, submission).execute().throwOnFailure() } @@ -398,9 +338,7 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun getRandomSongs( - size: Int - ): MusicDirectory { + override fun getRandomSongs(size: Int): MusicDirectory { val response = API.getRandomSongs( size, null, @@ -464,11 +402,7 @@ open class RESTMusicService( * call because that could take a long time. */ @Throws(Exception::class) - override fun getStreamUrl( - id: String, - maxBitRate: Int?, - format: String? - ): String { + override fun getStreamUrl(id: String, maxBitRate: Int?, format: String?): String { Timber.i("Start") // Get the request from Retrofit, but don't execute it! @@ -510,9 +444,7 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun updateJukeboxPlaylist( - ids: List - ): JukeboxStatus { + override fun updateJukeboxPlaylist(ids: List): JukeboxStatus { val response = API.jukeboxControl(JukeboxAction.SET, null, null, ids, null) .execute().throwOnFailure() @@ -520,10 +452,7 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun skipJukebox( - index: Int, - offsetSeconds: Int - ): JukeboxStatus { + override fun skipJukebox(index: Int, offsetSeconds: Int): JukeboxStatus { val response = API.jukeboxControl(JukeboxAction.SKIP, index, offsetSeconds, null, null) .execute().throwOnFailure() @@ -563,9 +492,7 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun setJukeboxGain( - gain: Float - ): JukeboxStatus { + override fun setJukeboxGain(gain: Float): JukeboxStatus { val response = API.jukeboxControl(JukeboxAction.SET_GAIN, null, null, null, gain) .execute().throwOnFailure() @@ -573,29 +500,21 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun getShares( - refresh: Boolean - ): List { + override fun getShares(refresh: Boolean): List { val response = API.getShares().execute().throwOnFailure() return response.body()!!.shares.toDomainEntitiesList(activeServerId) } @Throws(Exception::class) - override fun getGenres( - refresh: Boolean - ): List { + override fun getGenres(refresh: Boolean): List { val response = API.getGenres().execute().throwOnFailure() return response.body()!!.genresList.toDomainEntityList() } @Throws(Exception::class) - override fun getSongsByGenre( - genre: String, - count: Int, - offset: Int - ): MusicDirectory { + override fun getSongsByGenre(genre: String, count: Int, offset: Int): MusicDirectory { val response = API.getSongsByGenre(genre, count, offset, null).execute().throwOnFailure() val result = MusicDirectory() @@ -605,27 +524,21 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun getUser( - username: String - ): UserInfo { + override fun getUser(username: String): UserInfo { val response = API.getUser(username).execute().throwOnFailure() return response.body()!!.user.toDomainEntity() } @Throws(Exception::class) - override fun getChatMessages( - since: Long? - ): List { + override fun getChatMessages(since: Long?): List { val response = API.getChatMessages(since).execute().throwOnFailure() return response.body()!!.chatMessages.toDomainEntitiesList() } @Throws(Exception::class) - override fun addChatMessage( - message: String - ) { + override fun addChatMessage(message: String) { API.addChatMessage(message).execute().throwOnFailure() } @@ -637,24 +550,17 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun createBookmark( - id: String, - position: Int - ) { + override fun createBookmark(id: String, position: Int) { API.createBookmark(id, position.toLong(), null).execute().throwOnFailure() } @Throws(Exception::class) - override fun deleteBookmark( - id: String - ) { + override fun deleteBookmark(id: String) { API.deleteBookmark(id).execute().throwOnFailure() } @Throws(Exception::class) - override fun getVideos( - refresh: Boolean - ): MusicDirectory { + override fun getVideos(refresh: Boolean): MusicDirectory { val response = API.getVideos().execute().throwOnFailure() val musicDirectory = MusicDirectory() @@ -664,29 +570,19 @@ open class RESTMusicService( } @Throws(Exception::class) - override fun createShare( - ids: List, - description: String?, - expires: Long? - ): List { + override fun createShare(ids: List, description: String?, expires: Long?): List { val response = API.createShare(ids, description, expires).execute().throwOnFailure() return response.body()!!.shares.toDomainEntitiesList(activeServerId) } @Throws(Exception::class) - override fun deleteShare( - id: String - ) { + override fun deleteShare(id: String) { API.deleteShare(id).execute().throwOnFailure() } @Throws(Exception::class) - override fun updateShare( - id: String, - description: String?, - expires: Long? - ) { + override fun updateShare(id: String, description: String?, expires: Long?) { var expiresValue: Long? = expires if (expires != null && expires == 0L) { expiresValue = null diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RatingManager.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RatingManager.kt index dd2bd38b..9b90e450 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RatingManager.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RatingManager.kt @@ -49,8 +49,11 @@ class RatingManager : CoroutineScope by CoroutineScope(Dispatchers.Default) { var success = false withContext(Dispatchers.IO) { try { - if (update.rating.isHeart) service.star(id) - else service.unstar(id) + if (update.rating.isHeart) { + service.star(id) + } else { + service.unstar(id) + } success = true } catch (all: Exception) { Timber.e(all) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt index ceadd14e..591b99a3 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/service/RxBus.kt @@ -29,6 +29,7 @@ class RxBus { var activeServerChangingPublisher: PublishSubject = PublishSubject.create() + // Subscribers should be called synchronously, not on another thread var activeServerChangingObservable: Observable = activeServerChangingPublisher diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ImageLoaderProvider.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ImageLoaderProvider.kt index b70852f1..29cc4c0d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ImageLoaderProvider.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ImageLoaderProvider.kt @@ -68,7 +68,9 @@ class ImageLoaderProvider : val config by lazy { var defaultSize = 0 val fallbackImage = ResourcesCompat.getDrawable( - UApp.applicationContext().resources, R.drawable.unknown_album, null + UApp.applicationContext().resources, + R.drawable.unknown_album, + null ) // Determine the density-dependent image sizes by taking the fallback album diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt index 2f2e2304..3f28af71 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/RestErrorMapper.kt @@ -1,4 +1,5 @@ @file:JvmName("RestErrorMapper") + package org.moire.ultrasonic.subsonic import android.content.Context @@ -18,28 +19,27 @@ import org.moire.ultrasonic.api.subsonic.SubsonicRESTException * Extension for [SubsonicRESTException] that returns localized error string, that can used to * display error reason for user. */ -fun SubsonicRESTException.getLocalizedErrorMessage(context: Context): String = - when (error) { - is Generic -> { - val message = (error as Generic).message - val errorMessage = if (message == "") { - context.getString(R.string.api_subsonic_generic_no_message) - } else { - message - } - context.getString(R.string.api_subsonic_generic, errorMessage) +fun SubsonicRESTException.getLocalizedErrorMessage(context: Context): String = when (error) { + is Generic -> { + val message = (error as Generic).message + val errorMessage = if (message == "") { + context.getString(R.string.api_subsonic_generic_no_message) + } else { + message } - RequiredParamMissing -> context.getString(R.string.api_subsonic_param_missing) - IncompatibleClientProtocolVersion -> - context.getString(R.string.api_subsonic_upgrade_client) - IncompatibleServerProtocolVersion -> - context.getString(R.string.api_subsonic_upgrade_server) - WrongUsernameOrPassword -> context.getString(R.string.api_subsonic_not_authenticated) - TokenAuthNotSupportedForLDAP -> - context.getString(R.string.api_subsonic_token_auth_not_supported_for_ldap) - UserNotAuthorizedForOperation -> - context.getString(R.string.api_subsonic_not_authorized) - TrialPeriodIsOver -> context.getString(R.string.api_subsonic_trial_period_is_over) - RequestedDataWasNotFound -> - context.getString(R.string.api_subsonic_requested_data_was_not_found) + context.getString(R.string.api_subsonic_generic, errorMessage) } + RequiredParamMissing -> context.getString(R.string.api_subsonic_param_missing) + IncompatibleClientProtocolVersion -> + context.getString(R.string.api_subsonic_upgrade_client) + IncompatibleServerProtocolVersion -> + context.getString(R.string.api_subsonic_upgrade_server) + WrongUsernameOrPassword -> context.getString(R.string.api_subsonic_not_authenticated) + TokenAuthNotSupportedForLDAP -> + context.getString(R.string.api_subsonic_token_auth_not_supported_for_ldap) + UserNotAuthorizedForOperation -> + context.getString(R.string.api_subsonic_not_authorized) + TrialPeriodIsOver -> context.getString(R.string.api_subsonic_trial_period_is_over) + RequestedDataWasNotFound -> + context.getString(R.string.api_subsonic_requested_data_was_not_found) +} diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ShareHandler.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ShareHandler.kt index ce2f0eaa..7d0efa69 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ShareHandler.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/subsonic/ShareHandler.kt @@ -47,11 +47,7 @@ class ShareHandler { private var textViewExpiration: TextView? = null private val pattern = Pattern.compile(":") - fun share( - fragment: Fragment, - shareDetails: ShareDetails, - additionalId: String? - ) { + fun share(fragment: Fragment, shareDetails: ShareDetails, additionalId: String?) { val scope = fragment.activity?.lifecycleScope ?: fragment.lifecycleScope scope.launch { val share = createShareOnServer(shareDetails, additionalId) @@ -65,11 +61,11 @@ class ShareHandler { ): Share? { return withContext(Dispatchers.IO) { return@withContext try { - val ids: MutableList = ArrayList() - if (!shareDetails.shareOnServer && shareDetails.entries.size == 1) + if (!shareDetails.shareOnServer && shareDetails.entries.size == 1) { return@withContext null + } if (shareDetails.entries.isEmpty()) { additionalId.ifNotNull { ids.add(it) @@ -94,10 +90,11 @@ class ShareHandler { ) // Return the share - if (shares.isNotEmpty()) + if (shares.isNotEmpty()) { shares[0] - else + } else { null + } } catch (ignored: Exception) { null } @@ -118,7 +115,10 @@ class ShareHandler { intent.putExtra( Intent.EXTRA_TEXT, String.format( - Locale.ROOT, "%s\n\n%s", Settings.shareGreeting, result.url + Locale.ROOT, + "%s\n\n%s", + Settings.shareGreeting, + result.url ) ) } else { @@ -126,15 +126,18 @@ class ShareHandler { val textBuilder = StringBuilder() textBuilder.appendLine(Settings.shareGreeting) - if (!shareDetails.entries[0].title.isNullOrEmpty()) + if (!shareDetails.entries[0].title.isNullOrEmpty()) { textBuilder.append(getString(R.string.common_title)) .append(": ").appendLine(shareDetails.entries[0].title) - if (!shareDetails.entries[0].artist.isNullOrEmpty()) + } + if (!shareDetails.entries[0].artist.isNullOrEmpty()) { textBuilder.append(getString(R.string.common_artist)) .append(": ").appendLine(shareDetails.entries[0].artist) - if (!shareDetails.entries[0].album.isNullOrEmpty()) + } + if (!shareDetails.entries[0].album.isNullOrEmpty()) { textBuilder.append(getString(R.string.common_album)) .append(": ").append(shareDetails.entries[0].album) + } intent.putExtra(Intent.EXTRA_TEXT, textBuilder.toString()) } @@ -148,11 +151,7 @@ class ShareHandler { } } - fun createShare( - fragment: Fragment, - tracks: List, - additionalId: String? = null - ) { + fun createShare(fragment: Fragment, tracks: List, additionalId: String? = null) { if (tracks.isEmpty()) return val askForDetails = Settings.shouldAskForShareDetails val shareDetails = ShareDetails(tracks) @@ -167,11 +166,7 @@ class ShareHandler { } @SuppressLint("InflateParams") - private fun showDialog( - fragment: Fragment, - shareDetails: ShareDetails, - additionalId: String? - ) { + private fun showDialog(fragment: Fragment, shareDetails: ShareDetails, additionalId: String?) { val layout = LayoutInflater.from(fragment.context).inflate(R.layout.share_details, null) if (layout != null) { @@ -258,8 +253,11 @@ class ShareHandler { val timeSpanType: String = timeSpanPicker!!.timeSpanType!! val timeSpanAmount: Int = timeSpanPicker!!.timeSpanAmount Settings.defaultShareExpiration = - if (!noExpirationCheckBox!!.isChecked && timeSpanAmount > 0) - String.format("%d:%s", timeSpanAmount, timeSpanType) else "" + if (!noExpirationCheckBox!!.isChecked && timeSpanAmount > 0) { + String.format("%d:%s", timeSpanAmount, timeSpanType) + } else { + "" + } Settings.defaultShareDescription = shareDetails.description!! Settings.shareOnServer = shareDetails.shareOnServer diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt index acdd03da..f3d7995f 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt @@ -29,8 +29,10 @@ import timber.log.Timber * thrown during the communication with a Subsonic server */ object CommunicationError { - fun getHandler(context: Context?, handler: ((CoroutineContext, Throwable) -> Unit)? = null): - CoroutineExceptionHandler { + fun getHandler( + context: Context?, + handler: ((CoroutineContext, Throwable) -> Unit)? = null + ): CoroutineExceptionHandler { return CoroutineExceptionHandler { coroutineContext, exception -> Handler(Looper.getMainLooper()).post { handleError(exception, context) @@ -68,14 +70,16 @@ object CommunicationError { ) { context.resources .getString( - R.string.background_task_ssl_cert_error, error.cause?.cause?.message + R.string.background_task_ssl_cert_error, + error.cause?.cause?.message ) } else { context.resources.getString(R.string.background_task_ssl_error) } } else if (error is ApiNotSupportedException) { return context.resources.getString( - R.string.background_task_unsupported_api, error.serverApiVersion + R.string.background_task_unsupported_api, + error.serverApiVersion ) } else if (error is IOException) { return context.resources.getString(R.string.background_task_network_error) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CoroutinePatterns.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CoroutinePatterns.kt index dad0ae39..4b04994a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CoroutinePatterns.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CoroutinePatterns.kt @@ -31,9 +31,7 @@ object CoroutinePatterns { } } -fun Fragment.toastingExceptionHandler( - prefix: String = "" -): CoroutineExceptionHandler { +fun Fragment.toastingExceptionHandler(prefix: String = ""): CoroutineExceptionHandler { return CoroutineExceptionHandler { _, exception -> // Stop the spinner if applicable if (this is RefreshableFragment) { @@ -48,9 +46,7 @@ fun Fragment.toastingExceptionHandler( * This extension can be only started from a fragment * because it needs the fragments scope to create the toast */ -fun Fragment.launchWithToast( - block: suspend CoroutineScope.() -> String? -) { +fun Fragment.launchWithToast(block: suspend CoroutineScope.() -> String?) { // Get the scope val scope = activity?.lifecycleScope ?: lifecycleScope diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DownloadUtil.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DownloadUtil.kt index 00ce9acd..4a3c576a 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DownloadUtil.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/DownloadUtil.kt @@ -34,7 +34,6 @@ object DownloadUtil { isArtist: Boolean = false, tracks: List? = null ) { - // Launch the Job fragment.launchWithToast { val tracksToDownload: List = tracks @@ -87,10 +86,11 @@ object DownloadUtil { return getSongsForArtist(id) } else { if (isDirectory) { - root = if (ActiveServerProvider.shouldUseId3Tags()) + root = if (ActiveServerProvider.shouldUseId3Tags()) { musicService.getAlbumAsDir(id, name, false) - else + } else { musicService.getMusicDirectory(id, name, false) + } } else if (isShare) { root = MusicDirectory() val shares = musicService.getShares(true) @@ -107,10 +107,7 @@ object DownloadUtil { @Suppress("DestructuringDeclarationWithTooManyEntries") @Throws(Exception::class) - private fun getSongsRecursively( - parent: MusicDirectory, - songs: MutableList - ) { + private fun getSongsRecursively(parent: MusicDirectory, songs: MutableList) { if (songs.size > Constants.MAX_SONGS_RECURSIVE) { return } @@ -121,18 +118,17 @@ object DownloadUtil { } val musicService = MusicServiceFactory.getMusicService() for ((id1, _, _, title) in parent.getAlbums()) { - val root: MusicDirectory = if (ActiveServerProvider.shouldUseId3Tags()) + val root: MusicDirectory = if (ActiveServerProvider.shouldUseId3Tags()) { musicService.getAlbumAsDir(id1, title, false) - else + } else { musicService.getMusicDirectory(id1, title, false) + } getSongsRecursively(root, songs) } } @Throws(Exception::class) - private fun getSongsForArtist( - id: String - ): MutableList { + private fun getSongsForArtist(id: String): MutableList { val songs: MutableList = LinkedList() val musicService = MusicServiceFactory.getMusicService() val artist = musicService.getAlbumsOfArtist(id, "", false) @@ -191,5 +187,8 @@ object DownloadUtil { } enum class DownloadAction { - DOWNLOAD, PIN, UNPIN, DELETE + DOWNLOAD, + PIN, + UNPIN, + DELETE } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.kt index 099eeb66..b2c1f6f4 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/EntryByDiscAndTrackComparator.kt @@ -25,10 +25,12 @@ class EntryByDiscAndTrackComparator : Comparator { val trackComparison = compare(trackX ?: 0, trackY ?: 0) return if (trackComparison != 0) { trackComparison - } else compare( - pathX ?: "", - pathY ?: "" - ) + } else { + compare( + pathX ?: "", + pathY ?: "" + ) + } } companion object { @@ -45,7 +47,9 @@ class EntryByDiscAndTrackComparator : Comparator { } return if (b == null) { 1 - } else a.compareTo(b) + } else { + a.compareTo(b) + } } } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt index 24db2753..8f08ed03 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt @@ -261,10 +261,14 @@ object FileUtil { if (cachedUltrasonicDirectory != null) return cachedUltrasonicDirectory!! @Suppress("DEPRECATION") - cachedUltrasonicDirectory = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) File( - Environment.getExternalStorageDirectory(), - "Android/data/org.moire.ultrasonic" - ) else UApp.applicationContext().getExternalFilesDir(null)!! + cachedUltrasonicDirectory = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) { + File( + Environment.getExternalStorageDirectory(), + "Android/data/org.moire.ultrasonic" + ) + } else { + UApp.applicationContext().getExternalFilesDir(null)!! + } return cachedUltrasonicDirectory!! } @@ -489,11 +493,7 @@ object FileUtil { } } - fun savePlaylist( - playlistFile: File?, - playlist: MusicDirectory, - name: String - ) { + fun savePlaylist(playlistFile: File?, playlist: MusicDirectory, name: String) { val fw = FileWriter(playlistFile) val bw = BufferedWriter(fw) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/LayoutType.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/LayoutType.kt index 46fa11c7..b930a9bd 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/LayoutType.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/LayoutType.kt @@ -9,7 +9,8 @@ package org.moire.ultrasonic.util enum class LayoutType(val value: Int) { LIST(0), - COVER(1); + COVER(1) + ; companion object { private val map = values().associateBy { it.value } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt index e05957ed..bf03e09e 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaItemConverter.kt @@ -58,10 +58,7 @@ object MediaItemConverter { * Extension function to convert a Track to an MediaItem, using the cache if possible */ @Suppress("LongMethod") -fun Track.toMediaItem( - mediaId: String = id, -): MediaItem { - +fun Track.toMediaItem(mediaId: String = id): MediaItem { // Check Cache val cachedItem = MediaItemConverter.mediaItemCache[mediaId]?.get() if (cachedItem != null) return cachedItem @@ -85,8 +82,11 @@ fun Track.toMediaItem( imageUri = artworkUri, starred = starred, group = null, - mediaType = if (isDirectory) MEDIA_TYPE_FOLDER_MIXED - else MEDIA_TYPE_MUSIC + mediaType = if (isDirectory) { + MEDIA_TYPE_FOLDER_MIXED + } else { + MEDIA_TYPE_MUSIC + } ) val metadataBuilder = mediaItem.mediaMetadata.buildUpon() @@ -111,9 +111,12 @@ fun Track.toMediaItem( mediaItem.mediaMetadata.extras?.putBoolean("isVideo", isVideo) mediaItem.mediaMetadata.extras?.putBoolean("starred", starred) mediaItem.mediaMetadata.extras?.putString("type", type) - if (created != null) mediaItem.mediaMetadata.extras?.putString( - "created", DateFormat.getDateInstance().format(created!!) - ) + if (created != null) { + mediaItem.mediaMetadata.extras?.putString( + "created", + DateFormat.getDateInstance().format(created!!) + ) + } mediaItem.mediaMetadata.extras?.putInt("closeness", closeness) mediaItem.mediaMetadata.extras?.putInt("bookmarkPosition", bookmarkPosition) mediaItem.mediaMetadata.extras?.putString("name", name) @@ -141,7 +144,6 @@ fun Track.toMediaItem( */ @Suppress("ComplexMethod") fun MediaItem.toTrack(): Track { - // Check Cache val cachedTrack = MediaItemConverter.trackCache[mediaId]?.get() if (cachedTrack != null) return cachedTrack @@ -168,13 +170,22 @@ fun MediaItem.toTrack(): Track { mediaMetadata.extras?.getString("transcodedContentType"), mediaMetadata.extras?.getString("transcodedSuffix"), mediaMetadata.extras?.getString("coverArt"), - if (mediaMetadata.extras?.containsKey("size") == true) - mediaMetadata.extras?.getLong("size") else null, + if (mediaMetadata.extras?.containsKey("size") == true) { + mediaMetadata.extras?.getLong("size") + } else { + null + }, mediaMetadata.totalTrackCount?.toLong(), - if (mediaMetadata.extras?.containsKey("duration") == true) - mediaMetadata.extras?.getInt("duration") else null, - if (mediaMetadata.extras?.containsKey("bitRate") == true) - mediaMetadata.extras?.getInt("bitRate") else null, + if (mediaMetadata.extras?.containsKey("duration") == true) { + mediaMetadata.extras?.getInt("duration") + } else { + null + }, + if (mediaMetadata.extras?.containsKey("bitRate") == true) { + mediaMetadata.extras?.getInt("bitRate") + } else { + null + }, mediaMetadata.extras?.getString("path"), mediaMetadata.extras?.getBoolean("isVideo") ?: false, mediaMetadata.extras?.getBoolean("starred", false) ?: false, @@ -185,7 +196,7 @@ fun MediaItem.toTrack(): Track { mediaMetadata.extras?.getInt("bookmarkPosition", 0) ?: 0, mediaMetadata.extras?.getInt("userRating", 0) ?: 0, mediaMetadata.extras?.getFloat("averageRating", 0F) ?: 0F, - mediaMetadata.extras?.getString("name"), + mediaMetadata.extras?.getString("name") ) if (mediaMetadata.userRating is HeartRating) { track.starred = (mediaMetadata.userRating as HeartRating).isHeart @@ -199,11 +210,15 @@ fun MediaItem.toTrack(): Track { } private fun safeParseDate(created: String?): Date? { - return if (created != null) try { - DateFormat.getDateInstance().parse(created) - } catch (_: ParseException) { + return if (created != null) { + try { + DateFormat.getDateInstance().parse(created) + } catch (_: ParseException) { + null + } + } else { null - } else null + } } /** @@ -224,9 +239,8 @@ fun buildMediaItem( imageUri: Uri? = null, starred: Boolean = false, group: String? = null, - mediaType: @MediaMetadata.MediaType Int? = null, + mediaType: @MediaMetadata.MediaType Int? = null ): MediaItem { - val metadataBuilder = MediaMetadata.Builder() .setAlbumTitle(album) .setTitle(title) @@ -255,7 +269,9 @@ fun buildMediaItem( ) } ) - } else metadataBuilder.setExtras(Bundle()) + } else { + metadataBuilder.setExtras(Bundle()) + } val metadata = metadataBuilder.build() diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettableAsyncListDiffer.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettableAsyncListDiffer.kt index 9e0dc12f..f16b504d 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettableAsyncListDiffer.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettableAsyncListDiffer.kt @@ -116,7 +116,7 @@ class SettableAsyncListDiffer { private var mReadOnlyList = emptyList() // Max generation of currently scheduled runnable - private var mMaxScheduledGeneration/* synthetic access */ = 0 + private var mMaxScheduledGeneration = 0 /** * Get the current List - any diffing to present this list has already been computed and @@ -176,10 +176,7 @@ class SettableAsyncListDiffer { * @param commitCallback Optional runnable that is executed when the List is committed, if * it is committed. */ - fun submitList( - newList: List?, - commitCallback: Runnable? - ) { + fun submitList(newList: List?, commitCallback: Runnable?) { // incrementing generation means any currently-running diffs are discarded when they finish val runGeneration = ++mMaxScheduledGeneration if (newList === mList) { @@ -220,15 +217,14 @@ class SettableAsyncListDiffer { return newList.size } - override fun areItemsTheSame( - oldItemPosition: Int, - newItemPosition: Int - ): Boolean { + override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean { val oldItem: T? = oldList[oldItemPosition] val newItem: T? = newList[newItemPosition] return if (oldItem != null && newItem != null) { mConfig!!.diffCallback.areItemsTheSame(oldItem, newItem) - } else oldItem == null && newItem == null + } else { + oldItem == null && newItem == null + } // If both items are null we consider them the same. } @@ -264,11 +260,7 @@ class SettableAsyncListDiffer { } } - private fun latchList( - newList: List, - diffResult: DiffResult, - commitCallback: Runnable? - ) { + private fun latchList(newList: List, diffResult: DiffResult, commitCallback: Runnable?) { val previousList = mReadOnlyList mList = newList // notify last, after list is updated @@ -277,10 +269,7 @@ class SettableAsyncListDiffer { onCurrentListChanged(previousList, commitCallback) } - private fun onCurrentListChanged( - previousList: List, - commitCallback: Runnable? - ) { + private fun onCurrentListChanged(previousList: List, commitCallback: Runnable?) { // current list is always mReadOnlyList for (listener in mListeners) { listener.onCurrentListChanged(previousList, mReadOnlyList) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt index c6e69c8f..c184b916 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Settings.kt @@ -79,7 +79,8 @@ object Settings { @JvmStatic var cacheLocationUri by StringSetting( - getKey(R.string.setting_key_cache_location), "" + getKey(R.string.setting_key_cache_location), + "" ) @JvmStatic diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettingsDelegate.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettingsDelegate.kt index 88356bff..b9f6c523 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettingsDelegate.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/SettingsDelegate.kt @@ -78,6 +78,7 @@ class BooleanSetting(private val key: String, private val defaultValue: Boolean sharedPreferences.edit { putBoolean(key, value) } constructor(stringId: Int, defaultValue: Boolean = false) : this( - Util.appContext().getString(stringId), defaultValue + Util.appContext().getString(stringId), + defaultValue ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt index 5d1eb983..0acababf 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/StorageFile.kt @@ -107,8 +107,9 @@ class StorageFile( @Synchronized override fun getOrCreateFileFromPath(path: String): AbstractFile { - if (storageFilePathDictionary.containsKey(path)) + if (storageFilePathDictionary.containsKey(path)) { return storageFilePathDictionary[path]!! + } val parent = getStorageFileForParentDirectory(path) ?: throw IOException("Parent directory doesn't exist") @@ -126,8 +127,9 @@ class StorageFile( } override fun getFromPath(path: String): StorageFile? { - if (storageFilePathDictionary.containsKey(path)) + if (storageFilePathDictionary.containsKey(path)) { return storageFilePathDictionary[path]!! + } if (notExistingPathDictionary.contains(path)) return null val parent = getStorageFileForParentDirectory(path) @@ -274,8 +276,9 @@ class StorageFile( private fun getStorageFileForParentDirectory(path: String): StorageFile? { val parentPath = FileUtil.getParentPath(path) ?: return null - if (storageFilePathDictionary.containsKey(parentPath)) + if (storageFilePathDictionary.containsKey(parentPath)) { return storageFilePathDictionary[parentPath]!! + } if (notExistingPathDictionary.contains(parentPath)) return null val parent = findStorageFileForParentDirectory(parentPath) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPicker.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPicker.kt index 33b66540..79008e67 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPicker.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPicker.kt @@ -26,7 +26,9 @@ import timber.log.Timber */ class TimeSpanPicker(private var mContext: Context, attrs: AttributeSet?, defStyle: Int) : LinearLayout( - mContext, attrs, defStyle + mContext, + attrs, + defStyle ), AdapterView.OnItemSelectedListener { private val timeSpanEditText: EditText @@ -72,9 +74,14 @@ class TimeSpanPicker(private var mContext: Context, attrs: AttributeSet?, defSty } fun getTimeSpan(): Long { - return if (!timeSpanDisableCheckbox.isChecked) getTimeSpanFromDialog( - mContext, dialog - ) else -1L + return if (!timeSpanDisableCheckbox.isChecked) { + getTimeSpanFromDialog( + mContext, + dialog + ) + } else { + -1L + } } val timeSpanEnabled: Boolean @@ -142,11 +149,7 @@ class TimeSpanPicker(private var mContext: Context, attrs: AttributeSet?, defSty return calculateTimeSpan(context, timeSpanType, timeSpanAmount) } - fun calculateTimeSpan( - context: Context, - timeSpanType: String, - timeSpanAmount: Long - ): Long { + fun calculateTimeSpan(context: Context, timeSpanType: String, timeSpanAmount: Long): Long { val resources = context.resources return when (timeSpanType) { diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreference.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreference.kt index cbb55ddd..a9fc37cb 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreference.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/TimeSpanPreference.kt @@ -9,7 +9,8 @@ import org.moire.ultrasonic.R * Created by Joshua Bahnsen on 12/22/13. */ class TimeSpanPreference(mContext: Context, attrs: AttributeSet?) : DialogPreference( - mContext, attrs + mContext, + attrs ) { init { setPositiveButtonText(android.R.string.ok) @@ -22,6 +23,8 @@ class TimeSpanPreference(mContext: Context, attrs: AttributeSet?) : DialogPrefer val persisted = getPersistedString("") return if ("" != persisted) { persisted.replace(':', ' ') - } else context.resources.getString(R.string.time_span_disabled) + } else { + context.resources.getString(R.string.time_span_disabled) + } } } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/UncaughtExceptionHandler.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/UncaughtExceptionHandler.kt index b6315d5e..64d8714c 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/UncaughtExceptionHandler.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/UncaughtExceptionHandler.kt @@ -26,7 +26,9 @@ class UncaughtExceptionHandler( val logMessage = String.format( "Android API level: %s\nUltrasonic version name: %s\n" + "Ultrasonic version code: %s\n\n", - Build.VERSION.SDK_INT, Util.getVersionName(context), Util.getVersionCode(context) + Build.VERSION.SDK_INT, + Util.getVersionName(context), + Util.getVersionCode(context) ) printWriter.println(logMessage) throwable.printStackTrace(printWriter) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt index c0d24af8..a8c04b49 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/Util.kt @@ -78,10 +78,6 @@ object Util { private val GIGA_BYTE_FORMAT = DecimalFormat("0.00 GB") private val MEGA_BYTE_FORMAT = DecimalFormat("0.00 MB") private val KILO_BYTE_FORMAT = DecimalFormat("0 KB") - private var GIGA_BYTE_LOCALIZED_FORMAT: DecimalFormat? = null - private var MEGA_BYTE_LOCALIZED_FORMAT: DecimalFormat? = null - private var KILO_BYTE_LOCALIZED_FORMAT: DecimalFormat? = null - private var BYTE_LOCALIZED_FORMAT: DecimalFormat? = null // Used by hexEncode() private val HEX_DIGITS = @@ -137,10 +133,10 @@ object Util { toast(message, true, context) } - @JvmStatic // Toast needs a real context or it will throw a IllegalAccessException // We wrap it in a try-catch block, because if called after doing // some background processing, our context might have expired! + @JvmStatic fun toast(message: CharSequence, shortDuration: Boolean, context: Context?) { try { Toast.makeText( @@ -186,7 +182,6 @@ object Util { @JvmStatic @Synchronized fun formatBytes(byteCount: Long): String { - // More than 1 GB? if (byteCount >= KBYTE * KBYTE * KBYTE) { return GIGA_BYTE_FORMAT.format(byteCount.toDouble() / (KBYTE * KBYTE * KBYTE)) @@ -200,60 +195,9 @@ object Util { // More than 1 KB? return if (byteCount >= KBYTE) { KILO_BYTE_FORMAT.format(byteCount.toDouble() / KBYTE) - } else "$byteCount B" - } - - /** - * Converts a byte-count to a formatted string suitable for display to the user. - * For instance: - * - * * `format(918)` returns *"918 B"*. - * * `format(98765)` returns *"96 KB"*. - * * `format(1238476)` returns *"1.2 MB"*. - * - * This method assumes that 1 KB is 1024 bytes. - * This version of the method returns a localized string. - * - * @param byteCount The number of bytes. - * @return The formatted string. - */ - @Synchronized - @Suppress("ReturnCount") - fun formatLocalizedBytes(byteCount: Long, context: Context): String { - - // More than 1 GB? - if (byteCount >= KBYTE * KBYTE * KBYTE) { - if (GIGA_BYTE_LOCALIZED_FORMAT == null) { - GIGA_BYTE_LOCALIZED_FORMAT = - DecimalFormat(context.resources.getString(R.string.util_bytes_format_gigabyte)) - } - return GIGA_BYTE_LOCALIZED_FORMAT!! - .format(byteCount.toDouble() / (KBYTE * KBYTE * KBYTE)) + } else { + "$byteCount B" } - - // More than 1 MB? - if (byteCount >= KBYTE * KBYTE) { - if (MEGA_BYTE_LOCALIZED_FORMAT == null) { - MEGA_BYTE_LOCALIZED_FORMAT = - DecimalFormat(context.resources.getString(R.string.util_bytes_format_megabyte)) - } - return MEGA_BYTE_LOCALIZED_FORMAT!! - .format(byteCount.toDouble() / (KBYTE * KBYTE)) - } - - // More than 1 KB? - if (byteCount >= KBYTE) { - if (KILO_BYTE_LOCALIZED_FORMAT == null) { - KILO_BYTE_LOCALIZED_FORMAT = - DecimalFormat(context.resources.getString(R.string.util_bytes_format_kilobyte)) - } - return KILO_BYTE_LOCALIZED_FORMAT!!.format(byteCount.toDouble() / KBYTE) - } - if (BYTE_LOCALIZED_FORMAT == null) { - BYTE_LOCALIZED_FORMAT = - DecimalFormat(context.resources.getString(R.string.util_bytes_format_byte)) - } - return BYTE_LOCALIZED_FORMAT!!.format(byteCount.toDouble()) } @Suppress("SuspiciousEqualsCombination") @@ -314,12 +258,14 @@ object Util { fun md5Hex(s: String?): String? { return if (s == null) { null - } else try { - val md5 = MessageDigest.getInstance("MD5") - hexEncode(md5.digest(s.toByteArray(charset(Constants.UTF_8)))) - } catch (all: Exception) { - // TODO: Why is it needed to change the exception type here? - throw RuntimeException(all.message, all) + } else { + try { + val md5 = MessageDigest.getInstance("MD5") + hexEncode(md5.digest(s.toByteArray(charset(Constants.UTF_8)))) + } catch (all: Exception) { + // TODO: Why is it needed to change the exception type here? + throw RuntimeException(all.message, all) + } } } @@ -485,7 +431,6 @@ object Util { val width = options.outWidth var inSampleSize = 1 if (height > reqHeight || width > reqWidth) { - // Calculate ratios of height and width to requested height and // width val heightRatio = (height.toFloat() / reqHeight.toFloat()).roundToInt() @@ -554,7 +499,6 @@ object Util { notificationManager: NotificationManagerCompat ) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - // The suggested importance of a startForeground service notification is IMPORTANCE_LOW val channel = NotificationChannel( id, @@ -576,11 +520,10 @@ object Util { ) { if (ContextCompat.checkSelfPermission( applicationContext(), - POST_NOTIFICATIONS, + POST_NOTIFICATIONS ) != PackageManager.PERMISSION_GRANTED && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ) { - val requestPermissionLauncher = fragment.registerForActivityResult(ActivityResultContracts.RequestPermission()) { if (!it) { @@ -604,7 +547,7 @@ object Util { ) { if (ContextCompat.checkSelfPermission( applicationContext(), - POST_NOTIFICATIONS, + POST_NOTIFICATIONS ) == PackageManager.PERMISSION_GRANTED && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU ) { @@ -644,8 +587,10 @@ object Util { fun scanMedia(file: String?) { // TODO this doesn't work for URIs MediaScannerConnection.scanFile( - applicationContext(), arrayOf(file), - null, null + applicationContext(), + arrayOf(file), + null, + null ) } @@ -683,7 +628,7 @@ object Util { val trackNumber: String, val duration: String, var bitrate: String?, - var fileFormat: String?, + var fileFormat: String? ) @Suppress("ComplexMethod", "LongMethod") @@ -694,10 +639,11 @@ object Util { val duration = song.duration - if (song.bitRate != null && song.bitRate!! > 0) + if (song.bitRate != null && song.bitRate!! > 0) { bitRate = String.format( appContext().getString(R.string.song_details_kbps), song.bitRate ) + } val fileFormat: String? val suffix = song.suffix @@ -705,20 +651,27 @@ object Util { fileFormat = if ( TextUtils.isEmpty(transcodedSuffix) || transcodedSuffix == suffix || song.isVideo - ) suffix else String.format(Locale.ROOT, "%s > %s", suffix, transcodedSuffix) + ) { + suffix + } else { + String.format(Locale.ROOT, "%s > %s", suffix, transcodedSuffix) + } val artistName = song.artist if (artistName != null) { if (Settings.shouldDisplayBitrateWithArtist && ( - !bitRate.isNullOrBlank() || !fileFormat.isNullOrBlank() - ) + !bitRate.isNullOrBlank() || !fileFormat.isNullOrBlank() + ) ) { artist.append(artistName).append(" (").append( String.format( appContext().getString(R.string.song_details_all), - if (bitRate == null) "" - else String.format(Locale.ROOT, "%s ", bitRate), + if (bitRate == null) { + "" + } else { + String.format(Locale.ROOT, "%s ", bitRate) + }, fileFormat ) ).append(')') @@ -740,8 +693,11 @@ object Util { title.append(" (").append( String.format( appContext().getString(R.string.song_details_all), - if (bitRate == null) "" - else String.format(Locale.ROOT, "%s ", bitRate), + if (bitRate == null) { + "" + } else { + String.format(Locale.ROOT, "%s ", bitRate) + }, fileFormat ) ).append(')') @@ -753,7 +709,7 @@ object Util { trackNumber = trackText, duration = formatTotalDuration(duration?.toLong()), bitrate = bitRate, - fileFormat = fileFormat, + fileFormat = fileFormat ) } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/AutoRepeatButton.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/AutoRepeatButton.kt index 0f50f12c..2e04e7a9 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/AutoRepeatButton.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/AutoRepeatButton.kt @@ -56,13 +56,16 @@ class AutoRepeatButton : MaterialButton { } constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super( - context!!, attrs, defStyle + context!!, + attrs, + defStyle ) { commonConstructorCode() } constructor(context: Context?, attrs: AttributeSet?) : super( - context!!, attrs + context!!, + attrs ) { commonConstructorCode() } diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/ChatAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/ChatAdapter.kt index cb2db531..5413f877 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/ChatAdapter.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/ChatAdapter.kt @@ -26,7 +26,9 @@ import org.moire.ultrasonic.subsonic.ImageLoaderProvider class ChatAdapter(private val context: Context, private val messages: List) : ArrayAdapter( - context, R.layout.chat_item, messages + context, + R.layout.chat_item, + messages ), KoinComponent { @@ -90,10 +92,7 @@ class ChatAdapter(private val context: Context, private val messages: List) : ArrayAdapter( - context, R.layout.share_list_item, shares + context, + R.layout.share_list_item, + shares ) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { val entry = getItem(position) diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SortOrder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SortOrder.kt index 5c372198..e646f152 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SortOrder.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/view/SortOrder.kt @@ -19,5 +19,5 @@ enum class SortOrder(val typeName: String) { BY_NAME("alphabeticalByName"), BY_ARTIST("alphabeticalByArtist"), STARRED("starred"), - BY_YEAR("byYear"); + BY_YEAR("byYear") } diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml index 3cf8675c..3be9153f 100644 --- a/ultrasonic/src/main/res/values-cs/strings.xml +++ b/ultrasonic/src/main/res/values-cs/strings.xml @@ -254,10 +254,6 @@ Zobrazí obrázek umělce v náhledu umělců pokud je dostupný Video %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Ťuknutím vybrat hudbu diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml index 46aa76fc..a94a15e0 100644 --- a/ultrasonic/src/main/res/values-de/strings.xml +++ b/ultrasonic/src/main/res/values-de/strings.xml @@ -308,10 +308,6 @@ Medien nur über gebührenfreie Verbindungen herunterladen Nur über WLAN herunterladen %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Berühren, um Musik auszuwählen diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml index b6014e4b..100b01c7 100644 --- a/ultrasonic/src/main/res/values-es/strings.xml +++ b/ultrasonic/src/main/res/values-es/strings.xml @@ -312,10 +312,6 @@ Solo descargar medios en conexiones sin medir Descargar solo por Wi-Fi %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Toca para seleccionar música diff --git a/ultrasonic/src/main/res/values-fr/strings.xml b/ultrasonic/src/main/res/values-fr/strings.xml index f2578bef..31914406 100644 --- a/ultrasonic/src/main/res/values-fr/strings.xml +++ b/ultrasonic/src/main/res/values-fr/strings.xml @@ -298,10 +298,6 @@ Télécharger des médias uniquement sur des connexions non mesurées Téléchargement en Wifi uniquement %d kbits/s - 0 o - 0,00 Go - 0 ko - 0,00 Mo —:—— 0:00 Touchez pour sélectionner un titre diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml index 0bfd09f0..28efc2c8 100644 --- a/ultrasonic/src/main/res/values-hu/strings.xml +++ b/ultrasonic/src/main/res/values-hu/strings.xml @@ -262,10 +262,6 @@ Az előadó listában megjeleníti a képeket, amennyiben elérhetőek Videó %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Érintse meg a zene kiválasztásához diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml index 77fed0ee..2b7c99b0 100644 --- a/ultrasonic/src/main/res/values-it/strings.xml +++ b/ultrasonic/src/main/res/values-it/strings.xml @@ -241,10 +241,6 @@ Usa metodi tag ID3 invece dei metodi basati sul filesystem Video %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Tocca per selezionare musica diff --git a/ultrasonic/src/main/res/values-ja/strings.xml b/ultrasonic/src/main/res/values-ja/strings.xml index 8641b570..abb4cc52 100644 --- a/ultrasonic/src/main/res/values-ja/strings.xml +++ b/ultrasonic/src/main/res/values-ja/strings.xml @@ -243,10 +243,7 @@ 定額制接続でのみメディアをダウンロードします Wi-Fi接続時のみダウンロード %d kbps - 0 B - 0.00 GB プレイリストを消去 - 0.00 MB -:-- 0:00 タップして音楽を選択 @@ -413,7 +410,6 @@ テーマ この設定を有効にすると、Ultrasonic 4.0以降でダウンロードした音楽のみが表示されます。それ以前のバージョンでダウンロードしたファイルには、必要なメタデータが含まれていません。固定モードと保存モードを切り替えることで、不足メタデータのダウンロードができます。 再生中に詳細を表示 - 0 KB SDカード利用不可 常に詳細を確認 デフォルトの有効期限 diff --git a/ultrasonic/src/main/res/values-nb-rNO/strings.xml b/ultrasonic/src/main/res/values-nb-rNO/strings.xml index 81719af4..0bd99046 100644 --- a/ultrasonic/src/main/res/values-nb-rNO/strings.xml +++ b/ultrasonic/src/main/res/values-nb-rNO/strings.xml @@ -399,14 +399,10 @@ Vis mer sporinfo i «Spilles nå» (sjanger, år, bitrate) Dette tvinger programmet til å alltid sende passordet ukryptert. Nyttig hvis Subsonic-tjeneren ikke støtter det nye identitetbekreftelses-API-et for brukere. Antaat toppnivåmappen er navnet på albumsartisten - 0 B Vis artistbilde i artistliste Forvalgt utløpstid Bruk ID3-etikettmetoder istedenfor filsystemsbaserte metoder Bruk ID3-metode også når frakoblet - 0,00 GB - 0 KB - 0,00 MB Deling Slettet %s-deling Viser kun musikken som er lastet ned med Ultrasonic 4.0 eller senere. Tidligere nedlastinger har ikke nødvendig metadata nedlastet. Du kan veksle mellom festingsmodus og lagringsmodus for å utløse nedlasting av manglende metadata. diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml index 5f34a530..ca71f450 100644 --- a/ultrasonic/src/main/res/values-nl/strings.xml +++ b/ultrasonic/src/main/res/values-nl/strings.xml @@ -312,10 +312,6 @@ Haal media alleen op bij gebruik van onbeperkte dataverbindingen Alleen ophalen via wifi %d kbps - 0 B - 0,00 GB - 0 KB - 0,00 MB -:-- 0:00 Druk om muziek te selecteren diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml index 6610ad1c..f7392c5c 100644 --- a/ultrasonic/src/main/res/values-pl/strings.xml +++ b/ultrasonic/src/main/res/values-pl/strings.xml @@ -250,10 +250,6 @@ Używa metod z tagów ID3 zamiast metod opartych na systemie plików Wideo %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Dotknij, aby wybrać muzykę diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml index 43c96885..55afaf4c 100644 --- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml +++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml @@ -310,10 +310,6 @@ Baixar mídia somente em conexões não medidas Download somente via Wi-Fi %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Toque para selecionar a música diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml index ad5cd34f..bc63daad 100644 --- a/ultrasonic/src/main/res/values-pt/strings.xml +++ b/ultrasonic/src/main/res/values-pt/strings.xml @@ -250,10 +250,6 @@ Usa as etiquetas ID3 ao invés do sistema de ficheiros Vídeo %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB —:—— 0:00 Toque para selecionar a música diff --git a/ultrasonic/src/main/res/values-ru/strings.xml b/ultrasonic/src/main/res/values-ru/strings.xml index 38756d33..da167d66 100644 --- a/ultrasonic/src/main/res/values-ru/strings.xml +++ b/ultrasonic/src/main/res/values-ru/strings.xml @@ -280,10 +280,6 @@ Отображает изображение исполнителя в списке исполнителей, если доступно Видео %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Нажмите, чтобы выбрать музыку diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml index 625d81fb..0e0ecbb0 100644 --- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml +++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml @@ -289,10 +289,6 @@ 仅未计量的网络用于下载媒体 仅使用 Wi-Fi 进行下载 %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 轻触选择音乐 diff --git a/ultrasonic/src/main/res/values-zh-rTW/strings.xml b/ultrasonic/src/main/res/values-zh-rTW/strings.xml index 6645fc95..c3c7ead6 100644 --- a/ultrasonic/src/main/res/values-zh-rTW/strings.xml +++ b/ultrasonic/src/main/res/values-zh-rTW/strings.xml @@ -255,7 +255,6 @@ 100 首歌 明色 96 Kbps - 0 KB 覆寫當前語言 5 首歌 250 @@ -283,12 +282,9 @@ 其他設定 15 伺服器顏色 - 0 B - 0.00 GB 用戶名 暗色 -:-- - 0.00 MB 1000 首歌 密碼 diff --git a/ultrasonic/src/main/res/values/strings.xml b/ultrasonic/src/main/res/values/strings.xml index 98c0263f..a4e457a7 100644 --- a/ultrasonic/src/main/res/values/strings.xml +++ b/ultrasonic/src/main/res/values/strings.xml @@ -319,10 +319,6 @@ Download on Wi-Fi only %1$s%2$s %d kbps - 0 B - 0.00 GB - 0 KB - 0.00 MB -:-- 0:00 Touch to select music diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt index 5920744e..983d7c20 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIArtistConverterTest.kt @@ -27,7 +27,9 @@ class APIArtistConverterTest : BaseTest() { @Test fun `Should convert Artist entity to domain MusicDirectory entity`() { val entity = Artist( - id = "101", name = "artist-name", coverArt = "some-art", + id = "101", + name = "artist-name", + coverArt = "some-art", albumCount = 10, albumsList = listOf( Album( diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt index fe03805c..81386b10 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIBookmarkConverterTest.kt @@ -16,8 +16,12 @@ class APIBookmarkConverterTest : BaseTest() { @Test fun `Should convert to domain entity`() { val entity = Bookmark( - 412313L, "Awesemo", "Nice", Calendar.getInstance(), - Calendar.getInstance(), MusicDirectoryChild(id = "12333") + 412313L, + "Awesemo", + "Nice", + Calendar.getInstance(), + Calendar.getInstance(), + MusicDirectoryChild(id = "12333") ) val domainEntity = entity.toDomainEntity(serverId) diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexConverterTest.kt index a785a9ce..40bea4ae 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIIndexConverterTest.kt @@ -23,7 +23,8 @@ class APIIndexConverterTest : BaseTest() { Artist(id = "12", name = "Teebee") ) val entity = Indexes( - lastModified = 154, ignoredArticles = "Le Tre Ze", + lastModified = 154, + ignoredArticles = "Le Tre Ze", indexList = listOf( Index(name = "A", artists = artistsA), Index(name = "T", artists = artistsT) diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt index 55bb07b1..8707eb9f 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIMusicDirectoryConverterTest.kt @@ -15,8 +15,13 @@ class APIMusicDirectoryConverterTest : BaseTest() { @Test fun `Should convert MusicDirectory entity`() { val entity = MusicDirectory( - id = "1982", parent = "345", name = "some-name", userRating = 3, - averageRating = 3.4f, starred = Calendar.getInstance(), playCount = 10, + id = "1982", + parent = "345", + name = "some-name", + userRating = 3, + averageRating = 3.4f, + starred = Calendar.getInstance(), + playCount = 10, childList = listOf(MusicDirectoryChild("1"), MusicDirectoryChild("2")) ) @@ -80,8 +85,10 @@ class APIMusicDirectoryConverterTest : BaseTest() { @Test fun `Should convert MusicDirectoryChild podcast entity`() { val entity = MusicDirectoryChild( - id = "584", streamId = "394", - artist = "some-artist", publishDate = Calendar.getInstance() + id = "584", + streamId = "394", + artist = "some-artist", + publishDate = Calendar.getInstance() ) val convertedEntity = entity.toTrackEntity(serverId) diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt index 040a272e..ec997c43 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIPodcastConverterTest.kt @@ -13,9 +13,14 @@ class APIPodcastConverterTest { @Test fun `Should convert podcast channel entity to domain entity`() { val entity = PodcastChannel( - id = "452", url = "some-url", title = "some-title", - description = "some-description", coverArt = "cA", originalImageUrl = "image-url", - status = "podcast-status", errorMessage = "some-error-message" + id = "452", + url = "some-url", + title = "some-title", + description = "some-description", + coverArt = "cA", + originalImageUrl = "image-url", + status = "podcast-status", + errorMessage = "some-error-message" ) val converterEntity = entity.toDomainEntity() diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt index 101bf160..30562758 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/domain/APIUserConverterTest.kt @@ -13,8 +13,11 @@ class APIUserConverterTest { @Test fun `Should convert to domain entity`() { val entity = User( - username = "Awsemo", email = "none@none.net", scrobblingEnabled = false, - shareRole = true, streamRole = true + username = "Awsemo", + email = "none@none.net", + scrobblingEnabled = false, + shareRole = true, + streamRole = true ) val domainEntity = entity.toDomainEntity() diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/AvatarRequestHandlerTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/AvatarRequestHandlerTest.kt index ddf283bb..424012b0 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/AvatarRequestHandlerTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/AvatarRequestHandlerTest.kt @@ -67,7 +67,8 @@ class AvatarRequestHandlerTest { ).thenReturn(streamResponse) val response = handler.load( - createLoadAvatarRequest("some-username").buildRequest(), 0 + createLoadAvatarRequest("some-username").buildRequest(), + 0 ) response.loadedFrom `should be equal to` Picasso.LoadedFrom.NETWORK diff --git a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandlerTest.kt b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandlerTest.kt index fdef0b0c..4434b7bc 100644 --- a/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandlerTest.kt +++ b/ultrasonic/src/test/kotlin/org/moire/ultrasonic/imageloader/CoverArtRequestHandlerTest.kt @@ -80,7 +80,8 @@ class CoverArtRequestHandlerTest { ).thenReturn(streamResponse) val response = handler.load( - createLoadCoverArtRequest("some").buildRequest(), 0 + createLoadCoverArtRequest("some").buildRequest(), + 0 ) response.loadedFrom `should be equal to` Picasso.LoadedFrom.NETWORK