diff --git a/app/build.gradle b/app/build.gradle index 76c6de22..a515a510 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/src/main/java/ac/mdiq/podcini/service/playback/PlaybackService.kt b/app/src/main/java/ac/mdiq/podcini/service/playback/PlaybackService.kt index 45162860..5fd23b3b 100644 --- a/app/src/main/java/ac/mdiq/podcini/service/playback/PlaybackService.kt +++ b/app/src/main/java/ac/mdiq/podcini/service/playback/PlaybackService.kt @@ -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) diff --git a/app/src/main/java/ac/mdiq/podcini/ui/dialog/FeedPreferenceSkipDialog.kt b/app/src/main/java/ac/mdiq/podcini/ui/dialog/FeedPreferenceSkipDialog.kt index 0e49c981..4a5eb1f2 100644 --- a/app/src/main/java/ac/mdiq/podcini/ui/dialog/FeedPreferenceSkipDialog.kt +++ b/app/src/main/java/ac/mdiq/podcini/ui/dialog/FeedPreferenceSkipDialog.kt @@ -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 diff --git a/app/src/main/java/ac/mdiq/podcini/ui/fragment/FeedSettingsFragment.kt b/app/src/main/java/ac/mdiq/podcini/ui/fragment/FeedSettingsFragment.kt index 5394acbb..fde3080d 100644 --- a/app/src/main/java/ac/mdiq/podcini/ui/fragment/FeedSettingsFragment.kt +++ b/app/src/main/java/ac/mdiq/podcini/ui/fragment/FeedSettingsFragment.kt @@ -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 diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1134ecc1..ff45b61b 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -48,12 +48,10 @@ - - - - - - لقد رفضت السماح بلإشعارات + منذ Android 13، هناك حاجة إلى إشعار المستوى الأعلى للتحديث والتشغيل + العادي. يمكنك عدم السماح بإشعارات الفئات الفرعية حسب رغبتك. + + لقد رفضت السماح بلإشعارات افتح الإعدادات أضبط شاشة المنزل diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8be97cb3..84adc358 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -46,7 +46,6 @@ Reproduït entre entre %1$s i %2$s Reproduït en total - 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. S\'ha denegat el permís per a les notificacions Denega Obre la configuració diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 4840cc71..e0bb3451 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -46,8 +46,7 @@ Přehráno mezi 1%1$s a 2%2$s Celkem přehnáno - 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í. - Zamítli jste oprávnění. +\ Zamítli jste oprávnění. Pokud oznámení zakážete a něco se pokazí, nemusí se vám podařit zjistit proč. Zakázat Otevřít nastavení diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 759bcb47..7d84bad6 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -46,7 +46,6 @@ Afspillet mellem %1$s og %2$s Afspillet i alt - 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. Du afviste tilladelsen. Hvis du deaktiverer notifikationer, og noget går galt, kan du måske ikke finde ud af, hvorfor det gik galt. Nægt diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 7b2686d1..bfe434b2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -46,8 +46,11 @@ Abgespielt zwischen %1$s und %2$s Insgesamt abgespielt - 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. - Du hast die Berechtigung abgelehnt. + 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. + + Du hast die Berechtigung abgelehnt. Wenn die Benachrichtigungen deaktiviert werden und etwas schief geht, kannst du möglicherweise nicht herausfinden, warum dies passiert ist. Ablehnen Einstellungen öffnen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 014b575c..e037ad20 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -46,8 +46,10 @@ Reproducido entre%1$s y %2$s Reproducido en total - Podcini necesita - Denegaste el permiso. + 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. + + Denegaste el permiso. Si deshabilita las notificaciones y se produce un error, puede no encontrarlo posteriormente. Denegar Abrir ajustes diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 2892ca7d..fea185ee 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -46,13 +46,6 @@ %1$s eta %2$s bitartean joa Joa guztira - - - - - - - Podciniek zure baimena behar du jakinarazpenak bistaratzeko. Modu lehenetsian Podciniek bi kasutan soilik erakusten ditu jakinarazpenak: zerbait deskargatu bitartean edo zerbait oker doanean. Baimena ukatu duzu. Ukatu Ireki ezarpenak diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 339fd444..280a25a8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -46,8 +46,11 @@ Lu entre %1$s et %2$s De durée de lecture - 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. - Vous avez refusé l\'autorisation. + 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. + + Vous avez refusé l\'autorisation. Si vous désactivez les notifications et que quelque chose pose problème vous risquez de ne pas comprendre pourquoi. Refuser Ouvrir les préférences diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 7488999c..f87f088b 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -46,15 +46,7 @@ Reproducido entre %1$s e %2$s Total reproducido - - - - - - - - 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. - Non outorgaches o permiso + Non outorgaches o permiso Se desactivas as notificacións e algo vai fall, é posible que non coñezas a razón do fallo. Rexeitar Ir aos axustes diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 86e8a8a9..7d1b0551 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,8 +46,11 @@ Riprodotto fra %1$s e %2$s Riprodotto in totale - 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. - Hai negato l\'autorizzazione. + 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. + + Hai negato l\'autorizzazione. Se disabiliti le notifiche e qualcosa va storto, potresti non essere in grado di individuare la causa del problema. Nega Apri le impostazioni diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 236ec202..9c2a3561 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -46,14 +46,6 @@ התנגן בין %1$s לבין %2$s התנגן בסך הכול - - - - - - - - לאנטנה־פּוֹד דרושה ההרשאה שלך להציג התראות. כברירת מחדל, אנטנה־פּוֹד תציג הורדות רק כשמשהו יורד או משהו השתבש. דחית את בקשת ההרשאה. אם בחרת להשבית את ההתראות ומשהו משתבש, יכול להיות שהתקלה תחמוק מעיניך. דחייה diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 77a1593e..c24617a0 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -35,12 +35,10 @@ - - - - - - ホーム画面の設定 + Android 13 以降、通常の更新と再生にはトップレベルの通知が必要です。 + ご希望に応じて、サブカテゴリの通知を禁止することができます。 + + ホーム画面の設定 デバイス上のエピソードの合計サイズ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 1ea0a49b..59106f86 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -47,12 +47,10 @@ - - - - - - Nie udzielono zgody. + 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. + + Nie udzielono zgody. Otwórz ustawienia Konfiguruj stronę główną diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 49068e2e..d8a7ca37 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -46,7 +46,10 @@ Reproduzidos entre %1$s e %2$s Reproduzidos no total - Você negou a permissão. + 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. + + Você negou a permissão. Abrir as configurações Configurar Página Principal diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b09f629a..b7061b6f 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -46,8 +46,10 @@ Reproduzidos entre %1$s e %2$s Total - 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. - Permissões recusadas + 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. + + Permissões recusadas Se desativar as notificações e ocorrer algum erro, não receberá quaisquer informações acerca desse erro Recusar Abrir definições diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index bf32fba3..461a9b9b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -46,7 +46,6 @@ Redat între %1$s și %2$s Redat în total - 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. Ați refuzat permisiunea. Dacă dezactivezi notificările și ceva nu funcționează corect, există posibilitatea de a nu putea să afli ce a mers greșit. Refuză diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a0460cda..7cd627b4 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -46,7 +46,6 @@ Prehrané medzi %1$s a %2$s Prehrané celkom - 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í. Odmietli ste povolenie. Ak vypnete upozornenia a niečo sa nepodarí, možno nebudete môcť zistiť, prečo sa to nepodarilo. Odmietnuť diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d11959f7..375a2232 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -46,7 +46,6 @@ Spelat mellan %1$s och %2$s Spelat totalt - 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. Du nekade behörigheten. Om du stänger av notiser och något går fel kan det vara svårt att få reda på varför. Neka diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 5210116e..8e9109ff 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -48,12 +48,10 @@ - - - - - - İzni reddettiniz + 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. + + İzni reddettiniz Ayarları aç Ana Ekranı Özelleştir diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index fee49c8f..d21f7a27 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -46,7 +46,6 @@ Прослухано між %1$sта%2$s Прослухано взагалі - Podcini потрібен ваш дозвіл, щоб показувати сповіщення. За замовчуванням Podcini показує сповіщення лише під час завантаження або коли щось йде не так. Ви відмовили у дозволі. Якщо ви вимкнете сповіщення і щось піде не так, то, можливо, ви не зможете з\'ясувати, чому це сталося. Блокувати diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b63ae467..d8bcbb24 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -47,14 +47,10 @@ 总播放 - - - - - - - Podcini 需要你的许可方能显示通知。默认情况下,Podcini 只显示和进行中的下载或错误相关的通知 - 你拒绝授予该权限 + 从 Android 13 开始,正常刷新和播放需要顶级通知。 + 您可以根据自己的意愿禁止子类别的通知。 + + 你拒绝授予该权限 如果你禁用了通知,且出现了错误,你可能无法找出出错的原因 拒绝 打开设置 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 4c1cd362..1187dc4b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -29,7 +29,10 @@ - 打開選單 + 從 Android 13 開始,正常刷新和播放需要頂級通知。 + 您可以根據自己的意願禁止子類別的通知。 + + 打開選單 關閉選單 按計數器排序 按字母排序 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 47c3dbcb..e6d593c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -58,7 +58,7 @@ Played between %1$s and %2$s Played in total - Podcini needs your permission to show notifications. By default, Podcini only shows notifications while something is being downloaded or when something goes wrong. + Since Android 13, top level notification is needed for normal refresh and playback. You may disallow notifications of sub-catergories at your wish. You denied the permission. If you disable notifications and something goes wrong, you might be unable to find out why it went wrong. Deny diff --git a/changelog.md b/changelog.md index c1269e2f..19790297 100644 --- a/changelog.md +++ b/changelog.md @@ -231,4 +231,9 @@ * added more info in online feed view * 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. \ No newline at end of file +* 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 ) \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/3020126.txt b/fastlane/metadata/android/en-US/changelogs/3020126.txt new file mode 100644 index 00000000..91f425ca --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/3020126.txt @@ -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 )