Merge branch 'dev' into release

app/src/leanback/java/com/fongmi/android/tv/ui/dialog/LiveDialog.java

@@ -49,7 +49,6 @@ public class LiveDialog implements LiveAdapter.OnClickListener {
         binding.recycler.setHasFixedSize(true);
         binding.recycler.setItemAnimator(null);
         binding.recycler.addItemDecoration(new SpaceItemDecoration(1, 16));
-        binding.recycler.setLayoutManager(new GridLayoutManager(dialog.getContext(), 1));
         binding.recycler.post(() -> binding.recycler.scrollToPosition(LiveConfig.getHomeIndex()));
     }
 

app/src/leanback/res/layout/dialog_doh.xml

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.fongmi.android.tv.ui.custom.CustomRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recycler"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:padding="16dp"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    app:maxHeight="352dp" />
+    app:maxHeight="296dp"
+    tools:itemCount="5"
+    tools:listitem="@layout/adapter_doh" />

app/src/leanback/res/layout/dialog_live.xml

@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp"
+    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
     app:maxHeight="296dp"
     tools:itemCount="5"
     tools:listitem="@layout/adapter_live" />

catvod/src/main/java/com/github/catvod/net/interceptor/DefaultInterceptor.java

@@ -1,5 +1,7 @@
 package com.github.catvod.net.interceptor;
 
+import android.net.Uri;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -45,9 +47,13 @@ public class DefaultInterceptor implements Interceptor {
     }
 
     private void checkAuth(Response response, String location) {
-        URI uri = URI.create(location);
-        if (uri.getUserInfo() == null) return;
-        response.header(HttpHeaders.AUTHORIZATION, Util.basic(uri.getUserInfo()));
+        try {
+            Uri uri = Uri.parse(location);
+            if (uri.getUserInfo() == null) return;
+            response.header(HttpHeaders.AUTHORIZATION, Util.basic(uri.getUserInfo()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     private Response deflate(Response response) {