Merge remote-tracking branch 'upstream/develop' into

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / preview / PreviewVideoActivity.java

diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index 2c90afb..39e8e23 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -17,6 +17,11 @@
 
 package com.owncloud.android.ui.preview;
 
 
 package com.owncloud.android.ui.preview;
 

+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.media.MediaService;
+import com.owncloud.android.ui.activity.FileActivity;
+

 import android.accounts.Account;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.accounts.Account;
 import android.app.AlertDialog;
 import android.content.DialogInterface;


@@ -30,14 +35,9 @@ import android.os.Bundle;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
 import android.widget.MediaController;
 import android.widget.VideoView;
 

-import com.owncloud.android.Log_OC;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.oc_framework.accounts.AccountUtils;
-import com.owncloud.android.oc_framework.accounts.AccountUtils.AccountNotFoundException;
-import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.media.MediaService;
-import com.owncloud.android.ui.activity.FileActivity;
+import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
+import com.owncloud.android.lib.common.utils.Log_OC;

 
 /**
  *  Activity implementing a basic video player.
 
 /**
  *  Activity implementing a basic video player.


@@ -59,8 +59,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
     
     private static final String TAG = PreviewVideoActivity.class.getSimpleName();
 
     
     private static final String TAG = PreviewVideoActivity.class.getSimpleName();
 

-    private FileDataStorageManager mStorageManager;
-    

     private int mSavedPlaybackPosition;         // in the unit time handled by MediaPlayer.getCurrentPosition()
     private boolean mAutoplay;                  // when 'true', the playback starts immediately with the activity
     private VideoView mVideoPlayer;             // view to play the file; both performs and show the playback
     private int mSavedPlaybackPosition;         // in the unit time handled by MediaPlayer.getCurrentPosition()
     private boolean mAutoplay;                  // when 'true', the playback starts immediately with the activity
     private VideoView mVideoPlayer;             // view to play the file; both performs and show the playback


@@ -190,9 +188,9 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
         return true;
     }
     
         return true;
     }
     

-    

     @Override
     protected void onAccountSet(boolean stateWasRecovered) {
     @Override
     protected void onAccountSet(boolean stateWasRecovered) {

+        super.onAccountSet(stateWasRecovered);

         if (getAccount() != null) {
             OCFile file = getFile();
             /// Validate handled file  (first image to preview)
         if (getAccount() != null) {
             OCFile file = getFile();
             /// Validate handled file  (first image to preview)


@@ -202,8 +200,7 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
             if (!file.isVideo()) {
                 throw new IllegalArgumentException("Non-video file passed as argument");
             }
             if (!file.isVideo()) {
                 throw new IllegalArgumentException("Non-video file passed as argument");
             }

-            mStorageManager = new FileDataStorageManager(getAccount(), getContentResolver());
-            file = mStorageManager.getFileById(file.getFileId()); 
+            file = getStorageManager().getFileById(file.getFileId()); 

             if (file != null) {
                 if (file.isDown()) {
                     mVideoPlayer.setVideoPath(file.getStoragePath());
             if (file != null) {
                 if (file.isDown()) {
                     mVideoPlayer.setVideoPath(file.getStoragePath());


@@ -229,7 +226,6 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
                 finish();
             }
         } else {
                 finish();
             }
         } else {

-            Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");

             finish();
         }
    }
             finish();
         }
    }