From 72c69e7c79b0ad425d4aaa7fd02485e5c9b7cbd0 Mon Sep 17 00:00:00 2001
From: TwistedUmbrellaX <1173913+AbandonedCart@users.noreply.github.com>
Date: Fri, 5 Apr 2024 17:49:15 -0400
Subject: [PATCH] ExoPlayer improvements (#325)

* fix: add declarations for BT headsets

* fix: stop overriding user settings

* fix: offload cache to external storage
---
 app/src/main/AndroidManifest.xml                         | 9 +++++++++
 .../main/java/ani/dantotsu/media/anime/ExoplayerView.kt  | 4 ++--
 .../java/eu/kanade/tachiyomi/network/NetworkHelper.kt    | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 934bd7b3..779c829f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,6 +38,15 @@
         android:name="android.permission.READ_APP_SPECIFIC_LOCALES"
         tools:ignore="ProtectedPermissions" />
 
+    <!-- ExoPlayer: Bluetooth Headsets -->
+    <uses-feature
+        android:name="android.hardware.bluetooth"
+        android:required="false" />
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <!-- ExoPlayer: Bluetooth Headsets -->
+
     <queries>
         <package android:name="idm.internet.download.manager.plus" />
         <package android:name="idm.internet.download.manager" />
diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
index 8211cb08..d891ec17 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -1825,7 +1825,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
                         override fun onTick(millisUntilFinished: Long) {
                             if (new == null) {
                                 skipTimeButton.visibility = View.GONE
-                                exoSkip.visibility = View.VISIBLE
+                                exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0
                                 disappeared = false
                                 functionstarted = false
                                 cancelTimer()
@@ -1834,7 +1834,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
 
                         override fun onFinish() {
                             skipTimeButton.visibility = View.GONE
-                            exoSkip.visibility = View.VISIBLE
+                            exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0
                             disappeared = true
                             functionstarted = false
                             cancelTimer()
diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
index f7c08d19..ead9e3e2 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt
@@ -30,7 +30,7 @@ class NetworkHelper(
             .callTimeout(2, TimeUnit.MINUTES)
             .cache(
                 Cache(
-                    directory = File(context.cacheDir, "network_cache"),
+                    directory = File(context.externalCacheDir ?: context.cacheDir, "network_cache"),
                     maxSize = 5L * 1024 * 1024, // 5 MiB
                 ),
             )