From 4a29ea2ca0319d36c69f8a5bccc5d1865ad1f72f Mon Sep 17 00:00:00 2001 From: evermind Date: Thu, 25 Jul 2024 23:06:45 +0200 Subject: [PATCH] BraveNewPipeLegacy: Adjust due to NewPipeExtractor v0.24.2 update --- .../java/org/schabi/newpipe/error/ReCaptchaActivity.java | 9 +++------ .../newpipe/settings/DownloadSettingsFragment.java | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/braveLegacy/java/org/schabi/newpipe/error/ReCaptchaActivity.java b/app/src/braveLegacy/java/org/schabi/newpipe/error/ReCaptchaActivity.java index ac1f34e3d1e..8edd9680718 100644 --- a/app/src/braveLegacy/java/org/schabi/newpipe/error/ReCaptchaActivity.java +++ b/app/src/braveLegacy/java/org/schabi/newpipe/error/ReCaptchaActivity.java @@ -28,8 +28,6 @@ import org.schabi.newpipe.extractor.utils.Utils; import org.schabi.newpipe.util.ThemeHelper; -import java.io.UnsupportedEncodingException; - /* * Created by beneth on 06.12.16. * @@ -196,11 +194,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/braveLegacy/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/braveLegacy/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java index fc8783b8c36..660e4dc2e6a 100644 --- a/app/src/braveLegacy/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java +++ b/app/src/braveLegacy/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 { @@ -131,7 +130,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 }