Commit 021b8030 authored by p13dz's avatar p13dz Committed by brizental
Browse files

BB 40283: Workaround for the file upload bug

parent dd534303
Loading
Loading
Loading
Loading
+8 −1
Original line number Original line Diff line number Diff line
@@ -5836,12 +5836,19 @@ public class GeckoSession {
        return super.confirm();
        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) {
      private static String getFile(final @NonNull Context context, final @NonNull Uri uri) {
        if (uri == null) {
        if (uri == null) {
          return null;
          return null;
        }
        }
        if ("file".equals(uri.getScheme())) {
        if ("file".equals(uri.getScheme())) {
          return uri.getPath();
          return normalizePath(uri.getPath());
        }
        }
        if ("content".equals(uri.getScheme())) {
        if ("content".equals(uri.getScheme())) {
          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && DocumentsContract.isTreeUri(uri)) {
          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && DocumentsContract.isTreeUri(uri)) {