From 0fef7e27e3dfc9bd8ec471071ef13c4a3a1d63f1 Mon Sep 17 00:00:00 2001 From: okjack Date: Mon, 22 Jul 2024 20:42:00 +0800 Subject: [PATCH] Update okhttp to 5.0 --- .../java/com/fongmi/android/tv/ui/dialog/UaDialog.java | 2 +- .../mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java | 2 +- build.gradle | 2 +- catvod/src/main/java/com/github/catvod/utils/Util.java | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java index e0cf2c931..b25bf0a91 100644 --- a/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java +++ b/app/src/leanback/java/com/fongmi/android/tv/ui/dialog/UaDialog.java @@ -89,7 +89,7 @@ public class UaDialog implements DialogInterface.OnDismissListener { binding.text.setText(Util.CHROME); } else if (append && "o".equalsIgnoreCase(s)) { append = false; - binding.text.setText(okhttp3.internal.Util.userAgent); + binding.text.setText(Util.OKHTTP); } else if (s.length() > 1) { append = false; } else if (s.length() == 0) { diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java index 81c345091..7b1cb59a9 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java @@ -70,7 +70,7 @@ public class UaDialog { binding.text.setText(Util.CHROME); } else if (append && "o".equalsIgnoreCase(s)) { append = false; - binding.text.setText(okhttp3.internal.Util.userAgent); + binding.text.setText(Util.OKHTTP); } else if (s.length() > 1) { append = false; } else if (s.length() == 0) { diff --git a/build.gradle b/build.gradle index 1c8029dfb..7f12d5a93 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,6 @@ tasks.register('clean', Delete) { project.ext { gsonVersion = '2.11.0' jsoupVersion = '1.15.3' - okhttpVersion = '4.12.0' + okhttpVersion = '5.0.0-alpha.14' annotationVersion = '1.3.0' } diff --git a/catvod/src/main/java/com/github/catvod/utils/Util.java b/catvod/src/main/java/com/github/catvod/utils/Util.java index 073f8812c..9d7c86254 100644 --- a/catvod/src/main/java/com/github/catvod/utils/Util.java +++ b/catvod/src/main/java/com/github/catvod/utils/Util.java @@ -22,8 +22,11 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Enumeration; +import okhttp3.OkHttp; + public class Util { + public static final String OKHTTP = "okhttp/" + OkHttp.VERSION; public static final String CHROME = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/126.0.0.0 Safari/537.36"; public static final int URL_SAFE = Base64.DEFAULT | Base64.URL_SAFE | Base64.NO_WRAP;