Remove pointless intermediate messages

22 files changed, 1 insertions, 48 deletions

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1963790c..ce9a68e5 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -420,8 +420,6 @@
 

     <string name="service.connecting">Kontaktiere Server, bitte warten.</string>

 

-    <string name="parser.reading">Lese vom Server.</string>

-    <string name="parser.reading_done">Lese vom Server. Fertig!</string>

     <string name="parser.upgrade_client">Inkompatible Versionen. Aktualisierung der DSub Android App erforderlich.</string>

     <string name="parser.upgrade_server">Inkompatible Versionen. Aktualisierung des Subsonic Server erforderlich.</string>

     <string name="parser.not_authenticated">Benutzername oder/und Passwort falsch.</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index db557f19..e18e4b08 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -434,8 +434,6 @@
 
     <string name="service.connecting">Conectando con el servidor, espere por favor.</string>
 
-    <string name="parser.reading">Leyendo desde el servidor.</string>
-    <string name="parser.reading_done">Leyendo desde el servidor. Hecho!</string>
     <string name="parser.upgrade_client">Versiones incompatibles. Por favor, actualice la aplicación DSub de Android.</string>
     <string name="parser.upgrade_server">Versiones incompatibles. Por favor, actualice su servidor Subsonic.</string>
     <string name="parser.not_authenticated">Usuario o contraseña inconrrectos.</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1625ab84..9a4e51ae 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -441,8 +441,6 @@
 

     <string name="service.connecting">Csatlakozás a kiszolgálóhoz, kérem várjon!</string>

 

-    <string name="parser.reading">Olvasás a kiszolgálóról...</string>

-    <string name="parser.reading_done">Olvasás a kiszolgálóról. Kész!</string>

     <string name="parser.upgrade_client">Nem kompatibilis verzió. Kérjük, frissítse a DSub Android alkalmazást!</string>

     <string name="parser.upgrade_server">Nem kompatibilis verzió. Kérjük, frissítse a Subsonic kiszolgálót!</string>

     <string name="parser.not_authenticated">Hibás felhasználónév vagy jelszó!</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d4edbf46..7094fe7d 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -259,8 +259,6 @@
 

     <string name="service.connecting">Подключение к серверу. Пожалуйста, подождите.</string>

 

-    <string name="parser.reading">Чтение с сервера.</string>

-    <string name="parser.reading_done">Чтение с сервера выполнено!</string>

     <string name="parser.upgrade_client">Несовместимые версии. Пожалуйста, обновите приложение DSub для Android.</string>

     <string name="parser.upgrade_server">Несовместимые версии. Пожалуйста, обновите сервер Subsonic.</string>

     <string name="parser.not_authenticated">Неправильное имя пользователя или пароль.</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d0df0d24..0cbb9330 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -440,9 +440,7 @@
 

     <string name="service.connecting">Contacting server, please wait.</string>

 

-    <string name="parser.reading">Reading from server.</string>

-    <string name="parser.reading_done">Reading from server. Done!</string>

-    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub Android app.</string>

+    <string name="parser.upgrade_client">Incompatible versions. Please upgrade DSub.</string>

     <string name="parser.upgrade_server">Incompatible versions. Please upgrade Subsonic server.</string>

     <string name="parser.not_authenticated">Wrong username or password.</string>

     <string name="parser.not_authorized">Not authorized. Check user permissions in Subsonic server.</string>

diff --git a/src/github/daneren2005/dsub/service/parser/AlbumListParser.java b/src/github/daneren2005/dsub/service/parser/AlbumListParser.java
index 9cf064e6..880a9a22 100644
--- a/src/github/daneren2005/dsub/service/parser/AlbumListParser.java
+++ b/src/github/daneren2005/dsub/service/parser/AlbumListParser.java
@@ -36,8 +36,6 @@ public class AlbumListParser extends MusicDirectoryEntryParser {
     }
 
     public MusicDirectory parse(Reader reader, ProgressListener progressListener) throws Exception {
-
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         MusicDirectory dir = new MusicDirectory();
@@ -57,7 +55,6 @@ public class AlbumListParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return dir;
     }
diff --git a/src/github/daneren2005/dsub/service/parser/BookmarkParser.java b/src/github/daneren2005/dsub/service/parser/BookmarkParser.java
index a71e0e8b..23db3a07 100644
--- a/src/github/daneren2005/dsub/service/parser/BookmarkParser.java
+++ b/src/github/daneren2005/dsub/service/parser/BookmarkParser.java
@@ -37,7 +37,6 @@ public class BookmarkParser extends MusicDirectoryEntryParser {
     }
 
     public List<Bookmark> parse(Reader reader, ProgressListener progressListener) throws Exception {
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         List<Bookmark> bookmarks = new ArrayList<Bookmark>();
@@ -69,7 +68,6 @@ public class BookmarkParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return bookmarks;
     }
diff --git a/src/github/daneren2005/dsub/service/parser/ChatMessageParser.java b/src/github/daneren2005/dsub/service/parser/ChatMessageParser.java
index 1425a734..8e37de40 100644
--- a/src/github/daneren2005/dsub/service/parser/ChatMessageParser.java
+++ b/src/github/daneren2005/dsub/service/parser/ChatMessageParser.java
@@ -38,7 +38,6 @@ public class ChatMessageParser extends AbstractParser {
     }

 

     public List<ChatMessage> parse(Reader reader, ProgressListener progressListener) throws Exception {

-        updateProgress(progressListener, R.string.parser_reading);

         init(reader);

         List<ChatMessage> result = new ArrayList<ChatMessage>();

         int eventType;

@@ -60,7 +59,6 @@ public class ChatMessageParser extends AbstractParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);

 

         validate();

-        updateProgress(progressListener, R.string.parser_reading_done);

         

         return result;

     }

diff --git a/src/github/daneren2005/dsub/service/parser/GenreParser.java b/src/github/daneren2005/dsub/service/parser/GenreParser.java
index 35913ba9..e963442c 100644
--- a/src/github/daneren2005/dsub/service/parser/GenreParser.java
+++ b/src/github/daneren2005/dsub/service/parser/GenreParser.java
@@ -45,8 +45,6 @@ public class GenreParser extends AbstractParser {
     }

 

     public List<Genre> parse(Reader reader, ProgressListener progressListener) throws Exception {

-        updateProgress(progressListener, R.string.parser_reading);

-        

         List<Genre> result = new ArrayList<Genre>();

         StringReader sr = null;

         

@@ -118,7 +116,6 @@ public class GenreParser extends AbstractParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);

 

         validate();

-        updateProgress(progressListener, R.string.parser_reading_done);

         

         return Genre.GenreComparator.sort(result);

     }

diff --git a/src/github/daneren2005/dsub/service/parser/IndexesParser.java b/src/github/daneren2005/dsub/service/parser/IndexesParser.java
index 30ea190b..3af76e1d 100644
--- a/src/github/daneren2005/dsub/service/parser/IndexesParser.java
+++ b/src/github/daneren2005/dsub/service/parser/IndexesParser.java
@@ -49,9 +49,7 @@ public class IndexesParser extends MusicDirectoryEntryParser {
     }
 
     public Indexes parse(Reader reader, ProgressListener progressListener) throws Exception {
-
         long t0 = System.currentTimeMillis();
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         List<Artist> artists = new ArrayList<Artist>();
diff --git a/src/github/daneren2005/dsub/service/parser/LyricsParser.java b/src/github/daneren2005/dsub/service/parser/LyricsParser.java
index 98b0f6a0..b621d518 100644
--- a/src/github/daneren2005/dsub/service/parser/LyricsParser.java
+++ b/src/github/daneren2005/dsub/service/parser/LyricsParser.java
@@ -36,7 +36,6 @@ public class LyricsParser extends AbstractParser {
     }
 
     public Lyrics parse(Reader reader, ProgressListener progressListener) throws Exception {
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         Lyrics lyrics = null;
diff --git a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
index 75f878be..e09aa33b 100644
--- a/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
+++ b/src/github/daneren2005/dsub/service/parser/MusicDirectoryParser.java
@@ -44,7 +44,6 @@ public class MusicDirectoryParser extends MusicDirectoryEntryParser {
 
     public MusicDirectory parse(String artist, Reader reader, ProgressListener progressListener) throws Exception {
         long t0 = System.currentTimeMillis();
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         MusicDirectory dir = new MusicDirectory();
@@ -74,7 +73,6 @@ public class MusicDirectoryParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 		
 		// Only apply sorting on server version 4.7 and greater, where disc is supported
 		if(Util.checkServerVersion(context, "1.8.0") && Util.getPreferences(context).getBoolean(Constants.PREFERENCES_KEY_CUSTOM_SORT_ENABLED, true)) {
diff --git a/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java b/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
index d6b0fa90..246c3415 100644
--- a/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
+++ b/src/github/daneren2005/dsub/service/parser/MusicFoldersParser.java
@@ -39,8 +39,6 @@ public class MusicFoldersParser extends AbstractParser {
     }
 
     public List<MusicFolder> parse(Reader reader, ProgressListener progressListener) throws Exception {
-
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         List<MusicFolder> result = new ArrayList<MusicFolder>();
@@ -60,7 +58,6 @@ public class MusicFoldersParser extends AbstractParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return result;
     }
diff --git a/src/github/daneren2005/dsub/service/parser/PlaylistParser.java b/src/github/daneren2005/dsub/service/parser/PlaylistParser.java
index c630eb44..1eda1806 100644
--- a/src/github/daneren2005/dsub/service/parser/PlaylistParser.java
+++ b/src/github/daneren2005/dsub/service/parser/PlaylistParser.java
@@ -36,7 +36,6 @@ public class PlaylistParser extends MusicDirectoryEntryParser {
     }
 
     public MusicDirectory parse(Reader reader, ProgressListener progressListener) throws Exception {
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         MusicDirectory dir = new MusicDirectory();
@@ -57,7 +56,6 @@ public class PlaylistParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return dir;
     }
diff --git a/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java b/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
index a5bf2497..c3b47f47 100644
--- a/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
+++ b/src/github/daneren2005/dsub/service/parser/PlaylistsParser.java
@@ -39,8 +39,6 @@ public class PlaylistsParser extends AbstractParser {
     }
 
     public List<Playlist> parse(Reader reader, ProgressListener progressListener) throws Exception {
-
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         List<Playlist> result = new ArrayList<Playlist>();
@@ -65,7 +63,6 @@ public class PlaylistsParser extends AbstractParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return PlaylistAdapter.PlaylistComparator.sort(result);
     }
diff --git a/src/github/daneren2005/dsub/service/parser/PodcastChannelParser.java b/src/github/daneren2005/dsub/service/parser/PodcastChannelParser.java
index bfdef7f2..6c83fad6 100644
--- a/src/github/daneren2005/dsub/service/parser/PodcastChannelParser.java
+++ b/src/github/daneren2005/dsub/service/parser/PodcastChannelParser.java
@@ -37,7 +37,6 @@ public class PodcastChannelParser extends AbstractParser {
 	}

 

 	public List<PodcastChannel> parse(Reader reader, ProgressListener progressListener) throws Exception {

-		updateProgress(progressListener, R.string.parser_reading);

 		init(reader);

 

 		List<PodcastChannel> channels = new ArrayList<PodcastChannel>();

diff --git a/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java b/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
index 58b1432b..c331f7e1 100644
--- a/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
+++ b/src/github/daneren2005/dsub/service/parser/PodcastEntryParser.java
@@ -39,7 +39,6 @@ public class PodcastEntryParser extends AbstractParser {
     }

 	

 	public MusicDirectory parse(String channel, Reader reader, ProgressListener progressListener) throws Exception {

-		updateProgress(progressListener, R.string.parser_reading);

 		init(reader);

 

 		MusicDirectory episodes = new MusicDirectory();

diff --git a/src/github/daneren2005/dsub/service/parser/RandomSongsParser.java b/src/github/daneren2005/dsub/service/parser/RandomSongsParser.java
index 3e62d3dc..88be3662 100644
--- a/src/github/daneren2005/dsub/service/parser/RandomSongsParser.java
+++ b/src/github/daneren2005/dsub/service/parser/RandomSongsParser.java
@@ -36,7 +36,6 @@ public class RandomSongsParser extends MusicDirectoryEntryParser {
     }
 
     public MusicDirectory parse(Reader reader, ProgressListener progressListener) throws Exception {
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         MusicDirectory dir = new MusicDirectory();
@@ -54,7 +53,6 @@ public class RandomSongsParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return dir;
     }
diff --git a/src/github/daneren2005/dsub/service/parser/SearchResult2Parser.java b/src/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
index abf96d7f..ce4a71c8 100644
--- a/src/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
+++ b/src/github/daneren2005/dsub/service/parser/SearchResult2Parser.java
@@ -40,7 +40,6 @@ public class SearchResult2Parser extends MusicDirectoryEntryParser {
     }
 
     public SearchResult parse(Reader reader, ProgressListener progressListener) throws Exception {
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         List<Artist> artists = new ArrayList<Artist>();
@@ -69,7 +68,6 @@ public class SearchResult2Parser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return new SearchResult(artists, albums, songs);
     }
diff --git a/src/github/daneren2005/dsub/service/parser/SearchResultParser.java b/src/github/daneren2005/dsub/service/parser/SearchResultParser.java
index c8ef4031..952b95bc 100644
--- a/src/github/daneren2005/dsub/service/parser/SearchResultParser.java
+++ b/src/github/daneren2005/dsub/service/parser/SearchResultParser.java
@@ -41,7 +41,6 @@ public class SearchResultParser extends MusicDirectoryEntryParser {
     }
 
     public SearchResult parse(Reader reader, ProgressListener progressListener) throws Exception {
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         List<MusicDirectory.Entry> songs = new ArrayList<MusicDirectory.Entry>();
@@ -59,7 +58,6 @@ public class SearchResultParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return new SearchResult(Collections.<Artist>emptyList(), Collections.<MusicDirectory.Entry>emptyList(), songs);
     }
diff --git a/src/github/daneren2005/dsub/service/parser/ShareParser.java b/src/github/daneren2005/dsub/service/parser/ShareParser.java
index 35d6584f..25feb5af 100644
--- a/src/github/daneren2005/dsub/service/parser/ShareParser.java
+++ b/src/github/daneren2005/dsub/service/parser/ShareParser.java
@@ -43,8 +43,6 @@ public class ShareParser extends MusicDirectoryEntryParser {
     }

 

     public List<Share> parse(Reader reader, ProgressListener progressListener) throws Exception {

-

-        updateProgress(progressListener, R.string.parser_reading);

         init(reader);

 

         List<Share> dir = new ArrayList<Share>();

@@ -87,7 +85,6 @@ public class ShareParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);

 

         validate();

-        updateProgress(progressListener, R.string.parser_reading_done);

 

         return dir;

     }

diff --git a/src/github/daneren2005/dsub/service/parser/StarredListParser.java b/src/github/daneren2005/dsub/service/parser/StarredListParser.java
index bd2a7888..89addecd 100644
--- a/src/github/daneren2005/dsub/service/parser/StarredListParser.java
+++ b/src/github/daneren2005/dsub/service/parser/StarredListParser.java
@@ -36,8 +36,6 @@ public class StarredListParser extends MusicDirectoryEntryParser {
     }
 
     public MusicDirectory parse(Reader reader, ProgressListener progressListener) throws Exception {
-
-        updateProgress(progressListener, R.string.parser_reading);
         init(reader);
 
         MusicDirectory dir = new MusicDirectory();
@@ -63,7 +61,6 @@ public class StarredListParser extends MusicDirectoryEntryParser {
         } while (eventType != XmlPullParser.END_DOCUMENT);
 
         validate();
-        updateProgress(progressListener, R.string.parser_reading_done);
 
         return dir;
     }