Fix app crashes while tapping download notification after being retri…

…ed due to a network disconnection
owncloud · Apr 25, 2017 · a194762 · a194762
1 parent 79adc38
commit a194762
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 19 deletions.
diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -103,8 +103,7 @@
  */
 
 public class FileDisplayActivity extends HookActivity
-        implements FileFragment.ContainerActivity,
-        OnEnforceableRefreshListener, PrepareVideoPlayerAsyncTask.OnPrepareVideoPlayerTaskListener{
+        implements FileFragment.ContainerActivity, OnEnforceableRefreshListener {
 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadBroadcastReceiver mUploadBroadcastReceiver;
@@ -883,16 +882,6 @@ && getListOfFilesFragment().getFabMain().isExpanded()) {
         }
     }
 
-    @Override
-    public void OnPrepareVideoPlayerTaskCallback(MediaSource mediaSource) {
-        Fragment secondFragment = getSecondFragment();
-        //Ensure the second fragment has not been changed to a different one
-        if (secondFragment instanceof PreviewVideoFragment) {
-            ((PreviewVideoFragment) secondFragment).onPreparedVideoPlayer(mediaSource);
-        }
-    }
-
-
     private class SyncBroadcastReceiver extends BroadcastReceiver {
 
         /**

diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -193,7 +193,6 @@ private void preparePlayer() {
     @Override
     public void OnPrepareVideoPlayerTaskCallback(MediaSource mediaSource) {
         Log_OC.v(TAG, "playerPrepared");
-
         player.prepare(mediaSource);
     }
 

diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoFragment.java b/src/com/owncloud/android/ui/preview/PreviewVideoFragment.java
@@ -74,7 +74,7 @@
  *
  */
 public class PreviewVideoFragment extends FileFragment implements View.OnClickListener,
-        ExoPlayer.EventListener {
+        ExoPlayer.EventListener, PrepareVideoPlayerAsyncTask.OnPrepareVideoPlayerTaskListener {
 
     public static final String EXTRA_FILE = "FILE";
     public static final String EXTRA_ACCOUNT = "ACCOUNT";
@@ -454,8 +454,7 @@ private void preparePlayer() {
             simpleExoPlayerView.setPlayer(player);
 
             // Prepare video player asynchronously
-            new PrepareVideoPlayerAsyncTask(getActivity().getApplicationContext(),
-                    (PrepareVideoPlayerAsyncTask.OnPrepareVideoPlayerTaskListener) getActivity(),
+            new PrepareVideoPlayerAsyncTask(getActivity(), this,
                     getFile(), mAccount, mainHandler).execute();
         } else {
 
@@ -469,9 +468,9 @@ private void preparePlayer() {
      * Called after preparing the player asynchronously
      * @param mediaSource media to be played
      */
-    public void onPreparedVideoPlayer (MediaSource mediaSource) {
+    @Override
+    public void OnPrepareVideoPlayerTaskCallback(MediaSource mediaSource) {
         Log_OC.v(TAG, "playerPrepared");
-
         player.prepare(mediaSource);
     }
 
@@ -565,7 +564,6 @@ public void onTimelineChanged(Timeline timeline, Object manifest) {
 
 
     // File extra methods
-
     @Override
     public void onFileMetadataChanged(OCFile updatedFile) {
         if (updatedFile != null) {