X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3ecabe3ea7a657c3b5f23bf28d260f25d4f617dd..cc39a76a90e6ecd572dbb249faae4e00b115832f:/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 f315cc43..7db07b35 100644 --- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java +++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java @@ -17,6 +17,15 @@ package com.owncloud.android.ui.preview; +import com.owncloud.android.Log_OC; +import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; +import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException; +import com.owncloud.android.datamodel.FileDataStorageManager; +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; @@ -30,15 +39,6 @@ import android.os.Bundle; import android.widget.MediaController; import android.widget.VideoView; -import com.owncloud.android.AccountUtils; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; -import com.owncloud.android.datamodel.DataStorageManager; -import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.datamodel.OCFile; -import com.owncloud.android.media.MediaService; -import com.owncloud.android.ui.activity.FileActivity; - /** * Activity implementing a basic video player. * @@ -59,7 +59,7 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi private static final String TAG = PreviewVideoActivity.class.getSimpleName(); - private DataStorageManager mStorageManager; + 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 @@ -209,9 +209,14 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi mVideoPlayer.setVideoPath(file.getStoragePath()); } else { - // not working now - String url = AccountUtils.constructFullURLForAccount(this, getAccount()) + file.getRemotePath(); - mVideoPlayer.setVideoURI(Uri.parse(url)); + // not working yet + String url; + try { + url = AccountUtils.constructFullURLForAccount(this, getAccount()) + file.getRemotePath(); + mVideoPlayer.setVideoURI(Uri.parse(url)); + } catch (AccountNotFoundException e) { + onError(null, MediaService.OC_MEDIA_ERROR, R.string.media_err_no_account); + } } // create and prepare control panel for the user