From 1d57422952f863a9749df1cdecdd36168c56521c Mon Sep 17 00:00:00 2001 From: FongMi Date: Sat, 22 Apr 2023 12:35:10 +0800 Subject: [PATCH] Revert ua --- app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java | 4 ++-- .../java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java index 0cd32e19b..59127b218 100644 --- a/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java +++ b/app/src/main/java/com/fongmi/android/tv/player/ExoUtil.java @@ -7,6 +7,7 @@ import androidx.media3.common.MediaItem; import androidx.media3.common.MimeTypes; import androidx.media3.common.PlaybackException; import androidx.media3.common.Tracks; +import androidx.media3.common.util.Util; import androidx.media3.database.DatabaseProvider; import androidx.media3.database.StandaloneDatabaseProvider; import androidx.media3.datasource.DataSource; @@ -34,7 +35,6 @@ import com.fongmi.android.tv.bean.Result; import com.fongmi.android.tv.bean.Sub; import com.fongmi.android.tv.utils.FileUtil; import com.fongmi.android.tv.utils.Prefers; -import com.fongmi.android.tv.utils.Sniffer; import com.google.common.net.HttpHeaders; import java.util.ArrayList; @@ -108,7 +108,7 @@ public class ExoUtil { } private static synchronized DataSource.Factory getDataSourceFactory(Map headers) { - if (!headers.containsKey(HttpHeaders.USER_AGENT)) headers.put(HttpHeaders.USER_AGENT, Sniffer.CHROME); + if (!headers.containsKey(HttpHeaders.USER_AGENT)) headers.put(HttpHeaders.USER_AGENT, Util.getUserAgent(App.get(), App.get().getPackageName())); if (dataSourceFactory == null) dataSourceFactory = buildReadOnlyCacheDataSource(new DefaultDataSource.Factory(App.get(), getHttpDataSourceFactory()), getCache()); httpDataSourceFactory.setDefaultRequestProperties(headers); return dataSourceFactory; diff --git a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java index df4f4e46b..8795f7f83 100644 --- a/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java +++ b/ijkplayer/src/main/java/tv/danmaku/ijk/media/player/ui/IjkVideoView.java @@ -176,7 +176,7 @@ public class IjkVideoView extends FrameLayout implements MediaController.MediaPl } private void fixUserAgent() { - if (!mHeaders.containsKey(Utils.USER_AGENT)) mHeaders.put(Utils.USER_AGENT, Utils.CHROME); + if (!mHeaders.containsKey(Utils.USER_AGENT)) mHeaders.put(Utils.USER_AGENT, Utils.getUserAgent(mAppContext)); mIjkPlayer.setOption(format, "user_agent", mHeaders.get(Utils.USER_AGENT)); mHeaders.remove(Utils.USER_AGENT); }