wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adding some crashfixes

Browse source
This commit is contained in:
tibbi 2022-04-03 21:32:18 +02:00
parent 5a0b79d208
commit 235d820803
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -68,7 +68,7 @@ android {
}
dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:7ad1d7c4db'
implementation 'com.github.SimpleMobileTools:Simple-Commons:dd35cb8380'
implementation 'org.greenrobot:eventbus:3.2.0'
implementation 'androidx.media:media:1.4.3'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

21
app/src/main/kotlin/com/simplemobiletools/musicplayer/services/MusicService.kt
View file

@ -463,14 +463,14 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
val notificationDismissedIntent = Intent(this, NotificationDismissedReceiver::class.java).apply {
action = NOTIFICATION_DISMISSED
}
val notificationDismissedPendingIntent =
PendingIntent.getBroadcast(this, 0, notificationDismissedIntent, PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE)
val flags = PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE
val notificationDismissedPendingIntent = PendingIntent.getBroadcast(this, 0, notificationDismissedIntent, flags)
val notification = NotificationCompat.Builder(applicationContext, NOTIFICATION_CHANNEL)
.setContentTitle(title)
.setContentText(artist)
.setSmallIcon(R.drawable.ic_headset_small)
.setLargeIcon(mCurrTrackCover)
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setPriority(NotificationCompat.PRIORITY_MAX)
.setWhen(notifWhen)
@ -490,6 +490,11 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
.addAction(playPauseIcon, getString(R.string.playpause), getIntent(PLAYPAUSE))
.addAction(R.drawable.ic_next_vector, getString(R.string.next), getIntent(NEXT))
try {
notification.setLargeIcon(mCurrTrackCover)
} catch (e: OutOfMemoryError) {
}
startForeground(NOTIFICATION_ID, notification.build())
// delay foreground state updating a bit, so the notification can be swiped away properly after initial display
@ -751,7 +756,10 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
mCurrTrackCover = albumImage.first
var lockScreenImage = if (albumImage.second) albumImage.first else null
if (lockScreenImage == null || lockScreenImage.isRecycled) {
lockScreenImage = resources.getColoredBitmap(R.drawable.ic_headset, getProperTextColor())
try {
lockScreenImage = resources.getColoredBitmap(R.drawable.ic_headset, getProperTextColor())
} catch (e: OutOfMemoryError) {
}
}
val metadata = MediaMetadataCompat.Builder()
@ -777,7 +785,10 @@ class MusicService : Service(), MediaPlayer.OnPreparedListener, MediaPlayer.OnEr
}
builder.setState(playbackState, mPlayer?.currentPosition?.toLong() ?: 0L, mPlaybackSpeed)
mMediaSession?.setPlaybackState(builder.build())
try {
mMediaSession?.setPlaybackState(builder.build())
} catch (ignored: Exception) {
}
}
private fun updateQueueSize() {