From ba6eafccb81f6761ae90c2e1f53833a02b119a2e Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 12 Feb 2013 12:19:38 +0100 Subject: [PATCH] Do not try to play files in streaming by now --- src/com/owncloud/android/media/MediaService.java | 3 +++ src/com/owncloud/android/ui/fragment/FileDetailFragment.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/media/MediaService.java b/src/com/owncloud/android/media/MediaService.java index a5118525..30558cd4 100644 --- a/src/com/owncloud/android/media/MediaService.java +++ b/src/com/owncloud/android/media/MediaService.java @@ -426,10 +426,13 @@ public class MediaService extends Service implements OnCompletionListener, OnPre createMediaPlayerIfNeeded(); mPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); String url = mFile.getStoragePath(); + /* Streaming is not possible right now if (url == null || url.length() <= 0) { url = AccountUtils.constructFullURLForAccount(this, mAccount) + mFile.getRemotePath(); } mIsStreaming = url.startsWith("http:") || url.startsWith("https:"); + */ + mIsStreaming = false; mPlayer.setDataSource(url); diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index bfa4bbbc..f37c6094 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -424,7 +424,7 @@ public class FileDetailFragment extends SherlockFragment implements @Override public boolean onTouch(View v, MotionEvent event) { - if (v == mPreview && event.getAction() == MotionEvent.ACTION_DOWN && mFile != null) { + if (v == mPreview && event.getAction() == MotionEvent.ACTION_DOWN && mFile != null && mFile.isDown()) { if (mFile.isAudio()) { if (!mMediaServiceBinder.isPlaying(mFile)) { Log.d(TAG, "starting playback of " + mFile.getStoragePath()); -- 2.11.0