Bug 1622781 - Canonicalize filenames from content providers; r=snorp

Differential Revision: https://phabricator.services.mozilla.com/D66974

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Petru-Mugurel Lingurar 2020-03-20 12:59:59 +00:00
parent e11f9b920f
commit 23e7aab874

View File

@ -324,7 +324,7 @@ public class FileUtils {
e.printStackTrace();
}
return fileName;
return canonicalizeFilename(fileName);
}
public static void copy(final Context context, final Uri srcUri, final File dstFile) {
@ -416,4 +416,12 @@ public class FileUtils {
return absPath.contains("/sdcard0") || absPath.contains("/storage/emulated");
}
}
private static @Nullable String canonicalizeFilename(@Nullable final String originalFilename) {
if (TextUtils.isEmpty(originalFilename)) {
return null;
} else {
return new File(originalFilename).getName();
}
}
}