Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into dev

Browse source
This commit is contained in:
Stypox 2024-07-25 21:20:44 +02:00
commit 51ee2f8d1e
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
30 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/schabi/newpipe/error/ReCaptchaActivity.java
View file

@ -27,8 +27,6 @@ import org.schabi.newpipe.databinding.ActivityRecaptchaBinding;
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 @@ public class ReCaptchaActivity extends AppCompatActivity {
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);
}
}
}

3
app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
View file

@ -30,7 +30,6 @@ import org.schabi.newpipe.util.FilePickerActivityHelper;
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 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
try {
rawUri = decodeUrlUtf8(rawUri);
} catch (final UnsupportedEncodingException e) {
} catch (final IllegalArgumentException e) {
// nothing to do
}