From 6b514c0c0a76e6e62ef01b966bf3a9d5cf02c285 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Sat, 7 Feb 2015 12:44:58 +0100
Subject: [PATCH] Bug fixing

- isPlayerPrepared() illegalState bug fixed
- tag editor bug fixed when track number field is empty
- updated the tag editor track field hint
---
 .../com/kabouzeid/materialmusic/service/MusicService.java   | 2 +-
 .../ui/activities/tageditor/AbsTagEditorActivity.java       | 6 +++++-
 app/src/main/res/layout/activity_song_tag_editor.xml        | 2 +-
 app/src/main/res/values/strings.xml                         | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java b/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
index ed520e59..b5428baa 100644
--- a/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/materialmusic/service/MusicService.java
@@ -210,7 +210,7 @@ public class MusicService extends Service implements MediaPlayer.OnPreparedListe
     }
 
     public boolean isPlaying() {
-        return player != null && player.isPlaying();
+        return player != null && isPlayerPrepared && player.isPlaying();
     }
 
     private void notifyOnMusicRemoteEventListeners(int event) {
diff --git a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java
index aeab8f6a..33f6ba90 100644
--- a/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/materialmusic/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -335,7 +335,11 @@ public abstract class AbsTagEditorActivity extends ActionBarActivity {
                         AudioFile audioFile = AudioFileIO.read(new File(songPath));
                         Tag tag = audioFile.getTagOrCreateAndSetDefault();
                         for (Map.Entry<FieldKey, String> entry : fieldKeyValueMap.entrySet()) {
-                            tag.setField(entry.getKey(), entry.getValue());
+                            try {
+                                tag.setField(entry.getKey(), entry.getValue());
+                            } catch (NumberFormatException e) {
+                                tag.deleteField(entry.getKey());
+                            }
                         }
                         if (deleteArtwork) {
                             tag.deleteArtworkField();
diff --git a/app/src/main/res/layout/activity_song_tag_editor.xml b/app/src/main/res/layout/activity_song_tag_editor.xml
index 2f076b1a..541e35c7 100644
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -169,7 +169,7 @@
                         android:layout_gravity="center"
                         android:fontFamily="sans-serif"
                         android:gravity="center_vertical"
-                        android:hint="@string/track"
+                        android:hint="@string/track_hint"
                         android:inputType="numberDecimal"
                         android:singleLine="true"
                         android:textAppearance="@style/TextAppearance.AppCompat.Title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa589c70..6f852681 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -46,6 +46,7 @@
     <string name="album_artist">Album artist</string>
     <string name="year">Year</string>
     <string name="track">Track</string>
+    <string name="track_hint">Track (2 for track 2 or 3004 for CD3 track 4)</string>
     <string name="album_or_artist_empty">The album title or the album artist text field is empty.</string>
     <string name="writing_file_number">Writing file</string>
     <string name="title_activity_album_tag_editor">AlbumTagEditorActivity</string>