From c60fef26d4194b9c0aa67fcb9b585a34b3e5c8cd Mon Sep 17 00:00:00 2001
From: Joshua Bahnsen <archrival@gmail.com>
Date: Wed, 22 Jan 2014 07:30:15 -0700
Subject: [PATCH] Remove sending track, disc and genre to lockscreen controls,
 version 1.3.0.5

---
 AndroidManifest.xml                                 |  4 ++--
 .../androidapp/service/DownloadServiceImpl.java     | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c1000c8a..02f00c17 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
           package="com.thejoshwa.ultrasonic.androidapp"
           a:installLocation="auto"
-          a:versionCode="44"
-          a:versionName="1.3.0.4">
+          a:versionCode="45"
+          a:versionName="1.3.0.5">
 
 <uses-permission a:name="android.permission.INTERNET"/>
     <uses-permission a:name="android.permission.READ_PHONE_STATE"/>
diff --git a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
index 4d370391..9717303f 100644
--- a/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
+++ b/src/com/thejoshwa/ultrasonic/androidapp/service/DownloadServiceImpl.java
@@ -1564,12 +1564,17 @@ public class DownloadServiceImpl extends Service implements DownloadService
 			String artist = currentSong.getArtist();
 			String album = currentSong.getAlbum();
 			String title = currentSong.getTitle();
-			String genre = currentSong.getGenre();
-			Integer track = currentSong.getTrack();
-			Integer disc = currentSong.getDiscNumber();
+			//String genre = currentSong.getGenre();
+			//Integer track = currentSong.getTrack();
+			//Integer disc = currentSong.getDiscNumber();
 			Long duration = (long) currentSong.getDuration() * 1000;
 
-			remoteControlClient.editMetadata(true).putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, artist).putString(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST, artist).putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, album).putString(MediaMetadataRetriever.METADATA_KEY_TITLE, title).putString(MediaMetadataRetriever.METADATA_KEY_GENRE, genre).putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration).putLong(MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER, track).putLong(MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER, disc).putBitmap(RemoteControlClient.MetadataEditor.BITMAP_KEY_ARTWORK, lockScreenBitmap).apply();
+			remoteControlClient.editMetadata(true).putString(MediaMetadataRetriever.METADATA_KEY_ARTIST, artist).putString(MediaMetadataRetriever.METADATA_KEY_ALBUMARTIST, artist).putString(MediaMetadataRetriever.METADATA_KEY_ALBUM, album).putString(MediaMetadataRetriever.METADATA_KEY_TITLE, title)
+					//.putString(MediaMetadataRetriever.METADATA_KEY_GENRE, genre)
+					.putLong(MediaMetadataRetriever.METADATA_KEY_DURATION, duration)
+							//.putLong(MediaMetadataRetriever.METADATA_KEY_CD_TRACK_NUMBER, track)
+							//.putLong(MediaMetadataRetriever.METADATA_KEY_DISC_NUMBER, disc)
+					.putBitmap(RemoteControlClient.MetadataEditor.BITMAP_KEY_ARTWORK, lockScreenBitmap).apply();
 		}
 	}