baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Merge pull request #11330 from Isira-Seneviratne/Java-10-URL-NP

Browse source 
Apply URL encode/decode changes
This commit is contained in:
Profpatsch 2024-11-19 14:05:04 +01:00 committed by GitHub
commit ffcba175ff
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -185,10 +185,8 @@ public class ReCaptchaActivity extends AppCompatActivity {
final int abuseEnd = url.indexOf("+path"); final int abuseEnd = url.indexOf("+path");
try { try {
String abuseCookie = url.substring(abuseStart + 13, abuseEnd); handleCookies(Utils.decodeUrlUtf8(url.substring(abuseStart + 13, abuseEnd)));
abuseCookie = Utils.decodeUrlUtf8(abuseCookie); } catch (final StringIndexOutOfBoundsException e) {
handleCookies(abuseCookie);
} catch (IllegalArgumentException | StringIndexOutOfBoundsException e) {
if (MainActivity.DEBUG) { if (MainActivity.DEBUG) {
Log.e(TAG, "handleCookiesFromUrl: invalid google abuse starting at " Log.e(TAG, "handleCookiesFromUrl: invalid google abuse starting at "
+ abuseStart + " and ending at " + abuseEnd + " for url " + url, e); + abuseStart + " and ending at " + abuseEnd + " for url " + url, e);

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

@ -1,6 +1,5 @@
package org.schabi.newpipe.settings; package org.schabi.newpipe.settings;
import static org.schabi.newpipe.extractor.utils.Utils.decodeUrlUtf8;
import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage; import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
import android.app.Activity; import android.app.Activity;
@ -30,7 +29,6 @@ import org.schabi.newpipe.util.FilePickerActivityHelper;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.URI;
public class DownloadSettingsFragment extends BasePreferenceFragment { public class DownloadSettingsFragment extends BasePreferenceFragment {
public static final boolean IGNORE_RELEASE_ON_OLD_PATH = true; public static final boolean IGNORE_RELEASE_ON_OLD_PATH = true;
@ -107,28 +105,15 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
private void showPathInSummary(final String prefKey, @StringRes final int defaultString, private void showPathInSummary(final String prefKey, @StringRes final int defaultString,
final Preference target) { final Preference target) {
String rawUri = defaultPreferences.getString(prefKey, null); final Uri uri = Uri.parse(defaultPreferences.getString(prefKey, ""));
if (rawUri == null || rawUri.isEmpty()) { if (uri.equals(Uri.EMPTY)) {
target.setSummary(getString(defaultString)); target.setSummary(getString(defaultString));
return; return;
} }
if (rawUri.charAt(0) == File.separatorChar) { final String summary = ContentResolver.SCHEME_FILE.equals(uri.getScheme())
target.setSummary(rawUri); ? uri.getPath() : uri.toString();
return; target.setSummary(summary);
}
if (rawUri.startsWith(ContentResolver.SCHEME_FILE)) {
target.setSummary(new File(URI.create(rawUri)).getPath());
return;
}
try {
rawUri = decodeUrlUtf8(rawUri);
} catch (final IllegalArgumentException e) {
// nothing to do
}
target.setSummary(rawUri);
} }
private boolean isFileUri(final String path) { private boolean isFileUri(final String path) {