From bf66c25c7f1438640941c32b37cc50c4282ff808 Mon Sep 17 00:00:00 2001 From: andre Date: Tue, 24 May 2016 19:33:12 +0200 Subject: [PATCH 1/2] MusicPlayBackReceiver set track, artist and album to the artist member of MusicSpec. Now the assignment of artist, track and album is correct --- .../externalevents/MusicPlaybackReceiver.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java index d910e75e..67c7e8e7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/MusicPlaybackReceiver.java @@ -3,6 +3,7 @@ package nodomain.freeyourgadget.gadgetbridge.externalevents; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,20 +19,13 @@ public class MusicPlaybackReceiver extends BroadcastReceiver { String artist = intent.getStringExtra("artist"); String album = intent.getStringExtra("album"); String track = intent.getStringExtra("track"); - /* - Bundle bundle = intent.getExtras(); - for (String key : bundle.keySet()) { - Object value = bundle.get(key); - LOG.info(String.format("%s %s (%s)", key, - value != null ? value.toString() : "null", value != null ? value.getClass().getName() : "no class")); - } - */ + LOG.info("Current track: " + artist + ", " + album + ", " + track); MusicSpec musicSpec = new MusicSpec(); musicSpec.artist = artist; - musicSpec.artist = album; - musicSpec.artist = track; + musicSpec.album = album; + musicSpec.track = track; GBApplication.deviceService().onSetMusicInfo(musicSpec); } From 31c15bb8b8e3210116fa59e73e05bfa5dd9fb8e9 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 24 May 2016 23:55:03 +0200 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + app/src/main/res/xml/changelog_master.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91ce3b0e..fb97f49e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Pebble: option in AppManager to delete files from cache * Pebble: enable pbw cache and watchface configuration for Firmware 2.x * Pebble: allow enabling of Pebble Health without "untested features" being enabled +* Pebble: fix music information being messed up * Honour "Do Not Disturb" for phone calls and SMS ####Version 0.9.7 diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index abe77eba..30022f53 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -7,6 +7,7 @@ Pebble: enable pbw cache and watchface configuration for Firmware 2.x Pebble: allow enabling of Pebble Health without "untested features" being enabled Honour "Do Not Disturb" for phone calls and SMS + Pebble: fix music information being messed up Pebble: hopefully fix some reconnect issues