Castopod
/
Podcini-podcast
mirror of https://github.com/XilinJia/Podcini.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

4.6.1 commit

This commit is contained in:
Xilin Jia 2024-04-08 12:33:27 +00:00
parent 01a32dc52d
commit 0fb3f0908d
29 changed files with 85 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -149,8 +149,8 @@ android {
// Version code schema (not used):
// "1.2.3-beta4" -> 1020304
// "1.2.3" -> 1020395
versionCode 3020125
versionName "4.6.0"
versionCode 3020126
versionName "4.6.1"
def commit = ""
try {

31
app/src/main/java/ac/mdiq/podcini/service/playback/PlaybackService.kt
View File

@ -519,23 +519,18 @@ class PlaybackService : MediaBrowserServiceCompat() {
}
private fun skipIntro(playable: Playable) {
if (playable !is FeedMedia) {
return
}
if (playable !is FeedMedia) return
val preferences = playable.item?.feed?.preferences
val skipIntro = preferences?.feedSkipIntro ?: 0
val context = applicationContext
if (skipIntro > 0 && playable.getPosition() < skipIntro * 1000) {
val skipIntroMS = skipIntro * 1000
if (skipIntro > 0 && playable.getPosition() < skipIntroMS) {
val duration = duration
if (skipIntro * 1000 < duration || duration <= 0) {
if (skipIntroMS < duration || duration <= 0) {
Log.d(TAG, "skipIntro " + playable.getEpisodeTitle())
mediaPlayer?.seekTo(skipIntro * 1000)
val skipIntroMesg = context.getString(R.string.pref_feed_skip_intro_toast,
skipIntro)
val toast = Toast.makeText(context, skipIntroMesg,
Toast.LENGTH_LONG)
mediaPlayer?.seekTo(skipIntroMS)
val skipIntroMesg = applicationContext.getString(R.string.pref_feed_skip_intro_toast, skipIntro)
val toast = Toast.makeText(applicationContext, skipIntroMesg, Toast.LENGTH_LONG)
toast.show()
}
}
@ -1156,11 +1151,13 @@ class PlaybackService : MediaBrowserServiceCompat() {
val feedMedia = playable
val preferences = feedMedia.item?.feed?.preferences
val skipEnd = preferences?.feedSkipEnding
if (skipEnd != null && skipEnd > 0 && skipEnd * 1000 < this.duration && (remainingTime - (skipEnd * 1000) > 0)
&& ((remainingTime - skipEnd * 1000) < (currentPlaybackSpeed * 1000))) {
Log.d(TAG,
"skipEndingIfNecessary: Skipping the remaining " + remainingTime + " " + skipEnd * 1000 + " speed " + currentPlaybackSpeed)
val skipEnd = preferences?.feedSkipEnding?:0
val skipEndMS = skipEnd * 1000
// Log.d(TAG, "skipEndingIfNecessary: checking " + remainingTime + " " + skipEndMS + " speed " + currentPlaybackSpeed)
// if (skipEnd > 0 && skipEndMS < this.duration && (remainingTime - skipEndMS > 0)
// && ((remainingTime - skipEndMS) < currentPlaybackSpeed * 1000)) {
if (skipEnd > 0 && skipEndMS < this.duration && (remainingTime - skipEndMS < 0)) {
Log.d(TAG, "skipEndingIfNecessary: Skipping the remaining " + remainingTime + " " + skipEndMS + " speed " + currentPlaybackSpeed)
val context = applicationContext
val skipMesg = context.getString(R.string.pref_feed_skip_ending_toast, skipEnd)
val toast = Toast.makeText(context, skipMesg, Toast.LENGTH_LONG)

5
app/src/main/java/ac/mdiq/podcini/ui/dialog/FeedPreferenceSkipDialog.kt
View File

@ -10,11 +10,12 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
/**
* Displays a dialog with a username and password text field and an optional checkbox to save username and preferences.
*/
abstract class FeedPreferenceSkipDialog(context: Context, skipIntroInitialValue: Int, skipEndInitialValue: Int) : MaterialAlertDialogBuilder(context) {
abstract class FeedPreferenceSkipDialog(context: Context, skipIntroInitialValue: Int, skipEndInitialValue: Int)
: MaterialAlertDialogBuilder(context) {
init {
setTitle(R.string.pref_feed_skip)
val binding = FeedPrefSkipDialogBinding.bind(View.inflate(context, R.layout.feed_pref_skip_dialog, null))
// val rootView = View.inflate(context, R.layout.feed_pref_skip_dialog, null)
setView(binding.root)
val etxtSkipIntro = binding.etxtSkipIntro

3
app/src/main/java/ac/mdiq/podcini/ui/fragment/FeedSettingsFragment.kt
View File

@ -192,8 +192,7 @@ class FeedSettingsFragment : Fragment() {
DBWriter.setFeedPreferences(feedPreferences!!)
EventBus.getDefault().post(
ac.mdiq.podcini.util.event.settings.SkipIntroEndingChangedEvent(feedPreferences!!.feedSkipIntro,
feedPreferences!!.feedSkipEnding,
feed!!.id))
feedPreferences!!.feedSkipEnding, feed!!.id))
}
}.show()
false

10
app/src/main/res/values-ar/strings.xml
View File

@ -48,12 +48,10 @@
<!--Home fragment-->
<string name="notification_permission_denied">لقد رفضت السماح بلإشعارات</string>
<string name="notification_permission_text">منذ Android 13، هناك حاجة إلى إشعار المستوى الأعلى للتحديث والتشغيل
العادي. يمكنك عدم السماح بإشعارات الفئات الفرعية حسب رغبتك.
</string>
<string name="notification_permission_denied">لقد رفضت السماح بلإشعارات</string>
<string name="open_settings">افتح الإعدادات</string>
<string name="configure_home">أضبط شاشة المنزل</string>
<!--Download Statistics fragment-->

1
app/src/main/res/values-ca/strings.xml
View File

@ -46,7 +46,6 @@
<string name="statistics_counting_range">Reproduït entre entre %1$s i %2$s</string>
<string name="statistics_counting_total">Reproduït en total</string>
<string name="notification_permission_text">Podcini necessita el vostre permís per mostrar notificacions. Per defecte, Podcini només mostra notificacions mentre alguna cosa s\'està baixant o quan alguna cosa surt malament.</string>
<string name="notification_permission_denied">S\'ha denegat el permís per a les notificacions</string>
<string name="deny_label">Denega</string>
<string name="open_settings">Obre la configuració</string>

3
app/src/main/res/values-cs/strings.xml
View File

@ -46,8 +46,7 @@
<string name="statistics_counting_range">Přehráno mezi 1%1$s a 2%2$s</string>
<string name="statistics_counting_total">Celkem přehnáno</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini potřebuje vaše povolení k zobrazování oznámení. Ve výchozím nastavení Podcini zobrazuje oznámení pouze během stahování nebo když se něco pokazí.</string>
<string name="notification_permission_denied">Zamítli jste oprávnění.</string>
\ <string name="notification_permission_denied">Zamítli jste oprávnění.</string>
<string name="notification_permission_deny_warning">Pokud oznámení zakážete a něco se pokazí, nemusí se vám podařit zjistit proč.</string>
<string name="deny_label">Zakázat</string>
<string name="open_settings">Otevřít nastavení</string>

1
app/src/main/res/values-da/strings.xml
View File

@ -46,7 +46,6 @@
<string name="statistics_counting_range">Afspillet mellem %1$s og %2$s</string>
<string name="statistics_counting_total">Afspillet i alt</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini har brug for din tilladelse til at vise notifikationer. Som udgangspunkt viser Podcini kun notifikationer, mens noget hentes, eller når noget går galt.</string>
<string name="notification_permission_denied">Du afviste tilladelsen.</string>
<string name="notification_permission_deny_warning">Hvis du deaktiverer notifikationer, og noget går galt, kan du måske ikke finde ud af, hvorfor det gik galt.</string>
<string name="deny_label">Nægt</string>

7
app/src/main/res/values-de/strings.xml
View File

@ -46,8 +46,11 @@
<string name="statistics_counting_range">Abgespielt zwischen %1$s und %2$s</string>
<string name="statistics_counting_total">Insgesamt abgespielt</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini benötigt deine Erlaubnis, um Benachrichtigungen anzuzeigen. Standardmäßig zeigt Podcini nur Benachrichtigungen an, wenn etwas heruntergeladen wird oder wenn etwas schief läuft.</string>
<string name="notification_permission_denied">Du hast die Berechtigung abgelehnt.</string>
<string name="notification_permission_text">Seit Android 13 ist für die normale Aktualisierung und Wiedergabe eine
Benachrichtigung der obersten Ebene erforderlich. Sie können die Benachrichtigung von Unterkategorien auf Wunsch
verbieten.
</string>
<string name="notification_permission_denied">Du hast die Berechtigung abgelehnt.</string>
<string name="notification_permission_deny_warning">Wenn die Benachrichtigungen deaktiviert werden und etwas schief geht, kannst du möglicherweise nicht herausfinden, warum dies passiert ist.</string>
<string name="deny_label">Ablehnen</string>
<string name="open_settings">Einstellungen öffnen</string>

6
app/src/main/res/values-es/strings.xml
View File

@ -46,8 +46,10 @@
<string name="statistics_counting_range">Reproducido entre%1$s y %2$s</string>
<string name="statistics_counting_total">Reproducido en total</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini necesita </string>
<string name="notification_permission_denied">Denegaste el permiso.</string>
<string name="notification_permission_text">Desde Android 13, se necesita una notificación de nivel superior para la
actualización y reproducción normales. Puede no permitir notificaciones de subcategorías si lo desea.
</string>
<string name="notification_permission_denied">Denegaste el permiso.</string>
<string name="notification_permission_deny_warning">Si deshabilita las notificaciones y se produce un error, puede no encontrarlo posteriormente.</string>
<string name="deny_label">Denegar</string>
<string name="open_settings">Abrir ajustes</string>

7
app/src/main/res/values-eu/strings.xml
View File

@ -46,13 +46,6 @@
<string name="statistics_counting_range">%1$s eta %2$s bitartean joa</string>
<string name="statistics_counting_total">Joa guztira</string>
<!--Home fragment-->
<string name="notification_permission_text">Podciniek zure baimena behar du jakinarazpenak bistaratzeko. Modu lehenetsian Podciniek bi kasutan soilik erakusten ditu jakinarazpenak: zerbait deskargatu bitartean edo zerbait oker doanean.</string>
<string name="notification_permission_denied">Baimena ukatu duzu.</string>
<string name="deny_label">Ukatu</string>
<string name="open_settings">Ireki ezarpenak</string>

7
app/src/main/res/values-fr/strings.xml
View File

@ -46,8 +46,11 @@
<string name="statistics_counting_range">Lu entre %1$s et %2$s</string>
<string name="statistics_counting_total">De durée de lecture</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini a besoin de votre autorisation pour afficher les notifications. Par défaut, Podcini, ne notifie que si quelque chose est en cours de téléchargement ou pose problème.</string>
<string name="notification_permission_denied">Vous avez refusé l\'autorisation.</string>
<string name="notification_permission_text">Depuis Android 13, une notification de niveau supérieur est nécessaire
pour l’actualisation et la lecture normales. Vous pouvez refuser les notifications de sous-catégories à votre
guise.
</string>
<string name="notification_permission_denied">Vous avez refusé l\'autorisation.</string>
<string name="notification_permission_deny_warning">Si vous désactivez les notifications et que quelque chose pose problème vous risquez de ne pas comprendre pourquoi.</string>
<string name="deny_label">Refuser</string>
<string name="open_settings">Ouvrir les préférences</string>

10
app/src/main/res/values-gl/strings.xml
View File

@ -46,15 +46,7 @@
<string name="statistics_counting_range">Reproducido entre %1$s e %2$s</string>
<string name="statistics_counting_total">Total reproducido</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini precisa permiso para mostrar notificacións. Por defecto Podcini só mostra notificacións cando se está descargando algo ou cando algo non vai ben.</string>
<string name="notification_permission_denied">Non outorgaches o permiso</string>
<string name="notification_permission_denied">Non outorgaches o permiso</string>
<string name="notification_permission_deny_warning">Se desactivas as notificacións e algo vai fall, é posible que non coñezas a razón do fallo.</string>
<string name="deny_label">Rexeitar</string>
<string name="open_settings">Ir aos axustes</string>

7
app/src/main/res/values-it/strings.xml
View File

@ -46,8 +46,11 @@
<string name="statistics_counting_range">Riprodotto fra %1$s e %2$s</string>
<string name="statistics_counting_total">Riprodotto in totale</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini ha bisogno del tuo permesso per mostrarti le notifiche. Per impostazione predefinita, Podcini ti mostra notifiche solo quando stai scaricando qualcosa o quando qualcosa va storto.</string>
<string name="notification_permission_denied">Hai negato l\'autorizzazione.</string>
<string name="notification_permission_text">A partire da Android 13, è necessaria una notifica di livello superiore
per il normale aggiornamento e riproduzione. Puoi non consentire le notifiche delle sottocategorie come
desideri.
</string>
<string name="notification_permission_denied">Hai negato l\'autorizzazione.</string>
<string name="notification_permission_deny_warning">Se disabiliti le notifiche e qualcosa va storto, potresti non essere in grado di individuare la causa del problema.</string>
<string name="deny_label">Nega</string>
<string name="open_settings">Apri le impostazioni</string>

8
app/src/main/res/values-iw/strings.xml
View File

@ -46,14 +46,6 @@
<string name="statistics_counting_range">התנגן בין %1$s לבין %2$s</string>
<string name="statistics_counting_total">התנגן בסך הכול</string>
<!--Home fragment-->
<string name="notification_permission_text">לאנטנה־פּוֹד דרושה ההרשאה שלך להציג התראות. כברירת מחדל, אנטנה־פּוֹד תציג הורדות רק כשמשהו יורד או משהו השתבש.</string>
<string name="notification_permission_denied">דחית את בקשת ההרשאה.</string>
<string name="notification_permission_deny_warning">אם בחרת להשבית את ההתראות ומשהו משתבש, יכול להיות שהתקלה תחמוק מעיניך.</string>
<string name="deny_label">דחייה</string>

10
app/src/main/res/values-ja/strings.xml
View File

@ -35,12 +35,10 @@
<!--Home fragment-->
<string name="configure_home">ホーム画面の設定</string>
<string name="notification_permission_text">Android 13 以降、通常の更新と再生にはトップレベルの通知が必要です。
ご希望に応じて、サブカテゴリの通知を禁止することができます。
</string>
<string name="configure_home">ホーム画面の設定</string>
<!--Download Statistics fragment-->
<string name="total_size_downloaded_podcasts">デバイス上のエピソードの合計サイズ</string>
<!--Main activity-->

10
app/src/main/res/values-pl/strings.xml
View File

@ -47,12 +47,10 @@
<!--Home fragment-->
<string name="notification_permission_denied">Nie udzielono zgody.</string>
<string name="notification_permission_text">Od wersji Androida 13 do normalnego odświeżania i odtwarzania potrzebne
są powiadomienia najwyższego poziomu. Na własne życzenie możesz wyłączyć powiadomienia o podkategoriach.
</string>
<string name="notification_permission_denied">Nie udzielono zgody.</string>
<string name="open_settings">Otwórz ustawienia</string>
<string name="configure_home">Konfiguruj stronę główną</string>
<!--Download Statistics fragment-->

5
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -46,7 +46,10 @@
<string name="statistics_counting_range">Reproduzidos entre %1$s e %2$s</string>
<string name="statistics_counting_total">Reproduzidos no total</string>
<string name="notification_permission_denied">Você negou a permissão.</string>
<string name="notification_permission_text">Desde o Android 13, a notificação de nível superior é necessária para
atualização e reprodução normais. Você pode proibir notificações de subcategorias conforme desejar.
</string>
<string name="notification_permission_denied">Você negou a permissão.</string>
<string name="open_settings">Abrir as configurações</string>
<string name="configure_home">Configurar Página Principal</string>
<!--Download Statistics fragment-->

6
app/src/main/res/values-pt/strings.xml
View File

@ -46,8 +46,10 @@
<string name="statistics_counting_range">Reproduzidos entre %1$s e %2$s</string>
<string name="statistics_counting_total">Total</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini precisa de sua permissão para mostrar notificações. Por definição, a aplicação apenas mostra notificações se estiver a descarregar ficheiros ou se algo errado acontecer.</string>
<string name="notification_permission_denied">Permissões recusadas</string>
<string name="notification_permission_text">Desde o Android 13, a notificação de nível superior é necessária para
atualização e reprodução normais. Você pode proibir notificações de subcategorias conforme desejar.
</string>
<string name="notification_permission_denied">Permissões recusadas</string>
<string name="notification_permission_deny_warning">Se desativar as notificações e ocorrer algum erro, não receberá quaisquer informações acerca desse erro</string>
<string name="deny_label">Recusar</string>
<string name="open_settings">Abrir definições</string>

1
app/src/main/res/values-ro/strings.xml
View File

@ -46,7 +46,6 @@
<string name="statistics_counting_range">Redat între %1$s și %2$s</string>
<string name="statistics_counting_total">Redat în total</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini necesită permisiunea ta pentru a afișa notificări. În mod implicit Podcini afișează notificări doar în momentul în care un podcast este descărcat sau în momentul în care apare o eroare.</string>
<string name="notification_permission_denied">Ați refuzat permisiunea.</string>
<string name="notification_permission_deny_warning">Dacă dezactivezi notificările și ceva nu funcționează corect, există posibilitatea de a nu putea să afli ce a mers greșit.</string>
<string name="deny_label">Refuză</string>

1
app/src/main/res/values-sk/strings.xml
View File

@ -46,7 +46,6 @@
<string name="statistics_counting_range">Prehrané medzi %1$s a %2$s</string>
<string name="statistics_counting_total">Prehrané celkom</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini potrebuje vaše povolenie na zobrazovanie upozornení. V predvolenom nastavení Podcini zobrazuje upozornenia iba vtedy, keď sa niečo sťahuje alebo keď sa niečo nepodarí.</string>
<string name="notification_permission_denied">Odmietli ste povolenie.</string>
<string name="notification_permission_deny_warning">Ak vypnete upozornenia a niečo sa nepodarí, možno nebudete môcť zistiť, prečo sa to nepodarilo.</string>
<string name="deny_label">Odmietnuť</string>

1
app/src/main/res/values-sv/strings.xml
View File

@ -46,7 +46,6 @@
<string name="statistics_counting_range">Spelat mellan %1$s och %2$s</string>
<string name="statistics_counting_total">Spelat totalt</string>
<string name="notification_permission_text">Podcini behöver ditt tillstånd att visa notiser. Som standard visar Podcini bara notiser när något laddas ner eller när något går fel.</string>
<string name="notification_permission_denied">Du nekade behörigheten.</string>
<string name="notification_permission_deny_warning">Om du stänger av notiser och något går fel kan det vara svårt att få reda på varför.</string>
<string name="deny_label">Neka</string>

10
app/src/main/res/values-tr/strings.xml
View File

@ -48,12 +48,10 @@
<!--Home fragment-->
<string name="notification_permission_denied">İzni reddettiniz</string>
<string name="notification_permission_text">Android 13\'ten bu yana normal yenileme ve oynatma için üst düzey
bildirime ihtiyaç duyulmaktadır. Dilediğiniz takdirde alt kategorilerin bildirimlerine izin vermeyebilirsiniz.
</string>
<string name="notification_permission_denied">İzni reddettiniz</string>
<string name="open_settings">Ayarları aç</string>
<string name="configure_home">Ana Ekranı Özelleştir</string>
<!--Download Statistics fragment-->

1
app/src/main/res/values-uk/strings.xml
View File

@ -46,7 +46,6 @@
<string name="statistics_counting_range">Прослухано між %1$sта%2$s </string>
<string name="statistics_counting_total">Прослухано взагалі</string>
<string name="notification_permission_text">Podcini потрібен ваш дозвіл, щоб показувати сповіщення. За замовчуванням Podcini показує сповіщення лише під час завантаження або коли щось йде не так.</string>
<string name="notification_permission_denied">Ви відмовили у дозволі.</string>
<string name="notification_permission_deny_warning">Якщо ви вимкнете сповіщення і щось піде не так, то, можливо, ви не зможете з\'ясувати, чому це сталося.</string>
<string name="deny_label">Блокувати</string>

12
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -47,14 +47,10 @@
<string name="statistics_counting_total">总播放</string>
<!--Home fragment-->
<string name="notification_permission_text">Podcini 需要你的许可方能显示通知。默认情况下，Podcini 只显示和进行中的下载或错误相关的通知</string>
<string name="notification_permission_denied">你拒绝授予该权限</string>
<string name="notification_permission_text">从 Android 13 开始，正常刷新和播放需要顶级通知。
您可以根据自己的意愿禁止子类别的通知。
</string>
<string name="notification_permission_denied">你拒绝授予该权限</string>
<string name="notification_permission_deny_warning">如果你禁用了通知，且出现了错误，你可能无法找出出错的原因</string>
<string name="deny_label">拒绝</string>
<string name="open_settings">打开设置</string>

5
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -29,7 +29,10 @@
<!--Home fragment-->
<!--Download Statistics fragment-->
<!--Main activity-->
<string name="drawer_open">打開選單</string>
<string name="notification_permission_text">從 Android 13 開始，正常刷新和播放需要頂級通知。
您可以根據自己的意願禁止子類別的通知。
</string>
<string name="drawer_open">打開選單</string>
<string name="drawer_close">關閉選單</string>
<string name="drawer_feed_order_unplayed_episodes">按計數器排序</string>
<string name="drawer_feed_order_alphabetical">按字母排序</string>

2
app/src/main/res/values/strings.xml
View File

@ -58,7 +58,7 @@
<string name="statistics_counting_range">Played between %1$s and %2$s</string>
<string name="statistics_counting_total">Played in total</string>
<string name="notification_permission_text">Podcini needs your permission to show notifications. By default, Podcini only shows notifications while something is being downloaded or when something goes wrong.</string>
<string name="notification_permission_text">Since Android 13, top level notification is needed for normal refresh and playback. You may disallow notifications of sub-catergories at your wish.</string>
<string name="notification_permission_denied">You denied the permission.</string>
<string name="notification_permission_deny_warning">If you disable notifications and something goes wrong, you might be unable to find out why it went wrong.</string>
<string name="deny_label">Deny</string>

5
changelog.md
View File

@ -232,3 +232,8 @@
* added ability to open podcast from webpage address, reduced the error of "The podcast host\'s server sent a website, not a podcast"
* allows importing podcast from a web address, either through copy/paste or share.
* Youtube channels are accepted from external share or paste of address in podcast search view, and can be subscribed as a normal podcast. A channel is handled as a podcast feed, and videos in the channel are as episodes. Drawbacks now are playing of the video is not handled inside Podcini, but in Youtube app or the browser, and the play speed is not controlled by Podcini.
## 4.6.1
* fixed bug on intro- and end- skipping
* new notice on need of notifications for Android 13 and newer (in selected languages only )

5
fastlane/metadata/android/en-US/changelogs/3020126.txt Normal file
View File

@ -0,0 +1,5 @@
Version 4.6.1 brings several changes:
* fixed bug on intro- and end- skipping
* new notice on need of notifications for Android 13 and newer (in selected languages only )