fix cast not working

naman14 · Feb 9, 2019 · 987653f · afollestad · Feb 9, 2019 · 987653f
1 parent cd04e35
commit 987653f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/app/src/main/java/com/naman14/timberx/cast/CastServer.kt b/app/src/main/java/com/naman14/timberx/cast/CastServer.kt
@@ -59,8 +59,6 @@ class CastServer(private val context: Context) : NanoHTTPD(CAST_SERVER_PORT) {
             } catch (e: FileNotFoundException) {
                 Timber.e(e, "Failed to read album art from $albumArtUri")
                 return errorResponse(e.message)
-            } finally {
-                fisAlbumArt.closeQuietly()
             }
             return newChunkedResponse(OK, MIME_TYPE_IMAGE, fisAlbumArt)
         } else if (uri?.contains(PART_SONG) == true) {
@@ -76,8 +74,6 @@ class CastServer(private val context: Context) : NanoHTTPD(CAST_SERVER_PORT) {
             } catch (e: FileNotFoundException) {
                 Timber.e(e, "Failed to read song from $songUri")
                 return errorResponse(e.message)
-            } finally {
-                fisSong.closeQuietly()
             }
             return newFixedLengthResponse(OK, MIME_TYPE_AUDIO, fisSong, song.length())
         }

diff --git a/app/src/main/java/com/naman14/timberx/ui/viewmodels/MainViewModel.kt b/app/src/main/java/com/naman14/timberx/ui/viewmodels/MainViewModel.kt
@@ -275,11 +275,11 @@ class MainViewModel(
                 val castContext = CastContext.getSharedInstance(context.applicationContext)
                 sessionManager = castContext.sessionManager
                 if (castSession == null) {
-                    sessionManager?.addSessionManagerListener(sessionManagerListener)
-                    castSession = sessionManager?.currentCastSession?.apply {
-                        remoteMediaClient?.registerCallback(castCallback)
-                        remoteMediaClient?.addProgressListener(castProgressListener, 100)
+                    castSession = sessionManager?.currentCastSession.also {
+                        it?.remoteMediaClient?.registerCallback(castCallback)
+                        it?.remoteMediaClient?.addProgressListener(castProgressListener, 100)
                     }
+                    sessionManager?.addSessionManagerListener(sessionManagerListener)
                 } else {
                     sessionManager?.currentCastSession?.let { castSession = it }
                 }