Skip to content

[Bugfix] Fix crash on previewing image to upload on Android P #7184

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

Merged
bmarty merged 2 commits into from
Oct 4, 2022
Merged

[Bugfix] Fix crash on previewing image to upload on Android P #7184

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5e6444
Fix crash on image upload preview on Android P
atpamat Sep 16, 2022
7b52b3e
applied changes from code review
atpamat Sep 21, 2022
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
1 change: 1 addition & 0 deletions changelog.d/7184.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix crash on previewing images to upload on Android Pie.
10 changes: 9 additions & 1 deletion library/multipicker/src/main/java/im/vector/lib/multipicker/utils/ImageUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,15 @@ object ImageUtils {
fun getBitmap(context: Context, uri: Uri): Bitmap? {
return try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
ImageDecoder.decodeBitmap(ImageDecoder.createSource(context.contentResolver, uri))
val source = ImageDecoder.createSource(context.contentResolver, uri)
val listener = ImageDecoder.OnHeaderDecodedListener { decoder, _, _ ->
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
Copy link
Member

@bmarty bmarty Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think in this case, it could be replaced by

Suggested change
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.P) {

But I understand that it's more logic to keep the code like that.

Copy link
Contributor Author

@atpamat atpamat Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, I assumed there might be something in between, like there is with O_MR1 but there indeed isn't.

// Allocating hardware bitmap may cause a crash on framework versions prior to Android Q
decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE)
Copy link
Member

@bmarty bmarty Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a compilation warning, it could be replaced by

Suggested change
decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE)
decoder.allocator = ImageDecoder.ALLOCATOR_SOFTWARE

Copy link
Contributor Author

@atpamat atpamat Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

}
}

ImageDecoder.decodeBitmap(source, listener)
} else {
context.contentResolver.openInputStream(uri)?.use { inputStream ->
BitmapFactory.decodeStream(inputStream)
Expand Down