Преглед на файлове

ui:preview Ensure getActivity() is not null before generating LayerDrawable.

eho преди 7 години
родител
ревизия
ab13851438
променени са 1 файла, в които са добавени 15 реда и са изтрити 12 реда
  1. 15 12
      src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

+ 15 - 12
src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java

@@ -703,18 +703,21 @@ public class PreviewImageFragment extends FileFragment {
         LayerDrawable layerDrawable = new LayerDrawable(layers);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (result.ocFile.getMimetype().equalsIgnoreCase(MIME_TYPE_PNG)) {
-                layerDrawable.setLayerSize(0, convertDpToPixel(bitmap.getWidth(),
-                        getActivity()), convertDpToPixel(bitmap.getHeight(), getActivity()));
-                layerDrawable.setLayerSize(1, convertDpToPixel(bitmap.getWidth(),
-                        getActivity()), convertDpToPixel(bitmap.getHeight(), getActivity()));
-            } else {
-                layerDrawable.setLayerSize(0,
-                        convertDpToPixel(bitmapDrawable.getIntrinsicHeight(), getActivity()),
-                        convertDpToPixel(bitmapDrawable.getIntrinsicWidth(), getActivity()));
-                layerDrawable.setLayerSize(1,
-                        convertDpToPixel(bitmapDrawable.getIntrinsicHeight(), getActivity()),
-                        convertDpToPixel(bitmapDrawable.getIntrinsicWidth(), getActivity()));
+            Activity activity = getActivity();
+            if (activity != null) {
+                if (result.ocFile.getMimetype().equalsIgnoreCase(MIME_TYPE_PNG)) {
+                    layerDrawable.setLayerSize(0, convertDpToPixel(bitmap.getWidth(),
+                            getActivity()), convertDpToPixel(bitmap.getHeight(), getActivity()));
+                    layerDrawable.setLayerSize(1, convertDpToPixel(bitmap.getWidth(),
+                            getActivity()), convertDpToPixel(bitmap.getHeight(), getActivity()));
+                } else {
+                    layerDrawable.setLayerSize(0,
+                            convertDpToPixel(bitmapDrawable.getIntrinsicHeight(), getActivity()),
+                            convertDpToPixel(bitmapDrawable.getIntrinsicWidth(), getActivity()));
+                    layerDrawable.setLayerSize(1,
+                            convertDpToPixel(bitmapDrawable.getIntrinsicHeight(), getActivity()),
+                            convertDpToPixel(bitmapDrawable.getIntrinsicWidth(), getActivity()));
+                }
             }
         }