From b61d8a3f786bd8e1d919899c69247d95bcf52da9 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Fri, 21 Aug 2015 21:45:52 +0200
Subject: [PATCH] Synced translations, clean up and increased build version.

---
 app/build.gradle                              |  4 +-
 app/src/main/assets/changelog.html            |  2 +-
 .../gramophone/service/MusicService.java      | 47 ++++++++++---------
 app/src/main/res/values-pt-rBR/strings.xml    | 22 ++++-----
 4 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8ae9f37a..edb6ccdb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 66
-        versionName "0.9.43 beta7"
+        versionCode 67
+        versionName "0.9.44 beta1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index deb56f17..77f098b2 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -25,7 +25,7 @@
 
 <p>You can view the changelog dialog again at any time from the <i>about</i> section.</p>
 
-<h3>Version 0.9.43 beta7</h3>
+<h3>Version 0.9.43</h3>
 
 <ol>
     <li><b>FIX:</b> "Play next" not always working.</a>.
diff --git a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
index 0abe8cd5..712a290b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/service/MusicService.java
@@ -55,8 +55,6 @@ import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import hugo.weaving.DebugLog;
-
 /**
  * @author Karim Abou Zeid (kabouzeid), Andrew Neal
  */
@@ -398,7 +396,6 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
         }
     }
 
-    @DebugLog
     private boolean prepareNext() {
         synchronized (this) {
             try {
@@ -828,27 +825,31 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
     }
 
     private void handleChange(@NonNull final String what) {
-        if (what.equals(PLAY_STATE_CHANGED)) {
-            final boolean isPlaying = isPlaying();
-            playingNotificationHelper.updatePlayState(isPlaying);
-            WidgetMedium.updateWidgetsPlayState(this, isPlaying);
-            //noinspection deprecation
-            remoteControlClient.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
-            if (!isPlaying && getSongProgressMillis() > 0) {
+        switch (what) {
+            case PLAY_STATE_CHANGED:
+                final boolean isPlaying = isPlaying();
+                playingNotificationHelper.updatePlayState(isPlaying);
+                WidgetMedium.updateWidgetsPlayState(this, isPlaying);
+                //noinspection deprecation
+                remoteControlClient.setPlaybackState(isPlaying ? RemoteControlClient.PLAYSTATE_PLAYING : RemoteControlClient.PLAYSTATE_PAUSED);
+                if (!isPlaying && getSongProgressMillis() > 0) {
+                    savePositionInTrack();
+                }
+                break;
+            case META_CHANGED:
+                updateNotification();
+                updateWidgets();
+                updateRemoteControlClient();
+                savePosition();
                 savePositionInTrack();
-            }
-        } else if (what.equals(META_CHANGED)) {
-            updateNotification();
-            updateWidgets();
-            updateRemoteControlClient();
-            savePosition();
-            savePositionInTrack();
-            final Song currentSong = getCurrentSong();
-            recentlyPlayedStore.addSongId(currentSong.id);
-            songPlayCountStore.bumpSongCount(currentSong.id);
-        } else if (what.equals(QUEUE_CHANGED)) {
-            saveState();
-            prepareNext();
+                final Song currentSong = getCurrentSong();
+                recentlyPlayedStore.addSongId(currentSong.id);
+                songPlayCountStore.bumpSongCount(currentSong.id);
+                break;
+            case QUEUE_CHANGED:
+                saveState();
+                prepareNext();
+                break;
         }
     }
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 2665a5fc..b1d16a45 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -4,7 +4,7 @@
     <string name="currently_listening_to_x_by_x">Atualmente ouvindo %1$s por %2$s.</string>
     <string name="the_audio_file">O arquivo de áudio</string>
     <string name="do_you_want_to_set_x_as_ringtone">Deseja definir %1$s como seu toque?</string>
-    <string name="x_has_been_set_as_ringtone">A faixa %1$s foi definida como seu toque.</string>
+    <string name="x_has_been_set_as_ringtone">Definir %1$s como seu toque.</string>
     <string name="action_set_as_ringtone">Definir como toque</string>
     <string name="action_share">Compartilhar</string>
     <string name="action_settings">"Configurações"</string>
@@ -26,10 +26,10 @@
     <string name="artists">Artistas</string>
     <string name="songs">Músicas</string>
     <string name="playlists">Playlists</string>
-    <string name="unplayable_file">Desculpe - ocorreu um erro ao tentar reproduzir esta faixa</string>
-    <string name="biography_unavailable">Desculpe, n\u00e3o conseguimos encontrar a biografia deste artista.</string>
+    <string name="unplayable_file">N\u00e3o foi poss\u00edvel tocar essa m\u00fasica.</string>
+    <string name="biography_unavailable">N\u00e3o foi poss\u00edvel encontrar a biografia dos artistas.</string>
     <string name="biography">Biografia</string>
-    <string name="audio_focus_denied">Não conseguimos obter o foco do áudio.</string>
+    <string name="audio_focus_denied">Foco do áudio negado.</string>
     <string name="album">Álbum</string>
     <string name="artist">Artista</string>
     <string name="genre">Gênero</string>
@@ -37,7 +37,7 @@
     <string name="year">Ano</string>
     <string name="track">Faixa</string>
     <string name="track_hint">"Faixa (2 para faixa 2 ou 3004 para CD3 faixa 4)"</string>
-    <string name="album_or_artist_empty">O campo de título ou artista do álbum está vazio.</string>
+    <string name="album_or_artist_empty">O título ou artista está vazio.</string>
     <string name="writing_file_number">Gravando no arquivo</string>
     <string name="saving_changes">Salvando alterações...</string>
     <string name="label_details">Detalhes</string>
@@ -69,14 +69,14 @@
     <string name="deleted_x_songs">%1$d músicas excluidas</string>
     <string name="could_not_create_playlist">N\u00e3o foi poss\u00edvel criar a playlist</string>
     <string name="delete_playlist_x"><![CDATA[ Deseja excluir a playlist <b>%1$s</b>? ]]></string>
-    <string name="clear_playlist_x"><![CDATA[Voc\u00ea realmente quer limpar a playlist <b>%1$s</b>? Isto n\u00e3o pode ser desfeito!]]></string>
-    <string name="delete_x_playlists"><![CDATA[ Deseja excluir <b>%1$d</b> playlists? ]]></string>
+    <string name="clear_playlist_x"><![CDATA[Limpar a playlist <b>%1$s</b>? Isto n\u00e3o pode ser desfeito!]]></string>
+    <string name="delete_x_playlists"><![CDATA[Excluir <b>%1$d</b> playlists?]]></string>
     <string name="delete_song_x"><![CDATA[ Deseja excluir a faixa <b>%1$s</b>? ]]></string>
     <string name="delete_x_songs"><![CDATA[ Deseja excluir <b>%1$d</b> faixas? ]]></string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Você deseja remover a musica <b>%1$s</b> da playlist?]]></string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Você deseja remover <b>%1$d</b> musicas da playlist?]]></string>
-    <string name="delete_song_title">Deletar Musica</string>
-    <string name="delete_songs_title">Excluir Musicas</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Remover a música <b>%1$s</b> da playlist?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Remover <b>%1$d</b> músicas da playlist?]]></string>
+    <string name="delete_song_title">Excluir música</string>
+    <string name="delete_songs_title">Excluir músicas</string>
     <string name="remove_song_from_playlist_title">Remover Musica da Playlist</string>
     <string name="remove_songs_from_playlist_title">Remover Musicas da Playlist</string>
     <string name="rename_playlist_title">Renomear Playlist</string>