From e50a43a8128ace003c1bd63c558604c99eade01d Mon Sep 17 00:00:00 2001 From: Antoine POPINEAU Date: Thu, 11 Jun 2020 00:01:39 +0200 Subject: [PATCH] Lint. --- app/src/main/java/com/github/apognu/otter/Otter.kt | 6 ++++-- .../github/apognu/otter/playback/MediaControlsManager.kt | 9 +++------ .../apognu/otter/repositories/ArtistTracksRepository.kt | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/github/apognu/otter/Otter.kt b/app/src/main/java/com/github/apognu/otter/Otter.kt index c1e5b10..2edeb0b 100644 --- a/app/src/main/java/com/github/apognu/otter/Otter.kt +++ b/app/src/main/java/com/github/apognu/otter/Otter.kt @@ -2,13 +2,15 @@ package com.github.apognu.otter import android.app.Application import androidx.appcompat.app.AppCompatDelegate -import com.github.apognu.otter.utils.* +import com.github.apognu.otter.utils.Cache +import com.github.apognu.otter.utils.Command +import com.github.apognu.otter.utils.Event +import com.github.apognu.otter.utils.Request import com.preference.PowerPreference import kotlinx.coroutines.channels.BroadcastChannel import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.ConflatedBroadcastChannel import java.text.SimpleDateFormat -import java.time.format.DateTimeFormatter import java.util.* class Otter : Application() { diff --git a/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt b/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt index c8eaa8e..4b3cc0a 100644 --- a/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt +++ b/app/src/main/java/com/github/apognu/otter/playback/MediaControlsManager.kt @@ -52,8 +52,7 @@ class MediaControlsManager(val context: Service, private val mediaSession: Media putLong(MediaMetadata.METADATA_KEY_DURATION, (track.bestUpload()?.duration?.toLong() ?: 0L) * 1000) cover?.let { - try { putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, it.get()) } - catch (_: Exception) {} + try { putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, it.get()) } catch (_: Exception) {} } }.build()) @@ -71,12 +70,10 @@ class MediaControlsManager(val context: Service, private val mediaSession: Media .setSmallIcon(R.drawable.ottericon) .run { if (cover != null) { - try { setLargeIcon(cover.get()) } - catch (_: Exception) {} + try { setLargeIcon(cover.get()) } catch (_: Exception) {} this - } - else this + } else this } .setContentTitle(track.title) .setContentText(track.artist.name) diff --git a/app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt b/app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt index 32967ca..24e7d74 100644 --- a/app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt +++ b/app/src/main/java/com/github/apognu/otter/repositories/ArtistTracksRepository.kt @@ -10,8 +10,8 @@ import com.google.gson.reflect.TypeToken import java.io.BufferedReader class ArtistTracksRepository(override val context: Context?, private val artistId: Int) : Repository() { - override val cacheId = "tracks-artist-${artistId}" - override val upstream = HttpUpstream>(HttpUpstream.Behavior.AtOnce, "/api/v1/tracks/?playable=true&artist=${artistId}", object : TypeToken() {}.type) + override val cacheId = "tracks-artist-$artistId" + override val upstream = HttpUpstream>(HttpUpstream.Behavior.AtOnce, "/api/v1/tracks/?playable=true&artist=$artistId", object : TypeToken() {}.type) override fun cache(data: List) = TracksCache(data) override fun uncache(reader: BufferedReader) = gsonDeserializerOf(TracksCache::class.java).deserialize(reader)