Эх сурвалжийг харах

Merge pull request #4577 from nextcloud/ezaquarii/fix-npe-in-preview-media-fragment

Fix NPE in PreviewMediaFragment
Tobias Kaminsky 5 жил өмнө
parent
commit
b204db0f1a

+ 4 - 3
src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -79,6 +79,7 @@ import javax.inject.Inject;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
 
 /**
  * This fragment shows a preview of a downloaded media file (audio or video).
@@ -510,9 +511,9 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
 
         @Override
         protected void onPostExecute(Uri uri) {
-            PreviewMediaFragment previewMediaFragment = previewMediaFragmentWeakReference.get();
-
-            if (previewMediaFragment != null) {
+            final PreviewMediaFragment previewMediaFragment = previewMediaFragmentWeakReference.get();
+            final Context context = previewMediaFragment != null ? previewMediaFragment.getContext() : null;
+            if (previewMediaFragment != null && context != null) {
                 if (uri != null) {
                     previewMediaFragment.mVideoUri = uri;
                     previewMediaFragment.mVideoPreview.setVideoURI(uri);