From e884ead0f3c50e69239a57e4749d7f03f70c1aae Mon Sep 17 00:00:00 2001
From: iecxiv <iecxiv@hotmail.com>
Date: Sat, 27 Jul 2024 09:07:14 +0200
Subject: [PATCH] Temporary 0.27.2 fix from xray
 https://github.com/polymorphicshade/Tubular/pull/129/files

---
 app/build.gradle                                         | 6 +++---
 app/proguard-rules.pro                                   | 1 +
 .../java/org/schabi/newpipe/error/ReCaptchaActivity.java | 9 +++------
 .../player/mediasession/MediaSessionPlayerUi.java        | 7 +++++++
 .../newpipe/settings/DownloadSettingsFragment.java       | 3 +--
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2009d84..3ff081c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,8 +20,8 @@ android {
         resValue "string", "app_name", "Tubular"
         minSdk 21
         targetSdk 33
-        versionCode 998
-        versionName "0.27.1"
+        versionCode 999
+        versionName "0.27.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -205,7 +205,7 @@ dependencies {
     // name and the commit hash with the commit hash of the (pushed) commit you want to test
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
-    implementation 'com.github.polymorphicshade:TubularExtractor:4faa5669b67d62526c3af39e11bb9d29d284bcd0'
+    implementation 'com.github.xray:TubularExtractor:d8abe3be8e115857fe830c8b4dce9bd3fd42287c'
     implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 3fa4590..9478e8b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -7,6 +7,7 @@
 -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; }
 -keep class org.mozilla.javascript.** { *; }
 -keep class org.mozilla.classfile.ClassFileWriter
+-dontwarn org.mozilla.javascript.JavaToJSONConverters
 -dontwarn org.mozilla.javascript.tools.**
 
 ## Rules for ExoPlayer
diff --git a/app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java
index 3c14cfe..42ef261 100644
--- a/app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java
@@ -27,8 +27,6 @@
 import org.schabi.newpipe.extractor.utils.Utils;
 import org.schabi.newpipe.util.ThemeHelper;
 
-import java.io.UnsupportedEncodingException;
-
 /*
  * Created by beneth <bmauduit@beneth.fr> on 06.12.16.
  *
@@ -190,11 +188,10 @@ private void handleCookiesFromUrl(@Nullable final String url) {
                 String abuseCookie = url.substring(abuseStart + 13, abuseEnd);
                 abuseCookie = Utils.decodeUrlUtf8(abuseCookie);
                 handleCookies(abuseCookie);
-            } catch (UnsupportedEncodingException | StringIndexOutOfBoundsException e) {
+            } catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
                 if (MainActivity.DEBUG) {
-                    e.printStackTrace();
-                    Log.d(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
-                            + abuseStart + " and ending at " + abuseEnd + " for url " + url);
+                    Log.e(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
+                            + abuseStart + " and ending at " + abuseEnd + " for url " + url, e);
                 }
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java
index 737ebc5..c673e68 100644
--- a/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java
+++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionPlayerUi.java
@@ -38,7 +38,9 @@ public class MediaSessionPlayerUi extends PlayerUi
         implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final String TAG = "MediaSessUi";
 
+    @Nullable
     private MediaSessionCompat mediaSession;
+    @Nullable
     private MediaSessionConnector sessionConnector;
 
     private final String ignoreHardwareMediaButtonsKey;
@@ -198,6 +200,11 @@ private void updateMediaSessionActions() {
             return;
         }
 
+        if (sessionConnector == null) {
+            // sessionConnector will be null after destroyPlayer is called
+            return;
+        }
+
         // only use the fourth and fifth actions (the settings page also shows only the last 2 on
         // Android 13+)
         final List<NotificationActionData> newNotificationActions = IntStream.of(3, 4)
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 472db6a..76163b3 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -30,7 +30,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 
 public class DownloadSettingsFragment extends BasePreferenceFragment {
@@ -125,7 +124,7 @@ private void showPathInSummary(final String prefKey, @StringRes final int defaul
 
         try {
             rawUri = decodeUrlUtf8(rawUri);
-        } catch (final UnsupportedEncodingException e) {
+        } catch (final IllegalArgumentException e) {
             // nothing to do
         }