From ca6fc3cc2637e2a4fd43212e88424bd63cbc67f8 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 12 Mar 2024 21:25:56 +0800
Subject: [PATCH 1/2] Fix crash

---
 .../com/github/catvod/net/OkCookieJar.java    | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
index c37633884..9e2535083 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
@@ -6,6 +6,8 @@ import android.webkit.CookieManager;
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import okhttp3.Cookie;
@@ -14,23 +16,24 @@ import okhttp3.HttpUrl;
 
 public class OkCookieJar implements CookieJar {
 
-    private final CookieManager manager;
-
-    public OkCookieJar() {
-        manager = CookieManager.getInstance();
-    }
-
     @NonNull
     @Override
     public synchronized List<Cookie> loadForRequest(@NonNull HttpUrl url) {
-        List<Cookie> items = new ArrayList<>();
-        String cookie = manager.getCookie(url.toString());
-        if (!TextUtils.isEmpty(cookie)) for (String split : cookie.split(";")) items.add(Cookie.parse(url, split));
-        return items;
+        try {
+            List<Cookie> items = new ArrayList<>();
+            String cookie = CookieManager.getInstance().getCookie(url.toString());
+            if (!TextUtils.isEmpty(cookie)) for (String split : cookie.split(";")) items.add(Cookie.parse(url, split));
+            return items;
+        } catch (Throwable e) {
+            return new ArrayList<>();
+        }
     }
 
     @Override
     public synchronized void saveFromResponse(@NonNull HttpUrl url, List<Cookie> cookies) {
-        for (Cookie cookie : cookies) manager.setCookie(url.toString(), cookie.toString());
+        try {
+            for (Cookie cookie : cookies) CookieManager.getInstance().setCookie(url.toString(), cookie.toString());
+        } catch (Throwable ignored) {
+        }
     }
 }
\ No newline at end of file

From d69a7ebd72f87442bfb81ce40c8f854d28f9a36c Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 12 Mar 2024 21:26:52 +0800
Subject: [PATCH 2/2] Fix crash

---
 catvod/src/main/java/com/github/catvod/net/OkCookieJar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
index 9e2535083..31dd93265 100644
--- a/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
+++ b/catvod/src/main/java/com/github/catvod/net/OkCookieJar.java
@@ -30,7 +30,7 @@ public class OkCookieJar implements CookieJar {
     }
 
     @Override
-    public synchronized void saveFromResponse(@NonNull HttpUrl url, List<Cookie> cookies) {
+    public synchronized void saveFromResponse(@NonNull HttpUrl url, @NonNull List<Cookie> cookies) {
         try {
             for (Cookie cookie : cookies) CookieManager.getInstance().setCookie(url.toString(), cookie.toString());
         } catch (Throwable ignored) {