mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2622 from nextcloud/preview-bitmap-npe

Browse source 
ui:preview Verify that bitmap is not null before setting imageDrawable.
This commit is contained in:
Andy Scherzinger 2018-05-25 12:59:28 +02:00 committed by GitHub
commit 27b503d2cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file

@ -610,11 +610,9 @@ public class PreviewImageFragment extends FileFragment {
final PhotoView imageView = mImageViewRef.get();
Bitmap bitmap = result.bitmap;
if (imageView != null) {
if (bitmap != null) {
Log_OC.d(TAG, "Showing image with resolution " + bitmap.getWidth() + "x" +
bitmap.getHeight());
}
if (imageView != null && bitmap != null) {
Log_OC.d(TAG, "Showing image with resolution " + bitmap.getWidth() + "x" +
bitmap.getHeight());
if (result.ocFile.getMimetype().equalsIgnoreCase(MIME_TYPE_PNG) ||
result.ocFile.getMimetype().equalsIgnoreCase(MIME_TYPE_SVG) ||