mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-01-30 06:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed playback notification for Android O

Browse Source
This commit is contained in:
casey langen 2017-08-21 18:21:19 -07:00
parent 5f61289f6c
commit c4cc06f236
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/playback/SystemService.kt
View File

@ -1,7 +1,6 @@
package io.casey.musikcube.remote.playback
import android.app.PendingIntent
import android.app.Service
import android.app.*
import android.content.*
import android.graphics.Bitmap
import android.media.AudioManager
@ -28,6 +27,7 @@ import io.casey.musikcube.remote.util.Debouncer
import io.casey.musikcube.remote.util.Strings
import io.casey.musikcube.remote.websocket.Prefs
import android.support.v4.app.NotificationCompat.Action as NotifAction
import android.os.Build
/**
* a service used to interact with all of the system media-related components -- notifications,
@ -36,19 +36,36 @@ import android.support.v4.app.NotificationCompat.Action as NotifAction
*/
class SystemService : Service() {
private val handler = Handler()
private var prefs: SharedPreferences? = null
private var playback: StreamingPlaybackService? = null
private var wakeLock: PowerManager.WakeLock? = null
private var powerManager: PowerManager? = null
private var mediaSession: MediaSessionCompat? = null
private var headsetHookPressCount = 0
private lateinit var powerManager: PowerManager
private lateinit var prefs: SharedPreferences
private var albumArtModel = AlbumArtModel.empty()
private var albumArt: Bitmap? = null
private var albumArtRequest: SimpleTarget<Bitmap>? = null
override fun onCreate() {
super.onCreate()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel(
NOTIFICATION_CHANNEL,
NOTIFICATION_CHANNEL,
NotificationManager.IMPORTANCE_LOW)
channel.enableVibration(false)
channel.setSound(null, null)
channel.lockscreenVisibility = Notification.VISIBILITY_PUBLIC
val nm = getSystemService(Service.NOTIFICATION_SERVICE) as NotificationManager
nm.deleteNotificationChannel(NOTIFICATION_CHANNEL)
nm.createNotificationChannel(channel)
}
prefs = getSharedPreferences(Prefs.NAME, Context.MODE_PRIVATE)
powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager
registerReceivers()
@ -90,7 +107,7 @@ class SystemService : Service() {
}
if (wakeLock == null) {
wakeLock = powerManager?.newWakeLock(
wakeLock = powerManager.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, "StreamingPlaybackService")
wakeLock?.setReferenceCounted(false)
@ -221,8 +238,8 @@ class SystemService : Service() {
private fun updateMetadata(title: String, artist: String, album: String, image: Bitmap?, duration: Int) {
var currentImage = image
val albumArtEnabledInSettings = this.prefs?.getBoolean(
Prefs.Key.ALBUM_ART_ENABLED, Prefs.Default.ALBUM_ART_ENABLED) ?: Prefs.Default.ALBUM_ART_ENABLED
val albumArtEnabledInSettings = this.prefs.getBoolean(
Prefs.Key.ALBUM_ART_ENABLED, Prefs.Default.ALBUM_ART_ENABLED)
if (albumArtEnabledInSettings) {
if ("-" != artist && "-" != album && !albumArtModel.matches(artist, album)) {
@ -255,13 +272,12 @@ class SystemService : Service() {
val contentIntent = PendingIntent.getActivity(
applicationContext, 1, MainActivity.getStartIntent(this), 0)
val notification = NotificationCompat.Builder(this, "musikdroid")
val notification = NotificationCompat.Builder(this, NOTIFICATION_CHANNEL)
.setSmallIcon(R.drawable.ic_notification)
.setContentTitle(title)
.setContentText(artist + " - " + album)
.setContentIntent(contentIntent)
.setUsesChronometer(false)
//.setLargeIcon(albumArtBitmap))
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
.setOngoing(true)
@ -461,6 +477,7 @@ class SystemService : Service() {
companion object {
private val TAG = "SystemService"
private val NOTIFICATION_ID = 0xdeadbeef.toInt()
private val NOTIFICATION_CHANNEL = "musikdroid"
private val HEADSET_HOOK_DEBOUNCE_MS = 500L
private val ACTION_NOTIFICATION_PLAY = "io.casey.musikcube.remote.NOTIFICATION_PLAY"
private val ACTION_NOTIFICATION_PAUSE = "io.casey.musikcube.remote.NOTIFICATION_PAUSE"

2
src/musikdroid/app/src/main/java/io/casey/musikcube/remote/util/Debouncer.kt
View File

@ -24,7 +24,7 @@ abstract class Debouncer<in T>(private val delay: Long) {
protected abstract fun onDebounced(last: T?)
private val deferred = object : Runnable {
private val deferred:Runnable = object : Runnable {
override fun run() {
onDebounced(last)
}

2
src/musikdroid/build.gradle
View File

@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.1.3-2'
ext.kotlin_version = '1.1.4-2'
repositories {
jcenter()
}