Skip to content

Commit

Permalink
feat(filename): add fallback to getting extension from filename (#2118)
Browse files Browse the repository at this point in the history
  • Loading branch information
j-piasecki committed Sep 7, 2023
1 parent f347c8b commit 2c13085
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions android/src/main/java/com/imagepicker/Utils.java
Expand Up @@ -8,13 +8,15 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.hardware.camera2.CameraCharacteristics;
import android.net.Uri;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
import android.util.Base64;
import android.webkit.MimeTypeMap;

Expand Down Expand Up @@ -116,6 +118,21 @@ public static Uri getAppSpecificStorageUri(Uri sharedStorageUri, Context context
}
ContentResolver contentResolver = context.getContentResolver();
String fileType = getFileTypeFromMime(contentResolver.getType(sharedStorageUri));

if (fileType == null) {
Cursor cursor =
contentResolver.query(sharedStorageUri, null, null, null, null);
if (cursor.moveToFirst()) {
int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
String fileName = cursor.getString(nameIndex);
int lastDotIndex = fileName.lastIndexOf('.');

if (lastDotIndex != -1) {
fileType = fileName.substring(lastDotIndex + 1);
}
}
}

Uri toUri = Uri.fromFile(createFile(context, fileType));
copyUri(sharedStorageUri, toUri, contentResolver);
return toUri;
Expand Down

0 comments on commit 2c13085

Please sign in to comment.