Richard Pospesel pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: 8462f81d by p13dz at 2023-01-13T19:43:57+00:00 Bug 40283: Workaround for the file upload bug

(cherry picked from commit c23f2f397327ee46a1a4de57acf206fd83e8e170) - - - - -

1 changed file:

- mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java

Changes:

===================================== mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java ===================================== @@ -4726,12 +4726,19 @@ public class GeckoSession { return super.confirm(); }

+ private static String normalizePath(String input) { + // For an unclear reason, Android media picker delivers file paths + // starting with double slash. Firefox performs path validation on + // all paths, and double slash is deemed invalid. + return input.startsWith("//") ? input.substring(1) : input; + } + private static String getFile(final @NonNull Context context, final @NonNull Uri uri) { if (uri == null) { return null; } if ("file".equals(uri.getScheme())) { - return uri.getPath(); + return normalizePath(uri.getPath()); } final ContentResolver cr = context.getContentResolver(); final Cursor cur = @@ -4753,7 +4760,7 @@ public class GeckoSession { try { final String path = cur.getString(idx); if (path != null && !path.isEmpty()) { - return path; + return normalizePath(path); } } catch (final Exception e) { }

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8462f81d...