From aafa8136975b8bc8d348935f76aea6fe00fb8f9f Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Mon, 30 Dec 2019 16:18:02 +0100
Subject: [PATCH] fixed radio not playing on API19- (no SSL available). Use
 HTTPS for 21+

---
 app/src/main/res/values-fr/strings.xml  | 14 --------------
 app/src/main/res/values-v21/strings.xml |  6 ++++++
 app/src/main/res/values/strings.xml     | 21 +++++++++++++--------
 3 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/values-v21/strings.xml

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e44bafa..159fd98 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -8,11 +8,6 @@
 
     <string name="now_playing_notification_title_template">Maintenant: %1$s</string>
 
-    <string name="MEDIA_ROOT_ID">radio_root_id</string>
-    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
-    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
-    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
-
     <string name="volume">Volume : </string>
 
     <string name="up_next">Émission en cours :</string>
@@ -20,11 +15,6 @@
     <string name="error_webView">Erreur du chargement de WebView. Téléchargez Google Chrome sur le Play Store, ou activez le si vous l\'avez désactivé.</string>
     <string name="action_settings">Paramètres</string>
     <string name="action_bug_submit">Reporter un bug (GitHub)</string>
-    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
-
-    <string name="nowPlayingNotificationChannel">Tsumugi Stream Service</string>
-    <string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
-
     <string name="snackbarPersistent">Restent visibles, peuvent être fermées avec un bouton \"OK\" ou en glissant.</string>
     <string name="snackbarNonPersistent">Disparaissent après quelques instants</string>
     <string name="every_day">Tous les jours</string>
@@ -37,13 +27,9 @@
     <string name="action_sleep">Minuterie avant fermeture</string>
     <string name="dont_fetch_on_background">Désactiver</string>
     <string name="restart_the_app">Vous devez redémarrer l\'application pour valider ces changements.</string>
-
     <string name="action_alarm">Alarme</string>
     <string name="sleep_fade_out_text">Une minute avant la fin de la minuterie, le volume va décroitre progressivement.</string>
     <string name="disable">Désactiver</string>
-    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
-    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
-    <string name="planning_url">ADD SOME URL HERE</string>
     <string name="select_one_day">Sélectionner au moins un jour.</string>
     <string name="no_alarm_set">Pas d\'alarme</string>
     <string name="next_alarm">Prochaine alarme :</string>
diff --git a/app/src/main/res/values-v21/strings.xml b/app/src/main/res/values-v21/strings.xml
new file mode 100644
index 0000000..bf9af95
--- /dev/null
+++ b/app/src/main/res/values-v21/strings.xml
@@ -0,0 +1,6 @@
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+
+    <!-- URLs -->
+    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
+
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a73448a..4f9137f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,15 @@
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+
+    <!-- URLs -->
+    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
+    <string name="STREAM_URL_TSUMUGI">http://shelter.mahoro-net.org:8000/tsumugi</string>
+    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
+    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
+    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
+    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
+    <string name="planning_url">ADD SOME URL HERE</string>
+
+
     <string name="app_name">Tsumugi</string>
     <string name="title_nowplaying">Tsumugi</string>
     <string name="title_queue_lp">Songs</string>
@@ -9,9 +20,7 @@
     <string name="now_playing_notification_title_template">Now playing: %1$s</string>
 
     <string name="MEDIA_ROOT_ID">radio_root_id</string>
-    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
-    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
-    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
+
 
     <string name="volume">Volume: </string>
 
@@ -20,9 +29,8 @@
     <string name="error_webView">Error loading WebView. Try downloading Google Chrome on Google Play, or enabling it if you disabled it.</string>
     <string name="action_settings">Settings</string>
     <string name="action_bug_submit">Submit a bug (GitHub)</string>
-    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
 
-    <string name="nowPlayingNotificationChannel">R/a/dio Stream Service</string>
+    <string name="nowPlayingNotificationChannel">Tsumugi Stream Service</string>
     <string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
 
     <string name="snackbarPersistent">Stay visible, can be closed with \"OK\" button</string>
@@ -41,9 +49,6 @@
     <string name="action_alarm">Alarm</string>
     <string name="sleep_fade_out_text">One minute before the end of the timer, the volume will gradually decrease.</string>
     <string name="disable">Disable</string>
-    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
-    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
-    <string name="planning_url">ADD SOME URL HERE</string>
     <string name="select_one_day">Select at least one day</string>
     <string name="no_alarm_set">No alarm set</string>
     <string name="next_alarm">Next alarm:</string>