瀏覽代碼

ui:preview Verify that bitmap is not null before setting imageDrawable.

A reference to null should never be dereferenced/accessed. Doing so will cause a NullPointerException to be thrown
eho 6 年之前
父節點
當前提交
ca46f6ed6b
共有 1 個文件被更改,包括 3 次插入5 次删除
  1. 3 5
      src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

+ 3 - 5
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -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) ||