Skip to content

Commit 09774a2

Browse files
committed
Better error message, when fetching metadat fails
1 parent d0728b1 commit 09774a2

File tree

61 files changed

+11
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+11
-63
lines changed

app/src/main/java/org/schabi/newpipe/settings/services/instances/AbstractServiceInstanceListFragment.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.annotation.SuppressLint;
44
import android.os.Bundle;
5+
import android.util.Log;
56
import android.view.LayoutInflater;
67
import android.view.Menu;
78
import android.view.MenuInflater;
@@ -23,6 +24,7 @@
2324
import androidx.recyclerview.widget.LinearLayoutManager;
2425
import androidx.recyclerview.widget.RecyclerView;
2526

27+
import org.schabi.newpipe.MainActivity;
2628
import org.schabi.newpipe.R;
2729
import org.schabi.newpipe.databinding.FragmentInstanceListBinding;
2830
import org.schabi.newpipe.databinding.InstanceTypeFloatingItemBinding;
@@ -45,7 +47,7 @@
4547
import io.reactivex.rxjava3.schedulers.Schedulers;
4648

4749
public abstract class AbstractServiceInstanceListFragment<I extends Instance> extends Fragment {
48-
50+
protected static final String TAG = "AbsServiceInstanceLFrag";
4951
protected static final int TYPES_CONTAINER_ANIMATION_DURATION = 500;
5052

5153
@StringRes
@@ -253,9 +255,14 @@ protected void addInstance(final I createdInstance) {
253255
add(instance);
254256
}, e -> {
255257
binding.loadingProgressBar.setVisibility(View.GONE);
258+
if (MainActivity.DEBUG) {
259+
Log.w(TAG, "Failed to validate instance", e);
260+
}
256261
Toast.makeText(getActivity(),
257-
R.string.could_not_validate_instance,
258-
Toast.LENGTH_SHORT).show();
262+
requireContext().getString(
263+
R.string.could_not_validate_instance,
264+
e.getMessage() != null ? e.getMessage() : "no message"),
265+
Toast.LENGTH_LONG).show();
259266
});
260267
disposables.add(disposable);
261268
}

app/src/main/res/values-ar/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@
457457
<string name="peertube_instance_url_title">مثيلات خوادم پيرتيوب</string>
458458
<string name="peertube_instance_url_summary">حدد مثيلات PeerTube المفضلة لديك</string>
459459
<string name="enter_instance_url">أدخل عنوان للمثيل</string>
460-
<string name="could_not_validate_instance">لا يمكن التحقق من صحة المثال</string>
461460
<string name="instance_already_exists">مثيل الخادم موجود بالفعل</string>
462461
<string name="local">محلي</string>
463462
<string name="recently_added">أُضيف مؤخرًا</string>

app/src/main/res/values-b+ast/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@
260260
<string name="import_complete_toast">Importóse</string>
261261
<string name="could_not_import_all_files">Alvertencia: nun pudieron importase tolos ficheros.</string>
262262
<string name="settings_category_updates_title">Anovamientos</string>
263-
<string name="could_not_validate_instance">Nun pudo validase la instancia</string>
264263
<plurals name="minutes">
265264
<item quantity="one">%d minutu</item>
266265
<item quantity="other">%d minutos</item>

app/src/main/res/values-b+uz+Latn/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
<string name="settings_category_player_behavior_title">Xatti-harakat</string>
145145
<string name="settings_category_player_title">Ijro etish</string>
146146
<string name="instance_already_exists">Namuna allaqachon mavjud</string>
147-
<string name="could_not_validate_instance">Namunani tasdiqlab bo\'lmadi</string>
148147
<string name="enter_instance_url">Namuna URL manzilini kiriting</string>
149148
<string name="peertube_instance_url_summary">Sevimli PeerTube nusxalarini tanlang</string>
150149
<string name="peertube_instance_url_title">PeerTube misollari</string>

app/src/main/res/values-b+zh+HANS+CN/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,6 @@
431431
<string name="peertube_instance_url_title">PeerTube 服务器</string>
432432
<string name="peertube_instance_url_summary">设置自定义 PeerTube 服务器</string>
433433
<string name="enter_instance_url">输入服务器网址(URL)</string>
434-
<string name="could_not_validate_instance">无法验证服务器</string>
435434
<string name="instance_already_exists">该服务器已存在</string>
436435
<string name="local">本地</string>
437436
<string name="recently_added">最近添加</string>

app/src/main/res/values-be/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,6 @@
435435
<string name="show_original_time_ago_summary">Арыгінальныя тэксты з сэрвісаў будуць бачны ў ленце элементаў</string>
436436
<string name="clear_cookie_summary">Ачысціце cookie, якія NewPipe захоўвае пры рашэнні reCAPTCHA</string>
437437
<string name="instance_already_exists">Экзэмпляр ужо існуе</string>
438-
<string name="could_not_validate_instance">Немагчыма праверыць экзэмпляр</string>
439438
<string name="enter_instance_url">Увесці URL экзэмпляра</string>
440439
<string name="peertube_instance_url_summary">Абярыце любімыя экзэмпляры PeerTube</string>
441440
<string name="clear_queue_confirmation_description">Актыўны плэер быў зменены</string>

app/src/main/res/values-bn/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@
345345
<string name="empty_subscription_feed_subtitle">ঝিঝিপোকা ছাড়া কিছুই নেই এখানে</string>
346346
<string name="invalid_source">এই ধরনের কোন ফাইল/বিষয়বস্তুর উৎস নেই</string>
347347
<string name="player_unrecoverable_failure">অপুনরুদ্ধারযোগ্য প্লেয়ার ত্রুটি ঘটেছে</string>
348-
<string name="could_not_validate_instance">ইন্সট্যান্সটি যাচাই করা যায়নি</string>
349348
<string name="recaptcha_cookies_cleared">রিক্যাপচা কুকিগুলো পরিষ্কার করা হয়েছে</string>
350349
<string name="remove_watched_popup_yes_and_partially_watched_videos">হ্যাঁ, এবং আংশিকভাবে দেখা ভিডিও</string>
351350
<string name="permission_denied">ব্যবস্থা দ্বারা ক্রিয়া অস্বীকার করা হয়েছে</string>

app/src/main/res/values-ca/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,6 @@
451451
\nSi desitgeu visualitzar-lo, activeu \"%1$s\" a paràmetres.</string>
452452
<string name="youtube_restricted_mode_enabled_title">Activa el \"mode restringit\" de YouTube</string>
453453
<string name="instance_already_exists">La instància introduïda ja existeix</string>
454-
<string name="could_not_validate_instance">No ha estat possible validar la instància</string>
455454
<string name="enter_instance_url">Introdueix l\'enllaç d\'una instància</string>
456455
<string name="peertube_instance_url_summary">Selecciona les teves instàncies preferides del PeerTube</string>
457456
<string name="peertube_instance_url_title">Instàncies del PeerTube</string>

app/src/main/res/values-ckb/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@
475475
<string name="error_report_title">هەڵە لە سكاڵا</string>
476476
<string name="metadata_cache_wipe_summary">سڕینەوەی پاشماوەی هەموو ماڵپه‌ڕه‌كان</string>
477477
<string name="kore_not_found">بەرنامەکە نه‌دۆزرایه‌وه‌. دابمه‌زرێت؟</string>
478-
<string name="could_not_validate_instance">ناتوانرێ پشتگیری دۆخەکە بکرێ</string>
479478
<string name="install">دامەزراندن</string>
480479
<string name="videos_string">ڤیدیۆکان</string>
481480
<string name="unsupported_url">بەستەرەکە پشتگیری نەکراوە</string>

app/src/main/res/values-cs/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@
442442
<string name="peertube_instance_url_title">Instance PeerTube</string>
443443
<string name="peertube_instance_url_summary">Vybrat oblíbené instance PeerTube</string>
444444
<string name="enter_instance_url">Zadat URL instance</string>
445-
<string name="could_not_validate_instance">Instanci nebylo možno potvrdit</string>
446445
<string name="instance_already_exists">Instance již existuje</string>
447446
<string name="local">Místní</string>
448447
<string name="recently_added">Přidány nedávno</string>

0 commit comments

Comments
 (0)