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.

Sign up for GitHub

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 #1455 NPE when compressing images from gallery on Android 14 #1458

Merged
merged 3 commits into from
Mar 20, 2024
Merged

Fix #1455 NPE when compressing images from gallery on Android 14 #1458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
837bd24
Code cleanup
mauriziopinotti Mar 11, 2024
e0d4169
Fix #1455 NPE when compressing images from gallery on Android 14
mauriziopinotti Mar 11, 2024
b3142eb
Close input stream of image after compressing it #1455
mauriziopinotti Mar 12, 2024
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
22 changes: 8 additions & 14 deletions android/src/main/java/com/mr/flutter/plugin/filepicker/FilePickerDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,18 @@
import android.os.Environment;
import android.os.Handler;
import android.os.Looper;
import android.os.Parcelable;
import android.os.Message;
import android.os.Parcelable;
import android.provider.DocumentsContract;
import android.util.Log;

import androidx.annotation.VisibleForTesting;
import androidx.core.app.ActivityCompat;

import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Objects;

import io.flutter.plugin.common.EventChannel;
import io.flutter.plugin.common.MethodChannel;
Expand Down Expand Up @@ -77,13 +76,11 @@ public void setEventHandler(final EventChannel.EventSink eventSink) {

@Override
public boolean onActivityResult(final int requestCode, final int resultCode, final Intent data) {

if(type == null) {
if (type == null) {
return false;
}

if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK) {

this.dispatchEventStatus(true);

new Thread(new Runnable() {
Expand All @@ -92,16 +89,14 @@ public void run() {
if (data != null) {
final ArrayList<FileInfo> files = new ArrayList<>();


if (data.getClipData() != null) {
final int count = data.getClipData().getItemCount();
int currentItem = 0;
while (currentItem < count) {
Uri currentUri = data.getClipData().getItemAt(currentItem).getUri();

if(type=="image/*" && compressionQuality>0) {

currentUri=FileUtils.compressImage(currentUri,compressionQuality,activity.getApplicationContext());
if (Objects.equals(type, "image/*") && compressionQuality > 0) {
currentUri = FileUtils.compressImage(currentUri, compressionQuality, activity.getApplicationContext());
}
final FileInfo file = FileUtils.openFileStream(FilePickerDelegate.this.activity, currentUri, loadDataToMemory);
if(file != null) {
Expand All @@ -115,8 +110,8 @@ public void run() {
} else if (data.getData() != null) {
Uri uri = data.getData();

if(type=="image/*" && compressionQuality>0) {
uri=FileUtils.compressImage(uri,compressionQuality,activity.getApplicationContext());
if (Objects.equals(type, "image/*") && compressionQuality > 0) {
uri = FileUtils.compressImage(uri, compressionQuality, activity.getApplicationContext());
}

if (type.equals("dir") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
Expand Down Expand Up @@ -230,7 +225,6 @@ private ArrayList<Parcelable> getSelectedItems(Bundle bundle){
return bundle.getParcelableArrayList("selectedItems");
}

@SuppressWarnings("deprecation")
private void startFileExplorer() {
final Intent intent;

Expand Down Expand Up @@ -265,7 +259,7 @@ private void startFileExplorer() {
}

if (intent.resolveActivity(this.activity.getPackageManager()) != null) {
this.activity.startActivityForResult(intent, REQUEST_CODE);
this.activity.startActivityForResult(Intent.createChooser(intent, null), REQUEST_CODE);
} else {
Log.e(TAG, "Can't find a valid activity to handle the request. Make sure you've a file explorer installed.");
finishWithError("invalid_format_type", "Can't handle the provided file type.");
Expand Down
23 changes: 11 additions & 12 deletions android/src/main/java/com/mr/flutter/plugin/filepicker/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,28 +92,27 @@ public static String getFileName(Uri uri, final Context context) {
}


public static Uri compressImage(Uri originalImageUri, int compressionQuality,Context context) {
String originalImagePath = getRealPathFromURI(context,originalImageUri);
Uri compressedUri=null;
File compressedFile=null;
try {
compressedFile=createImageFile();
Bitmap originalBitmap = BitmapFactory.decodeFile(originalImagePath);
String file_path = Environment.getExternalStorageDirectory().getAbsolutePath() +
"/FilePicker";
public static Uri compressImage(Uri originalImageUri, int compressionQuality, Context context) {
Uri compressedUri;
try (InputStream imageStream = context.getContentResolver().openInputStream(originalImageUri)) {
File compressedFile = createImageFile();
Bitmap originalBitmap = BitmapFactory.decodeStream(imageStream);
// Compress and save the image
FileOutputStream fos = new FileOutputStream(compressedFile);
originalBitmap.compress(Bitmap.CompressFormat.JPEG, compressionQuality, fos);
fos.flush();
fos.close();
compressedUri=Uri.fromFile(compressedFile);
}catch (FileNotFoundException e) {
compressedUri = Uri.fromFile(compressedFile);
}
catch (FileNotFoundException e) {
throw new RuntimeException(e);
} catch (IOException e) {
}
catch (IOException e) {
throw new RuntimeException(e);
}
return compressedUri;
}

private static File createImageFile() throws IOException {
String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
String imageFileName = "JPEG_" + timeStamp + "_";
Expand Down
4 changes: 2 additions & 2 deletions example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 33
compileSdk 33

lintOptions {
disable 'InvalidPackage'
Expand All @@ -24,7 +24,7 @@ android {
defaultConfig {
applicationId "com.mr.flutter.plugin.filepicker.example"
minSdkVersion flutter.minSdkVersion
targetSdkVersion 33
targetSdk 33
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
Loading