Переглянути джерело

Check nullable fields

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 рік тому
батько
коміт
ed252e5a55

+ 16 - 14
app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt

@@ -311,21 +311,23 @@ class PreviewMediaActivity :
 
         Log_OC.v(TAG, "onStart")
 
-        if (file != null) {
-            mediaPlayerServiceConnection?.bind()
-
-            if (MimeTypeUtil.isAudio(file)) {
-                setupAudioPlayerServiceConnection()
-            } else if (MimeTypeUtil.isVideo(file)) {
-                if (mediaPlayerServiceConnection?.isConnected == true) {
-                    stopAudio()
-                }
+        if (file == null) {
+            return
+        }
 
-                if (exoPlayer != null) {
-                    playVideo()
-                } else {
-                    initNextcloudExoPlayer()
-                }
+        mediaPlayerServiceConnection?.bind()
+
+        if (MimeTypeUtil.isAudio(file)) {
+            setupAudioPlayerServiceConnection()
+        } else if (MimeTypeUtil.isVideo(file)) {
+            if (mediaPlayerServiceConnection?.isConnected == true) {
+                stopAudio()
+            }
+
+            if (exoPlayer != null) {
+                playVideo()
+            } else {
+                initNextcloudExoPlayer()
             }
         }
     }

+ 7 - 5
app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java

@@ -177,12 +177,14 @@ public class PreviewMediaFragment extends FileFragment implements OnTouchListene
 
         Bundle bundle = getArguments();
 
-        setFile(BundleExtensionsKt.getParcelableArgument(bundle, FILE, OCFile.class));
-        user = BundleExtensionsKt.getParcelableArgument(bundle, USER, User.class);
+        if (bundle != null) {
+            setFile(BundleExtensionsKt.getParcelableArgument(bundle, FILE, OCFile.class));
+            user = BundleExtensionsKt.getParcelableArgument(bundle, USER, User.class);
 
-        savedPlaybackPosition = bundle.getLong(PLAYBACK_POSITION);
-        autoplay = bundle.getBoolean(AUTOPLAY);
-        isLivePhoto = bundle.getBoolean(IS_LIVE_PHOTO);
+            savedPlaybackPosition = bundle.getLong(PLAYBACK_POSITION);
+            autoplay = bundle.getBoolean(AUTOPLAY);
+            isLivePhoto = bundle.getBoolean(IS_LIVE_PHOTO);
+        }
 
         mediaPlayerServiceConnection = new PlayerServiceConnection(requireContext());
     }