Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/j6 without extension #1611

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,33 @@ public static FileInfo openFileStream(final Context context, final Uri uri, bool
Log.i(TAG, "Caching from URI: " + uri.toString());
FileOutputStream fos = null;
final FileInfo.Builder fileInfo = new FileInfo.Builder();
final String fileName = FileUtils.getFileName(uri, context);
final String path = context.getCacheDir().getAbsolutePath() + "/file_picker/"+System.currentTimeMillis() +"/"+ (fileName != null ? fileName : "unamed");
String fileName = FileUtils.getFileName(uri, context);
String path = context.getCacheDir().getAbsolutePath() + "/file_picker/"+System.currentTimeMillis() +"/"+ (fileName != null ? fileName : "unamed");
final boolean fileHasExtension = fileName != null &&
fileName.contains(".") &&
(fileName.substring(fileName.lastIndexOf(".") + 1).length() >= 2 &&
fileName.substring(fileName.lastIndexOf(".") + 1).length() <= 4);

final File file = new File(path);
File tempFile = new File(path);

Log.e(TAG, "FileName has extension: " + fileHasExtension);

if(!fileHasExtension) {
String mimeType = context.getContentResolver().getType(uri);
String extension = "";

if (mimeType != null) {
extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
}

if (extension != null && !extension.isEmpty()) {
path = path + "." + extension;
fileName = fileName + "." + extension;
tempFile = new File(path);
}
}

final File file = tempFile;

if(!file.exists()) {
file.getParentFile().mkdirs();
Expand Down