From a194762e3e3046d79a2ec9909760a7a5a99dd117 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Thu, 6 Apr 2017 11:05:06 +0200
Subject: [PATCH] Fix app crashes while tapping download notification after
 being retried due to a network disconnection

---
 .../android/ui/activity/FileDisplayActivity.java    | 13 +------------
 .../android/ui/preview/PreviewVideoActivity.java    |  1 -
 .../android/ui/preview/PreviewVideoFragment.java    | 10 ++++------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index bf6499e9f84..bb24d901333 100644
--- 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
index ca4d8ed90b1..1d87d85d3a9 100644
--- 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
index 5d19e943e0f..a590d2d4055 100644
--- 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) {