Skip to content

Commit

Permalink
fix: SimpleCache crash (#53)
Browse files Browse the repository at this point in the history
* Speculative fix for crash

* Fix crash
  • Loading branch information
mpivchev committed Sep 27, 2022
1 parent f8589ef commit dd4bdab
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import com.doublesymmetry.kotlinaudio.event.NotificationEventHolder
import com.doublesymmetry.kotlinaudio.event.PlayerEventHolder
import com.doublesymmetry.kotlinaudio.models.*
import com.doublesymmetry.kotlinaudio.notification.NotificationManager
import com.doublesymmetry.kotlinaudio.players.components.PlayerCache
import com.doublesymmetry.kotlinaudio.players.components.getMediaMetadataCompat
import com.doublesymmetry.kotlinaudio.utils.isUriLocal
import com.google.android.exoplayer2.*
import com.google.android.exoplayer2.DefaultLoadControl.*
import com.google.android.exoplayer2.Player.Listener
import com.google.android.exoplayer2.database.DatabaseProvider
import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector
import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory
import com.google.android.exoplayer2.metadata.Metadata
Expand All @@ -40,13 +40,11 @@ import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource
import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource
import com.google.android.exoplayer2.upstream.*
import com.google.android.exoplayer2.upstream.cache.CacheDataSource
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
import com.google.android.exoplayer2.upstream.cache.SimpleCache
import com.google.android.exoplayer2.util.Util
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.launch
import timber.log.Timber
import java.io.File
import java.util.concurrent.TimeUnit

abstract class BaseAudioPlayer internal constructor(private val context: Context, playerConfig: PlayerConfig, private val bufferConfig: BufferConfig?, private val cacheConfig: CacheConfig?) : AudioManager.OnAudioFocusChangeListener {
Expand Down Expand Up @@ -148,9 +146,7 @@ abstract class BaseAudioPlayer internal constructor(private val context: Context

init {
if (cacheConfig != null) {
val cacheDir = File(context.cacheDir, cacheConfig.identifier)
val db: DatabaseProvider = StandaloneDatabaseProvider(context)
cache = SimpleCache(cacheDir, LeastRecentlyUsedCacheEvictor(cacheConfig.maxCacheSize ?: 0), db)
cache = PlayerCache.getInstance(context, cacheConfig)
}

exoPlayer = ExoPlayer.Builder(context)
Expand Down Expand Up @@ -271,6 +267,7 @@ abstract class BaseAudioPlayer internal constructor(private val context: Context
notificationManager.destroy()
exoPlayer.release()
cache?.release()
cache = null
mediaSession.isActive = false
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import android.content.Context
import android.support.v4.media.MediaDescriptionCompat
import android.support.v4.media.session.MediaSessionCompat
import com.doublesymmetry.kotlinaudio.models.*
import com.doublesymmetry.kotlinaudio.players.components.getMediaMetadataCompat
import com.google.android.exoplayer2.C
import com.google.android.exoplayer2.IllegalSeekPositionException
import com.google.android.exoplayer2.Player
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.doublesymmetry.kotlinaudio.players
package com.doublesymmetry.kotlinaudio.players.components

import android.support.v4.media.MediaMetadataCompat
import android.support.v4.media.RatingCompat
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.doublesymmetry.kotlinaudio.players.components

import android.content.Context
import com.doublesymmetry.kotlinaudio.models.CacheConfig
import com.google.android.exoplayer2.database.DatabaseProvider
import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
import com.google.android.exoplayer2.upstream.cache.SimpleCache
import java.io.File

object PlayerCache {
@Volatile
private var instance: SimpleCache? = null

fun getInstance(context: Context, cacheConfig: CacheConfig): SimpleCache? {
val cacheDir = File(context.cacheDir, cacheConfig.identifier)
val db: DatabaseProvider = StandaloneDatabaseProvider(context)

instance ?: synchronized(this) {
instance ?: SimpleCache(cacheDir, LeastRecentlyUsedCacheEvictor(cacheConfig.maxCacheSize ?: 0), db)
.also { instance = it }
}

return instance
}
}

0 comments on commit dd4bdab

Please sign in to comment.