소스 검색

fixed radio not playing on API19- (no SSL available). Use HTTPS for 21+

yattoz 4 년 전
부모
커밋
aafa813697
3개의 변경된 파일19개의 추가작업 그리고 22개의 파일을 삭제
  1. 0 14
      app/src/main/res/values-fr/strings.xml
  2. 6 0
      app/src/main/res/values-v21/strings.xml
  3. 13 8
      app/src/main/res/values/strings.xml

+ 0 - 14
app/src/main/res/values-fr/strings.xml 파일 보기

8
 
8
 
9
     <string name="now_playing_notification_title_template">Maintenant: %1$s</string>
9
     <string name="now_playing_notification_title_template">Maintenant: %1$s</string>
10
 
10
 
11
-    <string name="MEDIA_ROOT_ID">radio_root_id</string>
12
-    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
13
-    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
14
-    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
15
-
16
     <string name="volume">Volume : </string>
11
     <string name="volume">Volume : </string>
17
 
12
 
18
     <string name="up_next">Émission en cours :</string>
13
     <string name="up_next">Émission en cours :</string>
20
     <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>
15
     <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>
21
     <string name="action_settings">Paramètres</string>
16
     <string name="action_settings">Paramètres</string>
22
     <string name="action_bug_submit">Reporter un bug (GitHub)</string>
17
     <string name="action_bug_submit">Reporter un bug (GitHub)</string>
23
-    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
24
-
25
-    <string name="nowPlayingNotificationChannel">Tsumugi Stream Service</string>
26
-    <string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
27
-
28
     <string name="snackbarPersistent">Restent visibles, peuvent être fermées avec un bouton \"OK\" ou en glissant.</string>
18
     <string name="snackbarPersistent">Restent visibles, peuvent être fermées avec un bouton \"OK\" ou en glissant.</string>
29
     <string name="snackbarNonPersistent">Disparaissent après quelques instants</string>
19
     <string name="snackbarNonPersistent">Disparaissent après quelques instants</string>
30
     <string name="every_day">Tous les jours</string>
20
     <string name="every_day">Tous les jours</string>
37
     <string name="action_sleep">Minuterie avant fermeture</string>
27
     <string name="action_sleep">Minuterie avant fermeture</string>
38
     <string name="dont_fetch_on_background">Désactiver</string>
28
     <string name="dont_fetch_on_background">Désactiver</string>
39
     <string name="restart_the_app">Vous devez redémarrer l\'application pour valider ces changements.</string>
29
     <string name="restart_the_app">Vous devez redémarrer l\'application pour valider ces changements.</string>
40
-
41
     <string name="action_alarm">Alarme</string>
30
     <string name="action_alarm">Alarme</string>
42
     <string name="sleep_fade_out_text">Une minute avant la fin de la minuterie, le volume va décroitre progressivement.</string>
31
     <string name="sleep_fade_out_text">Une minute avant la fin de la minuterie, le volume va décroitre progressivement.</string>
43
     <string name="disable">Désactiver</string>
32
     <string name="disable">Désactiver</string>
44
-    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
45
-    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
46
-    <string name="planning_url">ADD SOME URL HERE</string>
47
     <string name="select_one_day">Sélectionner au moins un jour.</string>
33
     <string name="select_one_day">Sélectionner au moins un jour.</string>
48
     <string name="no_alarm_set">Pas d\'alarme</string>
34
     <string name="no_alarm_set">Pas d\'alarme</string>
49
     <string name="next_alarm">Prochaine alarme :</string>
35
     <string name="next_alarm">Prochaine alarme :</string>

+ 6 - 0
app/src/main/res/values-v21/strings.xml 파일 보기

1
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
2
+
3
+    <!-- URLs -->
4
+    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
5
+
6
+</resources>

+ 13 - 8
app/src/main/res/values/strings.xml 파일 보기

1
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
1
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
2
+
3
+    <!-- URLs -->
4
+    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
5
+    <string name="STREAM_URL_TSUMUGI">http://shelter.mahoro-net.org:8000/tsumugi</string>
6
+    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
7
+    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
8
+    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
9
+    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
10
+    <string name="planning_url">ADD SOME URL HERE</string>
11
+
12
+
2
     <string name="app_name">Tsumugi</string>
13
     <string name="app_name">Tsumugi</string>
3
     <string name="title_nowplaying">Tsumugi</string>
14
     <string name="title_nowplaying">Tsumugi</string>
4
     <string name="title_queue_lp">Songs</string>
15
     <string name="title_queue_lp">Songs</string>
9
     <string name="now_playing_notification_title_template">Now playing: %1$s</string>
20
     <string name="now_playing_notification_title_template">Now playing: %1$s</string>
10
 
21
 
11
     <string name="MEDIA_ROOT_ID">radio_root_id</string>
22
     <string name="MEDIA_ROOT_ID">radio_root_id</string>
12
-    <string name="STREAM_URL_RADIO">https://relay0.r-a-d.io/main.mp3</string>
13
-    <string name="STREAM_URL_TSUMUGI">https://radio.mahoro-net.org/streams/tsumugi</string>
14
-    <string name="STREAM_URL_RSTLSS">http://stream.radiosolution.fr/rstlss.mp3</string>
23
+
15
 
24
 
16
     <string name="volume">Volume: </string>
25
     <string name="volume">Volume: </string>
17
 
26
 
20
     <string name="error_webView">Error loading WebView. Try downloading Google Chrome on Google Play, or enabling it if you disabled it.</string>
29
     <string name="error_webView">Error loading WebView. Try downloading Google Chrome on Google Play, or enabling it if you disabled it.</string>
21
     <string name="action_settings">Settings</string>
30
     <string name="action_settings">Settings</string>
22
     <string name="action_bug_submit">Submit a bug (GitHub)</string>
31
     <string name="action_bug_submit">Submit a bug (GitHub)</string>
23
-    <string name="github_url_new_issue">https://github.com/yattoz/Tsumugi-app/issues/</string>
24
 
32
 
25
-    <string name="nowPlayingNotificationChannel">R/a/dio Stream Service</string>
33
+    <string name="nowPlayingNotificationChannel">Tsumugi Stream Service</string>
26
     <string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
34
     <string name="nowPlayingChannelId">fr.forum_thalie.tsumugi.PLAYER_SERVICE</string>
27
 
35
 
28
     <string name="snackbarPersistent">Stay visible, can be closed with \"OK\" button</string>
36
     <string name="snackbarPersistent">Stay visible, can be closed with \"OK\" button</string>
41
     <string name="action_alarm">Alarm</string>
49
     <string name="action_alarm">Alarm</string>
42
     <string name="sleep_fade_out_text">One minute before the end of the timer, the volume will gradually decrease.</string>
50
     <string name="sleep_fade_out_text">One minute before the end of the timer, the volume will gradually decrease.</string>
43
     <string name="disable">Disable</string>
51
     <string name="disable">Disable</string>
44
-    <string name="website_url">https://tsumugi.forum-thalie.fr/</string>
45
-    <string name="rss_url">https://tsumugi.forum-thalie.fr/?feed=rss2</string>
46
-    <string name="planning_url">ADD SOME URL HERE</string>
47
     <string name="select_one_day">Select at least one day</string>
52
     <string name="select_one_day">Select at least one day</string>
48
     <string name="no_alarm_set">No alarm set</string>
53
     <string name="no_alarm_set">No alarm set</string>
49
     <string name="next_alarm">Next alarm:</string>
54
     <string name="next_alarm">Next alarm:</string>