From 5ef3ced1118e1386c746687e7b3912fca6188373 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Sun, 5 Sep 2021 09:34:38 +0200
Subject: [PATCH 1/3] Fixed media session null checks

---
 .../org/moire/ultrasonic/service/State.java    |  2 +-
 .../ultrasonic/util/MediaSessionHandler.kt     | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/State.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/State.java
index 60c282c9..ae8014e4 100644
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/State.java
+++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/State.java
@@ -13,7 +13,7 @@ public class State implements Serializable
 {
     public static final long serialVersionUID = -6346438781062572270L;
 
-    public List<MusicDirectory.Entry> songs = new ArrayList<MusicDirectory.Entry>();
+    public List<MusicDirectory.Entry> songs = new ArrayList<>();
     public int currentPlayingIndex;
     public int currentPlayingPosition;
 }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaSessionHandler.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaSessionHandler.kt
index c1191b71..ba9bc751 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaSessionHandler.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/MediaSessionHandler.kt
@@ -71,12 +71,12 @@ class MediaSessionHandler : KoinComponent {
         Timber.d("MediaSessionHandler.initialize Creating Media Session")
 
         mediaSession = MediaSessionCompat(applicationContext, "UltrasonicService")
-        val mediaSessionToken = mediaSession!!.sessionToken
-        mediaSessionEventDistributor.raiseMediaSessionTokenCreatedEvent(mediaSessionToken!!)
+        val mediaSessionToken = mediaSession?.sessionToken ?: return
+        mediaSessionEventDistributor.raiseMediaSessionTokenCreatedEvent(mediaSessionToken)
 
         updateMediaButtonReceiver()
 
-        mediaSession!!.setCallback(object : MediaSessionCompat.Callback() {
+        mediaSession?.setCallback(object : MediaSessionCompat.Callback() {
             override fun onPlay() {
                 super.onPlay()
 
@@ -159,7 +159,7 @@ class MediaSessionHandler : KoinComponent {
         )
 
         // It seems to be the best practice to set this to true for the lifetime of the session
-        mediaSession!!.isActive = true
+        mediaSession?.isActive = true
         if (cachedPlaylist != null) updateMediaSessionQueue(cachedPlaylist!!)
         Timber.i("MediaSessionHandler.initialize Media Session created")
     }
@@ -193,7 +193,7 @@ class MediaSessionHandler : KoinComponent {
         }
 
         // Save the metadata
-        mediaSession!!.setMetadata(metadata.build())
+        mediaSession?.setMetadata(metadata.build())
 
         playbackActions = PlaybackStateCompat.ACTION_PLAY_PAUSE or
             PlaybackStateCompat.ACTION_SKIP_TO_NEXT or
@@ -249,7 +249,7 @@ class MediaSessionHandler : KoinComponent {
             playbackStateBuilder.setActiveQueueItemId(currentPlayingIndex)
 
         // Save the playback state
-        mediaSession!!.setPlaybackState(playbackStateBuilder.build())
+        mediaSession?.setPlaybackState(playbackStateBuilder.build())
     }
 
     fun updateMediaSessionQueue(playlist: Iterable<MusicDirectory.Entry>) {
@@ -257,8 +257,8 @@ class MediaSessionHandler : KoinComponent {
         cachedPlaylist = playlist
         if (mediaSession == null) return
 
-        mediaSession!!.setQueueTitle(applicationContext.getString(R.string.button_bar_now_playing))
-        mediaSession!!.setQueue(
+        mediaSession?.setQueueTitle(applicationContext.getString(R.string.button_bar_now_playing))
+        mediaSession?.setQueue(
             playlist.mapIndexed { id, song ->
                 MediaSessionCompat.QueueItem(
                     Util.getMediaDescriptionForEntry(song),
@@ -288,7 +288,7 @@ class MediaSessionHandler : KoinComponent {
         if (cachedPlayingIndex != null)
             playbackStateBuilder.setActiveQueueItemId(cachedPlayingIndex!!)
 
-        mediaSession!!.setPlaybackState(playbackStateBuilder.build())
+        mediaSession?.setPlaybackState(playbackStateBuilder.build())
     }
 
     fun updateMediaButtonReceiver() {

From 8928980bae2e222f794e68bafff00bff50011842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= <ogarcia@connectical.com>
Date: Mon, 13 Sep 2021 11:04:29 +0200
Subject: [PATCH 2/3] Update translations

---
 ultrasonic/src/main/res/values-cs/strings.xml | 17 +++++--
 ultrasonic/src/main/res/values-de/strings.xml | 35 ++-----------
 ultrasonic/src/main/res/values-hu/strings.xml |  6 +--
 ultrasonic/src/main/res/values-it/strings.xml | 10 ++--
 ultrasonic/src/main/res/values-nl/strings.xml | 23 +++++----
 ultrasonic/src/main/res/values-pl/strings.xml | 50 +++++++++----------
 .../src/main/res/values-pt-rBR/strings.xml    | 28 +++++------
 ultrasonic/src/main/res/values-pt/strings.xml | 24 ++++-----
 .../src/main/res/values-zh-rCN/strings.xml    |  4 +-
 9 files changed, 88 insertions(+), 109 deletions(-)

diff --git a/ultrasonic/src/main/res/values-cs/strings.xml b/ultrasonic/src/main/res/values-cs/strings.xml
index 17c802f2..db88af91 100644
--- a/ultrasonic/src/main/res/values-cs/strings.xml
+++ b/ultrasonic/src/main/res/values-cs/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Načítám&#8230;</string>
     <string name="background_task.network_error">Chyba sítě. Ověřte adresu serveru nebo zkuste později.</string>
@@ -17,7 +17,7 @@
     <string name="button_bar.now_playing">Právě hraje</string>
     <string name="podcasts.label">Podcasty</string>
     <string name="podcasts_channels.empty">Není registrován žádný podcast kanál</string>
-    <string name="button_bar.podcasts">Podcast</string>
+    <string name="button_bar.podcasts">Podcasty</string>
     <string name="button_bar.playlists">Playlisty</string>
     <string name="button_bar.search">Hledat</string>
     <string name="chat.send_a_message">Poslat zprávu</string>
@@ -305,7 +305,9 @@
     <string name="settings.use_folder_for_album_artist_summary">Očekává jména hlavních adresářů obsahující jména umělců</string>
     <string name="settings.use_id3">Procházet za použití ID3 tagů</string>
     <string name="settings.use_id3_summary">Používat metodu ID3 tagů místo jmen na základě adresářové struktury</string>
-    <string name="main.video">Video</string>
+    <string name="settings.show_artist_picture">Obrázek umělce v seznamu umělců</string>
+    <string name="settings.show_artist_picture_summary">Zobrazí obrázek umělce v náhledu umělců pokud je dostupný</string>
+    <string name="main.video" tools:ignore="UnusedResources">Video</string>
     <string name="settings.view_refresh">Obnovení náhledu</string>
     <string name="settings.view_refresh_500">.5 sekundy</string>
     <string name="settings.view_refresh_1000">1 sekunda</string>
@@ -325,7 +327,7 @@
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.no_time">-:--</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Ťuknutím vybrat hudbu</string>
     <string name="widget.sdcard_busy">SD karta nedostupná</string>
@@ -422,36 +424,43 @@
     <plurals name="select_album_n_songs">
         <item quantity="one">%d skladba</item>
         <item quantity="few">%d skladby</item>
+        <item quantity="many">%d skladeb</item>
         <item quantity="other">%d skladeb</item>
     </plurals>
     <plurals name="select_album_n_songs_pinned">
         <item quantity="one">%d skladba vybrána pro připnutí.</item>
         <item quantity="few">%d skladby vybrány pro připnutí.</item>
+        <item quantity="many">%d skladeb vybráno pro připnutí.</item>
         <item quantity="other">%d skladeb vybráno pro připnutí.</item>
     </plurals>
     <plurals name="select_album_n_songs_downloaded">
         <item quantity="one">%d skladba vybrána pro stažení.</item>
         <item quantity="few">%d skladby vybrány pro stažení.</item>
+        <item quantity="many">%d skladeb vybráno pro stažení.</item>
         <item quantity="other">%d skladeb vybráno pro stažení.</item>
     </plurals>
     <plurals name="select_album_n_songs_unpinned">
         <item quantity="one">%d skladba vybrána pro odepnutí.</item>
         <item quantity="few">%d skladby vybrány pro odepnutí.</item>
+        <item quantity="many">%d skladeb vybráno pro odepnutí.</item>
         <item quantity="other">%d skladeb vybráno pro odepnutí.</item>
     </plurals>
     <plurals name="select_album_n_songs_added">
         <item quantity="one">%d skladba přidána na konec fronty přehrávání.</item>
         <item quantity="few">%d skladyb přidány na konec fronty přehrávání.</item>
+        <item quantity="many">%d skladeb přidáno na konec fronty přehrávání.</item>
         <item quantity="other">%d skladeb přidáno na konec fronty přehrávání.</item>
     </plurals>
     <plurals name="select_album_n_songs_play_next">
         <item quantity="one">%d skladba přidána za aktuální skladbu.</item>
         <item quantity="few">%d skladby přidány za aktuální skladbu.</item>
+        <item quantity="many">%d skladeb přidáno za aktuální skladbu.</item>
         <item quantity="other">%d skladeb přidáno za aktuální skladbu.</item>
     </plurals>
     <plurals name="select_album_donate_dialog_n_trial_days_left">
         <item quantity="one">Zbývá %d den zkušební doby</item>
         <item quantity="few">Zbývají %d dny zkušební doby</item>
+        <item quantity="many">Zbývá %d dní zkušební doby</item>
         <item quantity="other">Zbývá %d dní zkušební doby</item>
     </plurals>
 
diff --git a/ultrasonic/src/main/res/values-de/strings.xml b/ultrasonic/src/main/res/values-de/strings.xml
index c581c89e..7c12705c 100644
--- a/ultrasonic/src/main/res/values-de/strings.xml
+++ b/ultrasonic/src/main/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Lade&#8230;</string>
     <string name="background_task.network_error">Ein Netzwerkfehler ist aufgetreten. Bitte die Serveradresse prüfen oder später noch einmal versuchen.</string>
@@ -302,7 +302,7 @@
     <string name="settings.use_folder_for_album_artist_summary">Annehmen, dass der Ordner der obersten Ebene der Name des Albumkünstlers ist</string>
     <string name="settings.use_id3">Durchsuchen von ID3-Tags</string>
     <string name="settings.use_id3_summary">Nutze ID3 Tag Methode anstatt Dateisystem-Methode</string>
-    <string name="main.video">Film</string>
+    <string name="main.video" tools:ignore="UnusedResources">Film</string>
     <string name="settings.view_refresh">Aktualisierungsinterval</string>
     <string name="settings.view_refresh_500">.5 Sekunden</string>
     <string name="settings.view_refresh_1000">1 Sekunde</string>
@@ -322,7 +322,7 @@
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.no_time">-:--</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Berühren, um Musik auszuwählen</string>
     <string name="widget.sdcard_busy">SD Karte nicht verfügbar</string>
@@ -366,35 +366,6 @@
     <string name="download.menu_show_artist">Künstler zeigen</string>
     <string name="common_multiple_years">Mehrere Jahre</string>
     <string name="server_editor.new_label">Server hinzufügen</string>
-    <plurals name="select_album_n_songs">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-    <plurals name="select_album_n_songs_pinned">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-    <plurals name="select_album_n_songs_downloaded">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-    <plurals name="select_album_n_songs_unpinned">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-    <plurals name="select_album_n_songs_added">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-    <plurals name="select_album_n_songs_play_next">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-    <plurals name="select_album_donate_dialog_n_trial_days_left">
-        <item quantity="one">%d Titel</item>
-        <item quantity="other">%d Titel</item>
-    </plurals>
-
     <!-- Subsonic api errors -->
     <string name="api.subsonic.generic">Allgemeiner API Fehler: %1$s</string>
     <string name="api.subsonic.generic.no.message">Keine Nachricht vom Server erhalten</string>
diff --git a/ultrasonic/src/main/res/values-hu/strings.xml b/ultrasonic/src/main/res/values-hu/strings.xml
index ef99d78e..c5290aa8 100644
--- a/ultrasonic/src/main/res/values-hu/strings.xml
+++ b/ultrasonic/src/main/res/values-hu/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Betöltés&#8230;</string>
     <string name="background_task.network_error">Hálózati hiba történt! Kérjük, ellenőrizze a kiszolgáló címét vagy próbálja később!</string>
@@ -319,7 +319,7 @@
     <string name="settings.use_id3_summary">ID3 Tag módszer használata a fájlredszer alapú mód helyett.</string>
     <string name="settings.show_artist_picture">Előadó képének megjelenítése</string>
     <string name="settings.show_artist_picture_summary">Az előadó listában megjeleníti a képeket, amennyiben elérhetőek</string>
-    <string name="main.video">Videó</string>
+    <string name="main.video" tools:ignore="UnusedResources">Videó</string>
     <string name="settings.view_refresh">Nézet frissítési gyakorisága</string>
     <string name="settings.view_refresh_500">.5 másodperc</string>
     <string name="settings.view_refresh_1000">1 másodperc</string>
@@ -339,7 +339,7 @@
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.no_time">-:--</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Érintse meg a zene kiválasztásához</string>
     <string name="widget.sdcard_busy">Az SD kártya nem elérhető!</string>
diff --git a/ultrasonic/src/main/res/values-it/strings.xml b/ultrasonic/src/main/res/values-it/strings.xml
index 2a92a780..82127d7e 100644
--- a/ultrasonic/src/main/res/values-it/strings.xml
+++ b/ultrasonic/src/main/res/values-it/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Caricamento&#8230;</string>
     <string name="background_task.network_error">Si è verificato un errore di rete. Si prega di controllare l\'indirizzo del server o riprovare più tardi.</string>
@@ -294,7 +294,7 @@
     <string name="settings.use_folder_for_album_artist_summary">Presumi che la cartella superiore sia il nome dell\'artista dell\'album</string>
     <string name="settings.use_id3">Sfoglia Utilizzando Tag ID3</string>
     <string name="settings.use_id3_summary">Usa metodi tag ID3 invece dei metodi basati sul filesystem</string>
-    <string name="main.video">Video</string>
+    <string name="main.video" tools:ignore="UnusedResources">Video</string>
     <string name="settings.view_refresh_500">.5 secondo</string>
     <string name="settings.view_refresh_1000">1 secondo</string>
     <string name="settings.view_refresh_1500">1.5 secondi</string>
@@ -311,7 +311,7 @@
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.no_time">-:--</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Tocca per selezionare musica</string>
     <string name="widget.sdcard_busy">Scheda SD non disponibile</string>
@@ -328,9 +328,5 @@
     <string name="share_comment">Commenta</string>
     <string name="download_song_removed">\"%s\" è stato rimosso dalla playlist</string>
     <string name="share_via">Condividi canzoni via</string>
-    <plurals name="select_album_n_songs">
-        <item quantity="one">1 canzone</item>
-        <item quantity="other">%d canzoni</item>
-    </plurals>
     <string name="api.subsonic.trial_period_is_over">Il periodo di prova è terminato.</string>
     </resources>
diff --git a/ultrasonic/src/main/res/values-nl/strings.xml b/ultrasonic/src/main/res/values-nl/strings.xml
index a6a29a19..0b30dd41 100644
--- a/ultrasonic/src/main/res/values-nl/strings.xml
+++ b/ultrasonic/src/main/res/values-nl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Bezig met laden&#8230;</string>
     <string name="background_task.network_error">Er is een netwerkfout opgetreden. Controleer het serveradres of probeer het later opnieuw.</string>
@@ -111,7 +111,9 @@
     <string name="main.songs_starred">Favorieten</string>
     <string name="main.songs_title">Nummers</string>
     <string name="main.videos">Video\'s</string>
+    <string name="main.welcome_text_demo">Om in Ultrasonic naar je eigen muziek te luisteren, heb je je <b>eigen server</b> nodig. \n\n➤ Maar als je de app eerst wilt uitproberen, dan kun je voorlopig de demoserver gebruiken. \n\n➤ In de <b>instellingen</b> kun je je eigen server instellen.</string>
     <string name="main.welcome_title">Welkom!</string>
+    <string name="main.welcome_cancel">Open de instellingen</string>
     <string name="menu.about">Over</string>
     <string name="menu.common">Algemeen</string>
     <string name="menu.deleted_playlist">Afspeellijst %s verwijderd</string>
@@ -319,7 +321,7 @@
     <string name="settings.use_id3_summary">ID3-labels gebruiken in plaats van systeemlabels</string>
     <string name="settings.show_artist_picture">Artiestfoto tonen op artiestenlijst</string>
     <string name="settings.show_artist_picture_summary">Toont de artiestfoto op de artiestenlijst (indien beschikbaar)</string>
-    <string name="main.video">Video</string>
+    <string name="main.video" tools:ignore="UnusedResources">Video</string>
     <string name="settings.view_refresh">Verversen</string>
     <string name="settings.view_refresh_500">0,5 seconden</string>
     <string name="settings.view_refresh_1000">1 seconde</string>
@@ -339,7 +341,7 @@
     <string name="util.bytes_format.gigabyte">0,00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0,00 MB</string>
-    <string name="util.no_time">-:--</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Druk om muziek te selecteren</string>
     <string name="widget.sdcard_busy">SD-kaart niet beschikbaar</string>
@@ -434,6 +436,7 @@
     <string name="server_editor.authentication">Authenticatie</string>
     <string name="server_editor.advanced">Geavanceerde instellingen</string>
     <string name="server_editor.disabled_feature">Eén of meerdere functies zijn uitgeschakeld omdat de server ze niet ondersteunt.\nVoer deze test later opnieuw uit.</string>
+    <string name="server_menu.demo">Demoserver</string>
 
     <plurals name="select_album_n_songs">
         <item quantity="one">%d nummer</item>
@@ -449,19 +452,19 @@
     </plurals>
     <plurals name="select_album_n_songs_unpinned">
         <item quantity="one">%d los te maken nummer geselecteerd.</item>
-        <item quantity="other">%dlos te maken nummers geselecteerd. </item>
+        <item quantity="other">%d los te maken nummers geselecteerd.</item>
     </plurals>
     <plurals name="select_album_n_songs_added">
-        <item quantity="one">%d nummer toegevoegd aan einde van afspeelwachtrij.</item>
-        <item quantity="other">%d nummers toegevoegd aan einde van afspeelwachtrij.</item>
+        <item quantity="one">%d nummer toegevoegd aan het einde van afspeelwachtrij.</item>
+        <item quantity="other">%d nummers toegevoegd aan het einde van afspeelwachtrij.</item>
     </plurals>
     <plurals name="select_album_n_songs_play_next">
-        <item quantity="one">%d nummer ingevoegd na huidige nummer.</item>
-        <item quantity="other">%d nummers ingevoegd na huidige nummer.</item>
+        <item quantity="one">%d nummer ingevoegd na het huidige nummer.</item>
+        <item quantity="other">%d nummers ingevoegd na het huidige nummer.</item>
     </plurals>
     <plurals name="select_album_donate_dialog_n_trial_days_left">
-        <item quantity="one">Nog %d dag over van proefperiode</item>
-        <item quantity="other">Nog %d dagen over van proefperiode</item>
+        <item quantity="one">Nog %d dag over van de proefperiode</item>
+        <item quantity="other">Nog %d dagen over van de proefperiode</item>
     </plurals>
 
     <!-- Subsonic api errors -->
diff --git a/ultrasonic/src/main/res/values-pl/strings.xml b/ultrasonic/src/main/res/values-pl/strings.xml
index a01adb07..76a5ded8 100644
--- a/ultrasonic/src/main/res/values-pl/strings.xml
+++ b/ultrasonic/src/main/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Ładowanie&#8230;</string>
     <string name="background_task.network_error">Wystąpił błąd sieci. Proszę sprawdzić adres serwera i spróbować później.</string>
@@ -302,7 +302,7 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników
     <string name="settings.use_folder_for_album_artist_summary">Zakłada, że folder najwyższego poziomu jest nazwą artysty albumu</string>
     <string name="settings.use_id3">Przeglądaj używając tagów ID3</string>
     <string name="settings.use_id3_summary">Używa metod z tagów ID3 zamiast metod opartych na systemie plików</string>
-    <string name="main.video">Wideo</string>
+    <string name="main.video" tools:ignore="UnusedResources">Wideo</string>
     <string name="settings.view_refresh">Odświeżanie widoku</string>
     <string name="settings.view_refresh_500">co pół sekundy</string>
     <string name="settings.view_refresh_1000">co 1 sekundę</string>
@@ -322,7 +322,7 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.no_time">-:--</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">-:--</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Dotknij, aby wybrać muzykę</string>
     <string name="widget.sdcard_busy">Karta SD jest niedostępna</string>
@@ -374,40 +374,40 @@ ponieważ api Subsonic nie wspiera nowego sposobu autoryzacji dla użytkowników
         <item quantity="other">%d utworów</item>
     </plurals>
     <plurals name="select_album_n_songs_pinned">
-        <item quantity="one">%d utwór zaznaczony do przypięcia</item>
-        <item quantity="few">%d utwory zaznaczone do przypięcia</item>
-        <item quantity="many">%d utworów zaznaczonych do przypięcia</item>
-        <item quantity="other">%d utworów zaznaczonych do przypięcia</item>
+        <item quantity="one">%d utwór zaznaczony do przypięcia.</item>
+        <item quantity="few">%d utwory zaznaczone do przypięcia.</item>
+        <item quantity="many">%d utworów zaznaczonych do przypięcia.</item>
+        <item quantity="other">%d utworów zaznaczonych do przypięcia.</item>
     </plurals>
     <plurals name="select_album_n_songs_downloaded">
-        <item quantity="one">%d utwór zaznaczony do pobrania</item>
-        <item quantity="few">%d utwory zaznaczone do pobrania</item>
-        <item quantity="many">%d utworów zaznaczonych do pobrania</item>
-        <item quantity="other">%d utworów zaznaczonych do pobrania</item>
+        <item quantity="one">%d utwór zaznaczony do pobrania.</item>
+        <item quantity="few">%d utwory zaznaczone do pobrania.</item>
+        <item quantity="many">%d utworów zaznaczonych do pobrania.</item>
+        <item quantity="other">%d utworów zaznaczonych do pobrania.</item>
     </plurals>
     <plurals name="select_album_n_songs_unpinned">
-        <item quantity="one">%d utwór zaznaczony do odpięcia</item>
-        <item quantity="few">%d utwory zaznaczone do odpięcia</item>
-        <item quantity="many">%d utworów zaznaczonych do odpięcia </item>
-        <item quantity="other">%d utworów zaznaczonych do odpięcia</item>
+        <item quantity="one">%d utwór zaznaczony do odpięcia.</item>
+        <item quantity="few">%d utwory zaznaczone do odpięcia.</item>
+        <item quantity="many">%d utworów zaznaczonych do odpięcia.</item>
+        <item quantity="other">%d utworów zaznaczonych do odpięcia.</item>
     </plurals>
     <plurals name="select_album_n_songs_added">
-        <item quantity="one">%d utwór dodany na koniec kolejki odtwarzania</item>
-        <item quantity="few">%d utwory dodane na koniec kolejki odtwarzania</item>
-        <item quantity="many">%dutworów dodanych na koniec kolejki odtwarzania </item>
-        <item quantity="other">%d utworów dodanych na koniec kolejki odtwarzania </item>
+        <item quantity="one">%d utwór dodany na koniec kolejki odtwarzania.</item>
+        <item quantity="few">%d utwory dodane na koniec kolejki odtwarzania.</item>
+        <item quantity="many">%d utworów dodanych na koniec kolejki odtwarzania.</item>
+        <item quantity="other">%d utworów dodanych na koniec kolejki odtwarzania.</item>
     </plurals>
     <plurals name="select_album_n_songs_play_next">
-        <item quantity="one">%d utwór wstawiony po bieżącym utworze</item>
-        <item quantity="few">%d utwory wstawione po bieżącym utworze</item>
-        <item quantity="many">%d utworów wstawionych po bieżącym utworze </item>
-        <item quantity="other">%d utworów wstawionych po bieżącym utworze  </item>
+        <item quantity="one">%d utwór wstawiony po bieżącym utworze.</item>
+        <item quantity="few">%d utwory wstawione po bieżącym utworze.</item>
+        <item quantity="many">%d utworów wstawionych po bieżącym utworze.</item>
+        <item quantity="other">%d utworów wstawionych po bieżącym utworze.</item>
     </plurals>
     <plurals name="select_album_donate_dialog_n_trial_days_left">
         <item quantity="one">%d dzień pozostał do zakończenia okresu próbnego</item>
         <item quantity="few">%d dni pozostały do zakończenia okresu próbnego</item>
-        <item quantity="many">%d dni pozostało do zakończenia okresu próbnego </item>
-        <item quantity="other">%d dni pozostało do zakończenia okresu próbnego </item>
+        <item quantity="many">%d dni pozostało do zakończenia okresu próbnego</item>
+        <item quantity="other">%d dni pozostało do zakończenia okresu próbnego</item>
     </plurals>
 
     <!-- Subsonic api errors -->
diff --git a/ultrasonic/src/main/res/values-pt-rBR/strings.xml b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
index fda1630f..7d2c7e6d 100644
--- a/ultrasonic/src/main/res/values-pt-rBR/strings.xml
+++ b/ultrasonic/src/main/res/values-pt-rBR/strings.xml
@@ -207,14 +207,14 @@
     <string name="settings.directory_cache_time_5">5 minutos</string>
     <string name="settings.directory_cache_time_60">1 hora</string>
     <string name="settings.disc_sort">Classificar Músicas por Álbum</string>
-    <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas.</string>
+    <string name="settings.disc_sort_summary">Classificar músicas pelo número do álbum e faixas</string>
     <string name="settings.display_bitrate">Mostrar Taxa de Bits e Sufixo de Arquivo</string>
     <string name="settings.display_bitrate_summary">Adicionar o nome do artista com a taxa de bits e sufixo do arquivo</string>
     <string name="settings.download_transition">Mostrar Downloads na Reprodução</string>
     <string name="settings.download_transition_summary">Transição para atividade de download quando iniciar reprodução</string>
     <string name="settings.gapless_playback">Reprodução sem Interrupção</string>
     <string name="settings.gapless_playback_summary">Ativar reprodução sem interrupção</string>
-    <string name="settings.hide_media_summary">Esconder músicas de outros aplicativos.</string>
+    <string name="settings.hide_media_summary">Esconder arquivos de músicas de outros aplicativos</string>
     <string name="settings.hide_media_title">Esconder de Outros</string>
     <string name="settings.hide_media_toast">Será efetivado na próxima vez que o Android procurar por músicas em seu celular.</string>
     <string name="settings.increment_time">Intervalo de Salto</string>
@@ -259,11 +259,11 @@
     <string name="settings.preload_5">5 músicas</string>
     <string name="settings.preload_unlimited">Ilimitado</string>
     <string name="settings.playback.resume_play_on_headphones_plug.title">Retomar ao Inserir Fone de Ouvido</string>
-    <string name="settings.playback.resume_play_on_headphones_plug.summary">O aplicativo retomará a reprodução em pausa na inserção dos fones de ouvido no dispositivo.</string>
-    <string name="settings.screen_lit_summary">Manter a tela ligada enquanto baixando aumenta a velocidade de download.</string>
+    <string name="settings.playback.resume_play_on_headphones_plug.summary">O aplicativo retomará a reprodução em pausa na inserção dos fones de ouvido no dispositivo</string>
+    <string name="settings.screen_lit_summary">Manter a tela ligada enquanto baixando aumenta a velocidade de download</string>
     <string name="settings.screen_lit_title">Manter a Tela Ligada</string>
     <string name="settings.scrobble_summary">Lembre-se de configurar usuário e senha nos serviços Scrobble do servidor</string>
-    <string name="settings.scrobble_title">Registre Minhas Músicas</string>
+    <string name="settings.scrobble_title">Registrar Minhas Músicas</string>
     <string name="settings.search_1">1</string>
     <string name="settings.search_10">10</string>
     <string name="settings.search_100">100</string>
@@ -451,20 +451,20 @@
         <item quantity="other">%d músicas selecionadas para serem baixadas.</item>
     </plurals>
     <plurals name="select_album_n_songs_unpinned">
-        <item quantity="one">%d música selecionada para ser desafixada.</item>
+        <item quantity="one">%d música selecionada para ser desfixada.</item>
         <item quantity="other">%d músicas selecionadas para serem desfixadas.</item>
     </plurals>
     <plurals name="select_album_n_songs_added">
-        <item quantity="one">%d música adicionada ao fim da fila.</item>
-        <item quantity="other">%d músicas adicionadas ao fim da fila.</item>
+        <item quantity="one">%d música adicionada ao final da playlist.</item>
+        <item quantity="other">%d músicas adicionadas ao final da playlist.</item>
     </plurals>
     <plurals name="select_album_n_songs_play_next">
-        <item quantity="one">%d música inserida após a atual.</item>
-        <item quantity="other">%d músicas inseridas após a atual.</item>
+        <item quantity="one">%d música adicionada após a atual.</item>
+        <item quantity="other">%d músicas adicionadas após a atual.</item>
     </plurals>
     <plurals name="select_album_donate_dialog_n_trial_days_left">
-        <item quantity="one">Resta %d dia para o fim do período de teste</item>
-        <item quantity="other">Restam %d dias para o fim do período de teste</item>
+        <item quantity="one">%d dia restante do período de teste</item>
+        <item quantity="other">%d dias restantes do período de teste</item>
     </plurals>
 
     <!-- Subsonic api errors -->
@@ -482,8 +482,8 @@
     <!-- Subsonic feature flags -->
     <string name="feature_flags_category_title">Sinalização de Recursos</string>
     <string name="feature_flags_five_star_rating_title">Usar Classif. 5 Estrelas para Músicas</string>
-    <string name="feature_flags_five_star_rating_description">Use o sistema de classificação de 5 estrelas para músicas
-         em vez de simplesmente estrelar/não estrelar itens.
+    <string name="feature_flags_five_star_rating_description">Usar o sistema de classificação de 5 estrelas para músicas
+         em vez de simplesmente estrelar/não estrelar itens
     </string>
 
 </resources>
diff --git a/ultrasonic/src/main/res/values-pt/strings.xml b/ultrasonic/src/main/res/values-pt/strings.xml
index 2ff02ba4..e22c328e 100644
--- a/ultrasonic/src/main/res/values-pt/strings.xml
+++ b/ultrasonic/src/main/res/values-pt/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">Carregando&#8230;</string>
     <string name="background_task.network_error">Ocorreu um erro de rede. Verifique o endereço do servidor ou tente mais tarde.</string>
@@ -302,7 +302,7 @@
     <string name="settings.use_folder_for_album_artist_summary">Assumir que a pasta mais acima é o nome do artista</string>
     <string name="settings.use_id3">Navegar Usando Etiquetas ID3</string>
     <string name="settings.use_id3_summary">Usa as etiquetas ID3 ao invés do sistema de ficheiros</string>
-    <string name="main.video">Vídeo</string>
+    <string name="main.video" tools:ignore="UnusedResources">Vídeo</string>
     <string name="settings.view_refresh">Atualização do Ecrã</string>
     <string name="settings.view_refresh_500">.5 segundos</string>
     <string name="settings.view_refresh_1000">1 segundo</string>
@@ -322,7 +322,7 @@
     <string name="util.bytes_format.gigabyte">0.00 GB</string>
     <string name="util.bytes_format.kilobyte">0 KB</string>
     <string name="util.bytes_format.megabyte">0.00 MB</string>
-    <string name="util.no_time">&#8212;:&#8212;&#8212;</string>
+    <string name="util.no_time" tools:ignore="TypographyDashes">&#8212;:&#8212;&#8212;</string>
     <string name="util.zero_time">0:00</string>
     <string name="widget.initial_text">Toque para selecionar a música</string>
     <string name="widget.sdcard_busy">Cartão SD indisponível</string>
@@ -375,24 +375,24 @@
         <item quantity="other">%d músicas selecionadas para serem fixadas.</item>
     </plurals>
     <plurals name="select_album_n_songs_downloaded">
-        <item quantity="one">%d música selecionada para descarregar.</item>
-        <item quantity="other">%d músicas selecionadas para serem descarregadas.</item>
+        <item quantity="one">%d música selecionada para ser baixada.</item>
+        <item quantity="other">%d músicas selecionadas para serem baixadas.</item>
     </plurals>
     <plurals name="select_album_n_songs_unpinned">
-        <item quantity="one">%d música selecionada para ser desafixada.</item>
+        <item quantity="one">%d música selecionada para ser desfixada.</item>
         <item quantity="other">%d músicas selecionadas para serem desfixadas.</item>
     </plurals>
     <plurals name="select_album_n_songs_added">
-        <item quantity="one">%d música adicionada ao fim da fila.</item>
-        <item quantity="other">%d músicas adicionadas ao fim da fila.</item>
+        <item quantity="one">%d música adicionada ao final da playlist.</item>
+        <item quantity="other">%d músicas adicionadas ao final da playlist.</item>
     </plurals>
     <plurals name="select_album_n_songs_play_next">
-        <item quantity="one">%d música inserida após a atual.</item>
-        <item quantity="other">%d músicas inseridas após a atual.</item>
+        <item quantity="one">%d música adicionada após a atual.</item>
+        <item quantity="other">%d músicas adicionadas após a atual.</item>
     </plurals>
     <plurals name="select_album_donate_dialog_n_trial_days_left">
-        <item quantity="one">Resta %d dia para o fim do período de teste</item>
-        <item quantity="other">Restam %d dias para o fim do período de teste</item>
+        <item quantity="one">%d dia restante do período de teste</item>
+        <item quantity="other">%d dias restantes do período de teste</item>
     </plurals>
 
     <!-- Subsonic api errors -->
diff --git a/ultrasonic/src/main/res/values-zh-rCN/strings.xml b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
index 171e18c5..e5468a7b 100644
--- a/ultrasonic/src/main/res/values-zh-rCN/strings.xml
+++ b/ultrasonic/src/main/res/values-zh-rCN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="background_task.loading">加载中&#8230;</string>
     <string name="background_task.network_error">发生网络错误。请检查服务器地址或稍后重试。</string>
@@ -220,7 +220,7 @@
     <string name="settings.testing_unlicensed">连接正常， 服务器未授权。</string>
     <string name="settings.theme_title">主题</string>
     <string name="settings.title.allow_self_signed_certificate">允许自签名 HTTPS 证书</string>
-    <string name="main.video">视频</string>
+    <string name="main.video" tools:ignore="UnusedResources">视频</string>
     <string name="settings.view_refresh">刷新视图</string>
     <string name="settings.view_refresh_500">.5 秒</string>
     <string name="settings.view_refresh_1000">1 秒</string>

From a64fe4735340d1f5468f294e2c356e1fb89296d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= <ogarcia@connectical.com>
Date: Mon, 13 Sep 2021 11:09:50 +0200
Subject: [PATCH 3/3] Bump version to 2.23.1

---
 fastlane/metadata/android/en-US/changelogs/97.txt | 2 ++
 fastlane/metadata/android/es-ES/changelogs/97.txt | 2 ++
 ultrasonic/build.gradle                           | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/97.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/97.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/97.txt b/fastlane/metadata/android/en-US/changelogs/97.txt
new file mode 100644
index 00000000..bd47354a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/97.txt
@@ -0,0 +1,2 @@
+Bug fixes
+- #571: Fixed media session null checks.
diff --git a/fastlane/metadata/android/es-ES/changelogs/97.txt b/fastlane/metadata/android/es-ES/changelogs/97.txt
new file mode 100644
index 00000000..25abfb8e
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/97.txt
@@ -0,0 +1,2 @@
+Correción de errores
+- #571: Se comprueban los valores nulos en la sesión de medios.
diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle
index 4cc54f62..90935476 100644
--- a/ultrasonic/build.gradle
+++ b/ultrasonic/build.gradle
@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         applicationId "org.moire.ultrasonic"
-        versionCode 95
-        versionName "2.23.0"
+        versionCode 97
+        versionName "2.23.1"
 
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk