diff --git a/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java b/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java index fde006a60..c7604e512 100644 --- a/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java +++ b/app/src/main/java/org/schabi/newpipe/QueueItemMenuUtil.java @@ -14,7 +14,7 @@ import org.schabi.newpipe.local.dialog.PlaylistDialog; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.player.playqueue.PlayQueueItem; import org.schabi.newpipe.util.NavigationHelper; -import org.schabi.newpipe.util.SaveUploaderUrlHelper; +import org.schabi.newpipe.util.SparseItemUtil; import java.util.Collections; @@ -62,7 +62,8 @@ public final class QueueItemMenuUtil { return true; case R.id.menu_item_channel_details: - SaveUploaderUrlHelper.saveUploaderUrlIfNeeded(context, item, + SparseItemUtil.fetchUploaderUrlIfSparse(context, item.getServiceId(), + item.getUrl(), item.getUploaderUrl(), // An intent must be used here. // Opening with FragmentManager transactions is not working, // as PlayQueueActivity doesn't use fragments. diff --git a/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java index eda9e19bc..7e87318ee 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogDefaultEntry.java @@ -1,7 +1,8 @@ package org.schabi.newpipe.info_list.dialog; -import static org.schabi.newpipe.info_list.dialog.StreamDialogEntry.fetchItemInfoIfSparse; import static org.schabi.newpipe.util.NavigationHelper.openChannelFragment; +import static org.schabi.newpipe.util.SparseItemUtil.fetchItemInfoIfSparse; +import static org.schabi.newpipe.util.SparseItemUtil.fetchUploaderUrlIfSparse; import android.net.Uri; @@ -14,7 +15,6 @@ import org.schabi.newpipe.local.dialog.PlaylistAppendDialog; import org.schabi.newpipe.local.dialog.PlaylistDialog; import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.NavigationHelper; -import org.schabi.newpipe.util.SaveUploaderUrlHelper; import org.schabi.newpipe.util.external_communication.KoreUtils; import org.schabi.newpipe.util.external_communication.ShareUtils; @@ -40,8 +40,8 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; */ public enum StreamDialogDefaultEntry { SHOW_CHANNEL_DETAILS(R.string.show_channel_details, (fragment, item) -> - SaveUploaderUrlHelper.saveUploaderUrlIfNeeded(fragment, item, - uploaderUrl -> openChannelFragment(fragment, item, uploaderUrl)) + fetchUploaderUrlIfSparse(fragment.requireContext(), item.getServiceId(), item.getUrl(), + item.getUploaderUrl(), url -> openChannelFragment(fragment, item, url)) ), /** diff --git a/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java index a8d361447..9d82e3b58 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/dialog/StreamDialogEntry.java @@ -6,19 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.StringRes; import androidx.fragment.app.Fragment; -import org.schabi.newpipe.error.ErrorInfo; -import org.schabi.newpipe.error.ErrorUtil; -import org.schabi.newpipe.error.UserAction; import org.schabi.newpipe.extractor.stream.StreamInfoItem; -import org.schabi.newpipe.extractor.stream.StreamType; -import org.schabi.newpipe.local.history.HistoryRecordManager; -import org.schabi.newpipe.player.playqueue.SinglePlayQueue; -import org.schabi.newpipe.util.ExtractorHelper; - -import java.util.function.Consumer; - -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.schedulers.Schedulers; public class StreamDialogEntry { @@ -40,52 +28,4 @@ public class StreamDialogEntry { public interface StreamDialogEntryAction { void onClick(Fragment fragment, StreamInfoItem infoItem); } - - /** - * Fetches a {@link StreamInfoItem} if it is incomplete and executes the callback. - *
- * This method is required if the info has been fetched - * via a {@link org.schabi.newpipe.extractor.feed.FeedExtractor}. - * FeedExtractors provide a fast and lightweight method to fetch info, - * but the info might be incomplete - * (see {@link org.schabi.newpipe.local.feed.service.FeedLoadService} for more details). - * @param context - * @param item the item which is checked and eventually loaded completely - * @param callback - */ - public static void fetchItemInfoIfSparse(@NonNull final Context context, - @NonNull final StreamInfoItem item, - @NonNull final Consumer callback) { - if (!(item.getStreamType() == StreamType.LIVE_STREAM - || item.getStreamType() == StreamType.AUDIO_LIVE_STREAM) - && item.getDuration() < 0) { - // Sparse item: fetched by fast fetch - ExtractorHelper.getStreamInfo( - item.getServiceId(), - item.getUrl(), - false - ) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(result -> { - final HistoryRecordManager recordManager = - new HistoryRecordManager(context); - recordManager.saveStreamState(result, 0) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .doOnError(throwable -> ErrorUtil.showSnackbar( - context, - new ErrorInfo(throwable, UserAction.REQUESTED_STREAM, - item.getUrl(), item.getServiceId()))) - .subscribe(); - - callback.accept(new SinglePlayQueue(result)); - }, throwable -> ErrorUtil.createNotification(context, - new ErrorInfo(throwable, UserAction.REQUESTED_CHANNEL, - "Could not fetch missing stream info"))); - } else { - callback.accept(new SinglePlayQueue(item)); - } - } - } diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java index db7da48f7..27009efd1 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java @@ -19,6 +19,8 @@ package org.schabi.newpipe.util; +import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; + import android.content.Context; import android.util.Log; import android.view.View; @@ -30,8 +32,6 @@ import androidx.preference.PreferenceManager; import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; -import org.schabi.newpipe.extractor.comments.CommentsInfoItem; -import org.schabi.newpipe.util.external_communication.TextLinkifier; import org.schabi.newpipe.extractor.Info; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.ListExtractor.InfoItemsPage; @@ -42,6 +42,7 @@ import org.schabi.newpipe.extractor.Page; import org.schabi.newpipe.extractor.StreamingService; import org.schabi.newpipe.extractor.channel.ChannelInfo; import org.schabi.newpipe.extractor.comments.CommentsInfo; +import org.schabi.newpipe.extractor.comments.CommentsInfoItem; import org.schabi.newpipe.extractor.feed.FeedExtractor; import org.schabi.newpipe.extractor.feed.FeedInfo; import org.schabi.newpipe.extractor.kiosk.KioskInfo; @@ -50,6 +51,7 @@ import org.schabi.newpipe.extractor.search.SearchInfo; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor; +import org.schabi.newpipe.util.external_communication.TextLinkifier; import java.util.Collections; import java.util.List; @@ -58,8 +60,6 @@ import io.reactivex.rxjava3.core.Maybe; import io.reactivex.rxjava3.core.Single; import io.reactivex.rxjava3.disposables.CompositeDisposable; -import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; - public final class ExtractorHelper { private static final String TAG = ExtractorHelper.class.getSimpleName(); private static final InfoCache CACHE = InfoCache.getInstance(); diff --git a/app/src/main/java/org/schabi/newpipe/util/SaveUploaderUrlHelper.java b/app/src/main/java/org/schabi/newpipe/util/SaveUploaderUrlHelper.java deleted file mode 100644 index 3c7b1ce91..000000000 --- a/app/src/main/java/org/schabi/newpipe/util/SaveUploaderUrlHelper.java +++ /dev/null @@ -1,94 +0,0 @@ -package org.schabi.newpipe.util; - -import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; - -import android.content.Context; -import android.widget.Toast; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - -import org.schabi.newpipe.NewPipeDatabase; -import org.schabi.newpipe.R; -import org.schabi.newpipe.error.ErrorInfo; -import org.schabi.newpipe.error.ErrorUtil; -import org.schabi.newpipe.error.UserAction; -import org.schabi.newpipe.extractor.stream.StreamInfoItem; -import org.schabi.newpipe.player.playqueue.PlayQueueItem; - -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.schedulers.Schedulers; - -/** - * Utility class for putting the uploader url into the database - when required. - */ -public final class SaveUploaderUrlHelper { - private SaveUploaderUrlHelper() { - } - - // Public functions which call the function that does - // the actual work with the correct parameters - public static void saveUploaderUrlIfNeeded(@NonNull final Fragment fragment, - @NonNull final StreamInfoItem infoItem, - @NonNull final SaveUploaderUrlCallback callback) { - saveUploaderUrlIfNeeded(fragment.requireContext(), - infoItem.getServiceId(), - infoItem.getUrl(), - infoItem.getUploaderUrl(), - callback); - } - public static void saveUploaderUrlIfNeeded(@NonNull final Context context, - @NonNull final PlayQueueItem queueItem, - @NonNull final SaveUploaderUrlCallback callback) { - saveUploaderUrlIfNeeded(context, - queueItem.getServiceId(), - queueItem.getUrl(), - queueItem.getUploaderUrl(), - callback); - } - - /** - * Fetches and saves the uploaderUrl if it is empty (meaning that it does - * not exist in the video item). The callback is called with either the - * fetched uploaderUrl, or the already saved uploaderUrl, but it is always - * called with a valid uploaderUrl that can be used to show channel details. - * - * @param context Context - * @param serviceId The serviceId of the item - * @param url The item url - * @param uploaderUrl The uploaderUrl of the item, if null or empty, it - * will be fetched using the item url. - * @param callback The callback that returns the fetched or existing - * uploaderUrl - */ - private static void saveUploaderUrlIfNeeded(@NonNull final Context context, - final int serviceId, - @NonNull final String url, - // Only used if not null or empty - @Nullable final String uploaderUrl, - @NonNull final SaveUploaderUrlCallback callback) { - if (isNullOrEmpty(uploaderUrl)) { - Toast.makeText(context, R.string.loading_channel_details, - Toast.LENGTH_SHORT).show(); - ExtractorHelper.getStreamInfo(serviceId, url, false) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(result -> { - NewPipeDatabase.getInstance(context).streamDAO() - .setUploaderUrl(serviceId, url, result.getUploaderUrl()) - .subscribeOn(Schedulers.io()).subscribe(); - callback.onCallback(result.getUploaderUrl()); - }, throwable -> ErrorUtil.createNotification(context, - new ErrorInfo(throwable, UserAction.REQUESTED_CHANNEL, - "Could not load channel details") - )); - } else { - callback.onCallback(uploaderUrl); - } - } - - public interface SaveUploaderUrlCallback { - void onCallback(@NonNull String uploaderUrl); - } -} diff --git a/app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java b/app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java new file mode 100644 index 000000000..51ae4ebee --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/util/SparseItemUtil.java @@ -0,0 +1,126 @@ +package org.schabi.newpipe.util; + +import static org.schabi.newpipe.extractor.stream.StreamType.AUDIO_LIVE_STREAM; +import static org.schabi.newpipe.extractor.stream.StreamType.LIVE_STREAM; +import static org.schabi.newpipe.extractor.utils.Utils.isNullOrEmpty; + +import android.content.Context; +import android.widget.Toast; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import org.schabi.newpipe.NewPipeDatabase; +import org.schabi.newpipe.R; +import org.schabi.newpipe.database.stream.model.StreamEntity; +import org.schabi.newpipe.error.ErrorInfo; +import org.schabi.newpipe.error.ErrorUtil; +import org.schabi.newpipe.error.UserAction; +import org.schabi.newpipe.extractor.stream.StreamInfo; +import org.schabi.newpipe.extractor.stream.StreamInfoItem; +import org.schabi.newpipe.player.playqueue.SinglePlayQueue; + +import java.util.function.Consumer; + +import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.schedulers.Schedulers; + +/** + * Utility class for fetching additional data for stream items when needed. + */ +public final class SparseItemUtil { + private SparseItemUtil() { + } + + /** + * Use this to certainly obtain an single play queue with all of the data filled in when the + * stream info item you are handling might be sparse, e.g. because it was fetched via a {@link + * org.schabi.newpipe.extractor.feed.FeedExtractor}. FeedExtractors provide a fast and + * lightweight method to fetch info, but the info might be incomplete (see + * {@link org.schabi.newpipe.local.feed.service.FeedLoadService} for more details). + * + * @param context the Android context + * @param item the item which is checked and eventually loaded completely + * @param callback the callback to call with the single play queue built from the original item + * if all info was available, otherwise from the fetched {@link + * org.schabi.newpipe.extractor.stream.StreamInfo} + */ + public static void fetchItemInfoIfSparse(@NonNull final Context context, + @NonNull final StreamInfoItem item, + @NonNull final Consumer callback) { + if ((!(item.getStreamType() == LIVE_STREAM || item.getStreamType() == AUDIO_LIVE_STREAM) + && item.getDuration() < 0) || isNullOrEmpty(item.getUploaderUrl())) { + fetchStreamInfoAndSaveToDatabase(context, item.getServiceId(), item.getUrl(), + streamInfo -> callback.accept(new SinglePlayQueue(streamInfo))); + } else { + // all info is already there, no need to fetch + callback.accept(new SinglePlayQueue(item)); + } + } + + /** + * Use this to certainly obtain an uploader url when the stream info item or play queue item you + * are handling might not have the uploader url (e.g. because it was fetched with {@link + * org.schabi.newpipe.extractor.feed.FeedExtractor}). A toast is shown if loading details is + * required. + * + * @param context the Android context + * @param serviceId the serviceId of the item + * @param url the item url + * @param uploaderUrl the uploaderUrl of the item; if null or empty will be fetched + * @param callback the callback called with either the original uploaderUrl, if it was a valid + * url, otherwise with the uploader url obtained by fetching the {@link + * org.schabi.newpipe.extractor.stream.StreamInfo} corresponding to the item + */ + public static void fetchUploaderUrlIfSparse(@NonNull final Context context, + final int serviceId, + @NonNull final String url, + @Nullable final String uploaderUrl, + @NonNull final Consumer callback) { + if (isNullOrEmpty(uploaderUrl)) { + fetchStreamInfoAndSaveToDatabase(context, serviceId, url, + streamInfo -> callback.accept(streamInfo.getUploaderUrl())); + } else { + callback.accept(uploaderUrl); + } + } + + /** + * Loads the stream info corresponding to the given data on an I/O thread, stores the result in + * the database and calls the callback on the main thread with the result. A toast will be shown + * to the user about loading stream details, so this needs to be called on the main thread. + * + * @param context the Android context + * @param serviceId the service id of the stream to load + * @param url the url of the stream to load + * @param callback the callback to call with the result + */ + private static void fetchStreamInfoAndSaveToDatabase(final Context context, + final int serviceId, + @NonNull final String url, + final Consumer callback) { + Toast.makeText(context, R.string.loading_stream_details, Toast.LENGTH_SHORT).show(); + ExtractorHelper.getStreamInfo(serviceId, url, false) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(result -> { + // save to database in the background (not on main thread) + Completable.fromAction(() -> NewPipeDatabase.getInstance(context) + .streamDAO().upsert(new StreamEntity(result))) + .subscribeOn(Schedulers.io()) + .observeOn(Schedulers.io()) + .doOnError(throwable -> + ErrorUtil.createNotification(context, + new ErrorInfo(throwable, UserAction.REQUESTED_STREAM, + "Saving stream info to database", result))) + .subscribe(); + + // call callback on main thread with the obtained result + callback.accept(result); + }, throwable -> ErrorUtil.createNotification(context, + new ErrorInfo(throwable, UserAction.REQUESTED_STREAM, + "Loading stream info: " + url, serviceId) + )); + } +} diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d25b478ef..38e1ec6db 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -688,8 +688,6 @@ معاينة مصغرة على شريط التمرير علّمه كفيديو تمت مشاهدته أُعجب بها منشئ المحتوى - جاري تحميل تفاصيل القناة… - خطأ في عرض تفاصيل القناة أظهر أشرطة ملونة لبيكاسو أعلى الصور تشير إلى مصدرها: الأحمر للشبكة والأزرق للقرص والأخضر للذاكرة إظهار مؤشرات الصور اقتراحات البحث عن بعد diff --git a/app/src/main/res/values-b+zh+HANS+CN/strings.xml b/app/src/main/res/values-b+zh+HANS+CN/strings.xml index d9f874de8..ff1da58f0 100644 --- a/app/src/main/res/values-b+zh+HANS+CN/strings.xml +++ b/app/src/main/res/values-b+zh+HANS+CN/strings.xml @@ -638,8 +638,6 @@ 高品质（较大） 被创作者喜爱 标记为已观看 - 加载频道详情中… - 显示频道详情时出错 在图像顶部显示毕加索彩带，指示其来源：红色代表网络，蓝色代表磁盘，绿色代表内存 显示图像指示器 远程搜索建议 diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 15e43a307..293c776bf 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -601,7 +601,6 @@ \nDegut a la nova política d\'edat de YouTube, el NewPipe no pot accedir a aquest contingut i per tant no pot reproduir-lo. Desactiveu per amagar la descripció i la informació addicional del vídeo Desactiva l\'entunelament del contingut - Carregant detalls del canal… Desactiva Activa Mode tablet @@ -671,7 +670,6 @@ NewPipe ha trobat un error, toca per informar Posa a la cua el següent vídeo Crear una notificació d\'error - Error en mostrar els detalls del canal Notificacions per informar d\'errors Mostra una barra d\'errors S\'estan comprovant les actualitzacions… diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index 2eacf992f..2fd83e4a3 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -641,8 +641,6 @@ دۆخی تابلێت کردنەوەی ماڵپەڕ پێشبینینی سەروێنەی گەڕان - وردەکارییەکانی کەناڵەکە بار دەکرێن… - هەڵە ڕوویدا لە پیشاندانی وردەکارییەکانی کەناڵ بەدڵکراوە لەلایەن بڵاوکەرەوە پیشان نەدرێت کواڵێتی نزم (بچووکتر) diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 2b9df57f7..c8519e1ec 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -658,8 +658,6 @@ Komentáře jsou vypnuty Srdíčko od tvůrce Označit jako zhlédnuté - Načítání podrobností kanálu… - Chyba při zobrazení prodrobností kanálu %1$s stažení smazáno %1$s stažení smazána diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0721ebfad..7f5bcc9fb 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -648,8 +648,6 @@ Angesehene Elemente anzeigen Als gesehen markieren Vom Ersteller mit Herz versehen - Kanaldetails werden geladen… - Fehler beim Anzeigen der Kanaldetails Farbige Picasso-Bänder über den Bildern anzeigen, die deren Quelle angeben: rot für Netzwerk, blau für Festplatte und grün für Speicher Bildindikatoren anzeigen Entfernte Suchvorschläge diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5e7fd4940..c47bbe85f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -648,8 +648,6 @@ Προεπισκόπηση στην μπάρα αναζήτησης Σήμανση ως αναπαραχθέν Επισημάνθηκε από τον δημιουργό - Φόρτωση λεπτομερειών καναλιού… - Σφάλμα στην εμφάνιση λεπτομερειών καναλιού Εμφάνιση χρωματιστής κορδέλας πάνω στις εικόνες, που δείχνει την πηγή τους: κόκκινη για δίκτυο, μπλε για δίσκο και πράσινο για μνήμη Εμφάνιση δεικτών εικόνων Προτάσεις απομακρυσμένης αναζήτησης diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 295fa22f8..eea86754f 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -652,8 +652,6 @@ Valorado por el creador Marcar como visto Mostrar cintas de colores Picasso encima de las imágenes indicando su origen: rojo para la red, azul para el disco y verde para la memoria - Cargando detalles del canal… - Error en Mostrar detalles del canal Mostrar indicadores de imagen Sugerencias de búsqueda remota Sugerencias de búsqueda local diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index c2fd8ef9e..bafcf55fa 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -648,8 +648,6 @@ \n \nNii et valik taandub sellele, mida eelistad: kiirus või täpne teave. Märgi vaadatuks - Laadin kanali andmeid… - Viga kanali lisateabe kuvamisel Näita piltide kohal Picasso värvides riba, mis märgib pildi allikat: punane tähistab võrku, sinine kohalikku andmekandjat ja roheline kohalikku mälu Näita piltide allikat Kaugotsingu soovitused diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 7a5e274b1..d9e93f976 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -646,8 +646,6 @@ Kalitate handia (handiagoa) Seekbarren miniaturen aurrebista Iruzkinak desaktibatuta daude - Kanalaren xehetasunak kargatzen… - Errorea kanalaren xehetasunak erakustean Sortzaileak baloratua Deskarga %1$s ezabatuta diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 34fda3cae..638f70573 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -660,8 +660,6 @@ به کار انداختن گزینش متن در شرح از کار انداختن گزینش متن در شرح - بار کردن جزییات کانال… - خطا در نمایش جزییات کانال برای برداشتن موارد، بکشیدشان اگر چرخش خودکار قفل باشد، ویدیوها را در پخش‌کنندهٔ کوچک آغاز نمی‌کند، بلکه مستقیماً به تمام‌صفحه می‌رود. همچنان می‌توانید با خروج از تمام‌صفحه به پخش‌کنندهٔ کوچک دسترسی داشته باشید آغاز پخش‌کنندهٔ اصلی در تمام‌صفحه diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 2bd6ccba8..bd2402224 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -648,8 +648,6 @@ Latauskansiota ei vielä asetettu, valitse ensin oletuslatauskansio Kommentit poistettu käytöstä Merkitse katsotuksi - Ladataan kanavan tietoja… - Virhe kanavan lisätietojen näyttämisessä Näytä Picasso-värjätyt nauhat kuvien päällä osoittaakseen lähteen: punainen tarkoittaa verkkoa, sininen tarkoittaa levytilaa ja vihreä tarkoittaa muistia Näytä kuvailmaisimet Etähakuehdotukset diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 50fe7b687..e908949eb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -650,8 +650,6 @@ Prévisualisation de la barre de progression sur la miniature Marquer comme visionné Apprécié par le créateur - Chargement des détails du canal… - Erreur lors de l’affichage des détails du canal Afficher les indicateurs d’image Suggestions de recherche distante Suggestions de recherche locale diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index bfe9710f4..f07c82b09 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -625,8 +625,6 @@ Desactivar para ocultar información adicional sobre o creador da emisión, do contido, ou da petición de procura Permitir a Android personalizar a cor da notificación conforme a cor principal da miniatura (esta opción non está dispoñíbel en todos os dispositivos) Marcar como visto - A carregar detalles da canle… - Erro en Mostrar detalles da canle Descarga inciada Conta cancelada O modo feed rápido non prové máis información sobre isto. diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index f3777c909..b25ed14e6 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -668,8 +668,6 @@ תמונה מוקטנת בסרגל הנגינה סומן בלב על ידי היוצר סימון כנצפה - פרטי הערוץ נטענים… - שגיאה בהצגת פרטי הערוץ הצגת סרטים בסגנון פיקאסו בראש התמונות לציון המקור שלהם: אדום זה מהרשת, כחול מהכונן וירוק מהזיכרון הצגת מחווני תמונות הצעות חיפוש מרוחקות diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 92e81f3c0..b99c9a101 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -659,8 +659,6 @@ Sada možeš odabrati tekst u opisu. Napomena: stranica će možda treperiti i možda nećeš moći kliknuti poveznice u načinu rada za odabir teksta. %s daje ovaj razlog: Obrada... Pričekajte trenutak - Pogreška pri prikazu detalja kanala - Učitavanje detalja o kanalu… Povucite stavke da biste ih uklonili Prikazati indikatore slike diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index cbe83c4ea..a4a17f848 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -620,7 +620,6 @@ Nyilvános Nem listázott Ki - Csatornarészletek betöltése… Nem található megfelelő fájlkezelő ehhez a művelethez. \nTelepítsen egy fájlkezelőt, vagy próbálja meg letiltani a következőt a letöltési beállításokban: „%s”. @@ -666,7 +665,6 @@ Kategória Címkék Adatvédelem - Hiba a csatornarészletek megjelenítésekor Gyors mód letiltása Igen, és távolítsa el a részben megnézett videókat is A videók, melyeket már megnézett miután a lejátszási listához adta őket, el lesznek távolítva. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 8c01bbbcb..54567c6e4 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -653,8 +653,6 @@ telah ditambahkan ke selanjutnya Tampilkan Ribon bewarna Picasso di atas gambar yang mengindikasikan asalnya: merah untuk jaringan, biru untuk disk dan hijau untuk memori Jangan memulai memutar video di mini player, tapi nyalakan langsung di mode layar penuh, jika rotasi otomatis terkunci. Anda tetap dapat mengakses mini player dengan keluar dari layar penuh - Memuat Detail Channel… - Galat Menampilkan Detail Channel Memproses… Mungkin butuh waktu sebentar Periksa Pembaruan Periksa manual untuk versi baru diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 90a9cc9c3..98034b348 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -648,8 +648,6 @@ Commenti disattivati Apprezzato dall\'autore Segna come visto - Caricamento dettagli canale… - Errore per \"Mostra dettagli canale\" Mostra gli indicatori colorati Picasso sopra le immagini, per indicare la loro fonte: rosso per la rete, blu per il disco e verde per la memoria Mostra indicatori immagine Suggerimenti di ricerca remoti diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 74a90752c..4f2d80653 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -637,8 +637,6 @@ シークバーのサムネイルプレビュー コメントは無効です 視聴済みとしてマーク - チャンネルの詳細の表示でエラー - チャンネルの詳細を読み込み中… リモート検索候補 ローカル検索候補 アイテムをスワイプして削除 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 658b30129..799a26ca0 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -658,8 +658,6 @@ Nerodyti Širdelė nuo kurėjo Pažymėti kaip peržiūrėtą - Įkeliama kanalo išsami informacija… - Klaida rodant kanalo išsamią informaciją Rodyti „Picasso“ spalvotas juosteles ant vaizdų, nurodančių jų šaltinį: raudona tinklui, mėlyna diskui ir žalia atmintis Rodyti vaizdo indikatorius Nuotolinės paieškos pasiūlymai diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 6f83ce867..a4757c51a 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -662,8 +662,6 @@ Autors piekrīt Atvērt mājaslapu Tabletes režīms - Kļūda rādot kanāla informāciju - Ielādē kanāla informāciju… Zemas kvalitātes (mazāks) Privātums Sarakstā neiekļauts diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 959e4c5af..0e5189564 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -611,8 +611,6 @@ സ്നേഹത്തോടെ സൃഷ്ടാവ് ഡിസ്ക്രിപ്ഷനിലെ ടെക്സ്റ്റ്‌ സെലക്ട്‌ ചെയ്യുവാൻ അനുവദിക്കാതെ ഇരിക്കുക ഡിസ്ക്രിപ്ഷനിലെ ടെക്സ്റ്റ്‌ സെലക്ട്‌ ചെയ്യാൻ അനുവദിക്കുക - ചാനൽ വിശദാംശങ്ങൾ ലോഡ് ചെയ്യുന്നു… - ചാനൽ വിശദാംശങ്ങൾ കാണിക്കുന്നതിൽ പിശക് സംഭവിച്ചു ഓഫ്‌ ഓൺ വെബ്സൈറ്റ് തുറക്കുക diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 1735bd0c1..84363dc9b 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -652,14 +652,12 @@ Slettet én nedlastning Slettet %1$s nedlastninger - Laster inn kanaldetaljer … Søkeforslag annensteds fra Lokale søkeforslag Marker som sett Ikke start videoer i minispilleren, men gå til fullskjermsmodus direkte, hvis auto-rotering er låst. Du har fremdeles tilgang til minispilleren ved å avslutte fullskjermsvisning. Vis Picasso-fargede bånd på toppen av bilder for å indikere kilde: Rød for nettverk, blå for disk, og grønn for minne Hjertemerket av skaper - Kunne ikke vise kanaldetaljer Vis bildeindikatorer Dra elementer for å fjerne dem Start hovedspiller i fullskjerm diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e9f20e620..3941eb4e3 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -641,8 +641,6 @@ Het \'Storage Access Framework\' is niet ondersteund op Android KitKat en lager U wordt gevraagd waar elk bestand wordt opgeslagen Nog geen downloadfolder gekozen, kies de standaard downloadfolder - Kanaaldetails laden… - Error tijdens tonen van kanaal details Geliefd door de maker Niet laten zien Lage kwaliteit (kleiner) diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f0e74e4b8..1a9dd3c6f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -663,8 +663,6 @@ Nie pokazuj Serduszko od twórcy Oznacz jako obejrzane - Ładowanie szczegółów kanału… - Błąd podczas wyświetlania szczegółów kanału Pokazuj kolorowe wstążki Picasso nad obrazami wskazujące ich źródło: czerwone dla sieci, niebieskie dla dysku i zielone dla pamięci Pokazuj wskaźniki obrazu Zdalne podpowiedzi wyszukiwania diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a445bf9c1..83e7cc200 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -649,8 +649,6 @@ Marcar como visto Curtido pelo criador Exibir fitas coloridas no topo das imagens indicando sua fonte: vermelho para rede, azul para disco e verde para memória - Carregando detalhes do canal… - Erro ao exibir detalhes do canal %1$s download apagado %1$s downloads apagados diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 72f05896a..d133bd83c 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -648,8 +648,6 @@ Ainda não foi definida uma pasta de descarregamento, escolha agora a pasta de descarregamento padrão Comentários estão desativados Marcar como visto - A carregar detalhes do canal… - Erro em Mostrar detalhes do canal Mostrar fitas coloridas de Picasso em cima das imagens que indicam a sua fonte: vermelho para rede, azul para disco e verde para memória Mostrar indicadores de imagem Sugestões de pesquisa remotas diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 7d9f6f959..e7a9e0778 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -648,8 +648,6 @@ Baixa qualidade (menor) Alta qualidade (maior) Comentários estão desativados - A carregar detalhes do canal… - Erro em Mostrar detalhes do canal Mostrar fitas coloridas de Picasso em cima das imagens que indicam a sua fonte: vermelho para rede, azul para disco e verde para memória Mostrar indicadores de imagem Sugestões de pesquisa remotas diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 774512671..e4287a748 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -619,8 +619,6 @@ Următorul pus în coadă Adăugați în coadă pe următorul Marcare ca vizionat - Încărcare Detalii canal… - Eroare la Afișare detalii canal Oprit Pornit Mod tabletă diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index dd72474e7..e3e7ac718 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -660,8 +660,6 @@ Миниатюра над полосой прокрутки Автору видео понравилось это Пометить как проигранные - Не удалось отобразить сведения о канале - Загрузка сведений о канале… Picasso: указать цветом источник изображений (красный — сеть, синий — диск, зелёный — память) Цветные метки на изображениях Серверные предложения поиска diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 599c4a97b..19ec36845 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -648,8 +648,6 @@ Sos cummentos sunt disabilitados Su creadore b\'at postu unu coro Marca comente pompiadu - Carrighende sos detàllios de su canale… - Errore in sa visualizatzione de sos detàllios de su canale Ammustra sos listrones colorados de Picasso in subra de sas immàgines chi indicant sa fonte issoro: ruja pro sa retze, biaita pro su discu e birde pro sa memòria Ammustra sos indicadores de immàgines Impòsitos de chirca remota diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 13ecd5190..71e29b173 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -648,8 +648,6 @@ Pri každom sťahovaní sa zobrazí výzva kam uložiť súbor Nie je nastavený adresár na sťahovanie, nastavte ho teraz Označiť ako pozorované - Načítavanie podrobností o kanáli… - Chyba pri zobrazení podrobností kanála Vypnuté Zapnuté Režim tabletu diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index 5a9d19448..94602b21b 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -647,8 +647,6 @@ Fallooyinka waa laxidhay Kahelay soosaaraha Waan daawaday - Khalad ayaa ka dhacay Faahfaahinta Kanaalka - Soo kicinaya faahfaahinta Kanaalka… Soo bandhig shaambado midabka Picasso leh sawirrada dushooda oo tilmaamaya isha laga keenay: guduud waa khadka, buluug waa kaydka gudaha, cagaar waa kaydka K/G Tus tilmaamayaasha sawirka Soojeedinada raadinta banaanka diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 641722771..712de29b2 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -647,10 +647,8 @@ Du kan välja det natt-tema du föredrar nedan Välj det natt-tema du föredrar — %s Sökradens förhandsvisningsminiatyr - Laddar kanaldetaljer… Visa bildindikatorer Lokala sökningsförslag - Kunde inte visa kanaldetaljer Tog bort %1$s nedladdning Tog bort %1$s nedladdningar diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 62368b84b..73a656f70 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -330,7 +330,6 @@ அடுத்தைச் சாரைபடுத்து அடுத்தது சாரைபடுத்தப்பட்டது மறுபெயரிடு - பதிவுத்தட விவரங்களை ஏற்றுகிறது… ஒளிச்சர நூற்குறிகள் இன்னுமில நூற்குறியை நீக்கு ஒளிச்சர சிறுபடமாக அமை @@ -338,7 +337,6 @@ மாற்றீடு வரியுரு ஒளிச்சரப் பக்கம் ஒன்றிணைக்கா சந்தாக்களை மட்டும் காட்டு - பதிவுத்தட விவரங்களைக் காட்டுவதில் பிழை அமைவையும் இறக்குமதி செய்யவா\? பின்னணியில் இயங்கத் துவங்கு diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0263336c7..6ddec0ddc 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -648,8 +648,6 @@ Yorumlar devre dışı Yaratıcısınca kalplendi İzlendi olarak imle - Kanal Ayrıntıları Yükleniyor… - Kanal Ayrıntılarını Göstermede Hata Resimlerin üzerinde kaynaklarını gösteren Picasso renkli şeritler göster: ağ için kırmızı, disk için mavi ve bellek için yeşil Resim göstergelerini göster Uzak arama önerileri diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 4a47fe100..a84f6f446 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -659,8 +659,6 @@ Мініатюра з попереднім переглядом на повзунку поступу Вподобано автором Позначити переглянутим - Завантаження відомостей про канал… - Помилка показу відомостей про канал Показувати кольорові стрічки Пікассо поверх зображень із зазначенням їх джерела: червоний для мережі, синій для диска та зелений для пам’яті Показати індикатори зображень Віддалені пропозиції пошуку diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 0d528a3b9..0f1fc267e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -637,8 +637,6 @@ Bình luận đang bị tắt Đã được người tạo gắn tim Đánh dấu là đã xem - Đang tải chi tiết kênh… - Lỗi tại Hiện chi tiết kênh Hiện ruy băng được tô màu Picasso ở trên cùng các hình ảnh và chỉ ra nguồn của chúng: đỏ đối với mạng, xanh lam đối với ổ đĩa và xanh lá đối với bộ nhớ Hiện dấu chỉ hình ảnh Đề xuất tìm kiếm trên mạng diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 233174f06..041d6a317 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -459,7 +459,6 @@ 伺服器唔接受多執行緒下載，請改用 @string/msg_threads = 1 再試下啦 連接唔到伺服器 播放清單頁面 - 載入緊頻道詳情… 撳住就輪候 目的地資料夾建立唔到 建立唔到安全連線 @@ -525,7 +524,6 @@ 創作者畀咗心心 開啟網站 關 - 顯示頻道詳情嘅時候有問題 主機 喺影片「詳情：」度撳一下「幕後播」或者「浮面播」個掣嘅時候顯示提示 紀錄 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 53dc34025..faf937e4e 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -638,8 +638,6 @@ 拖動列縮圖預覽 被創作者加心號 標記為已觀看 - 正在載入頻道詳細資訊…… - 顯示頻道詳細資訊時發生錯誤 在圖片頂部顯示畢卡索彩色絲帶，指示其來源：紅色代表網路、藍色代表磁碟、綠色代表記憶體 顯示圖片指示器 遠端搜尋建議 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a249f1731..c1264e66b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -405,6 +405,7 @@ Enqueued next Start playing in the background Start playing in a popup + Loading stream details… Open Drawer Close Drawer @@ -715,9 +716,6 @@ Tablet mode On Off - - Error at Show Channel Details - Loading Channel Details… ExoPlayer default \ No newline at end of file