Update image of play/pause button when audio playback starts
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java
index 7eb6cda..e8b897c 100644 (file)
@@ -39,15 +39,12 @@ import android.accounts.AccountManager;
 import android.app.Activity;\r
 import android.content.ActivityNotFoundException;\r
 import android.content.BroadcastReceiver;\r
-import android.content.ComponentName;\r
 import android.content.Context;\r
 import android.content.Intent;\r
 import android.content.IntentFilter;\r
-import android.content.ServiceConnection;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
-import android.os.IBinder;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.util.Log;\r
 import android.view.LayoutInflater;\r
@@ -58,7 +55,6 @@ import android.webkit.MimeTypeMap;
 import android.widget.Button;\r
 import android.widget.CheckBox;\r
 import android.widget.ImageView;\r
-import android.widget.MediaController;\r
 import android.widget.ProgressBar;\r
 import android.widget.TextView;\r
 import android.widget.Toast;\r
@@ -73,8 +69,6 @@ import com.owncloud.android.files.services.FileObserverService;
 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
-import com.owncloud.android.media.MediaService;\r
-import com.owncloud.android.media.MediaServiceBinder;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 import com.owncloud.android.operations.OnRemoteOperationListener;\r
 import com.owncloud.android.operations.RemoteOperation;\r
@@ -86,7 +80,6 @@ import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.ui.activity.ConflictsResolveActivity;\r
 import com.owncloud.android.ui.activity.FileDetailActivity;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r
-import com.owncloud.android.ui.activity.PreviewVideoActivity;\r
 import com.owncloud.android.ui.dialog.EditNameDialog;\r
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r
@@ -119,17 +112,12 @@ public class FileDetailFragment extends SherlockFragment implements
     private Account mAccount;\r
     private FileDataStorageManager mStorageManager;\r
     \r
-    //private DownloadFinishReceiver mDownloadFinishReceiver;\r
     private UploadFinishReceiver mUploadFinishReceiver;\r
     public ProgressListener mProgressListener;\r
     \r
     private Handler mHandler;\r
     private RemoteOperation mLastRemoteOperation;\r
     \r
-    private MediaServiceBinder mMediaServiceBinder = null;\r
-    private MediaController mMediaController = null;\r
-    private MediaServiceConnection mMediaServiceConnection = null;\r
-\r
     private static final String TAG = FileDetailFragment.class.getSimpleName();\r
     public static final String FTAG = "FileDetails"; \r
     public static final String FTAG_CONFIRMATION = "REMOVE_CONFIRMATION_FRAGMENT";\r
@@ -244,23 +232,12 @@ public class FileDetailFragment extends SherlockFragment implements
     @Override\r
     public void onStart() {\r
         super.onStart();\r
-        if (mFile != null && mFile.isAudio()) {\r
-            bindMediaService();\r
-        }\r
         listenForTransferProgress();\r
     }\r
     \r
     @Override\r
     public void onResume() {\r
         super.onResume();\r
-        \r
-        /*\r
-        mDownloadFinishReceiver = new DownloadFinishReceiver();\r
-        IntentFilter filter = new IntentFilter(\r
-                FileDownloader.DOWNLOAD_FINISH_MESSAGE);\r
-        getActivity().registerReceiver(mDownloadFinishReceiver, filter);\r
-        */\r
-        \r
         mUploadFinishReceiver = new UploadFinishReceiver();\r
         IntentFilter filter = new IntentFilter(FileUploader.UPLOAD_FINISH_MESSAGE);\r
         getActivity().registerReceiver(mUploadFinishReceiver, filter);\r
@@ -271,14 +248,6 @@ public class FileDetailFragment extends SherlockFragment implements
     @Override\r
     public void onPause() {\r
         super.onPause();\r
-        \r
-        /*\r
-        if (mDownloadFinishReceiver != null) {\r
-            getActivity().unregisterReceiver(mDownloadFinishReceiver);\r
-            mDownloadFinishReceiver = null;\r
-        }\r
-        */\r
-        \r
         if (mUploadFinishReceiver != null) {\r
             getActivity().unregisterReceiver(mUploadFinishReceiver);\r
             mUploadFinishReceiver = null;\r
@@ -289,21 +258,9 @@ public class FileDetailFragment extends SherlockFragment implements
     @Override\r
     public void onStop() {\r
         super.onStop();\r
-        if (mMediaServiceConnection != null) {\r
-            Log.d(TAG, "Unbinding from MediaService ...");\r
-            if (mMediaServiceBinder != null && mMediaController != null) {\r
-                mMediaServiceBinder.unregisterMediaController(mMediaController);\r
-            }\r
-            getActivity().unbindService(mMediaServiceConnection);\r
-            mMediaServiceBinder = null;\r
-            if (mMediaController != null) {\r
-                mMediaController.hide();\r
-                mMediaController = null;\r
-            }\r
-        }\r
         leaveTransferProgress();\r
     }\r
-    \r
+\r
     \r
     @Override\r
     public View getView() {\r
@@ -410,71 +367,6 @@ public class FileDetailFragment extends SherlockFragment implements
     }\r
     \r
     \r
-    private void startVideoActivity() {\r
-        Intent i = new Intent(getActivity(), PreviewVideoActivity.class);\r
-        i.putExtra(PreviewVideoActivity.EXTRA_FILE, mFile);\r
-        i.putExtra(PreviewVideoActivity.EXTRA_ACCOUNT, mAccount);\r
-        startActivity(i);\r
-    }\r
-\r
-\r
-    private void bindMediaService() {\r
-        Log.d(TAG, "Binding to MediaService...");\r
-        if (mMediaServiceConnection == null) {\r
-            mMediaServiceConnection = new MediaServiceConnection();\r
-        }\r
-        getActivity().bindService(  new Intent(getActivity(), \r
-                                    MediaService.class),\r
-                                    mMediaServiceConnection, \r
-                                    Context.BIND_AUTO_CREATE);\r
-            // follow the flow in MediaServiceConnection#onServiceConnected(...)\r
-    }\r
-    \r
-    /** Defines callbacks for service binding, passed to bindService() */\r
-    private class MediaServiceConnection implements ServiceConnection {\r
-\r
-        @Override\r
-        public void onServiceConnected(ComponentName component, IBinder service) {\r
-            if (component.equals(new ComponentName(getActivity(), MediaService.class))) {\r
-                Log.d(TAG, "Media service connected");\r
-                mMediaServiceBinder = (MediaServiceBinder) service;\r
-                if (mMediaServiceBinder != null) {\r
-                    if (mMediaController == null) {\r
-                        mMediaController = new MediaController(getSherlockActivity());\r
-                    }\r
-                    prepareMediaController();\r
-                    \r
-                    Log.d(TAG, "Successfully bound to MediaService, MediaController ready");\r
-                    \r
-                } else {\r
-                    Log.e(TAG, "Unexpected response from MediaService while binding");\r
-                }\r
-            }\r
-        }\r
-        \r
-        private void prepareMediaController() {\r
-            mMediaServiceBinder.registerMediaController(mMediaController);\r
-            mMediaController.setMediaPlayer(mMediaServiceBinder);\r
-            mMediaController.setAnchorView(getView());\r
-            mMediaController.setEnabled(mMediaServiceBinder.isInPlaybackState());\r
-        }\r
-\r
-        @Override\r
-        public void onServiceDisconnected(ComponentName component) {\r
-            if (component.equals(new ComponentName(getActivity(), MediaService.class))) {\r
-                Log.e(TAG, "Media service suddenly disconnected");\r
-                if (mMediaController != null) {\r
-                    mMediaController.hide();\r
-                    mMediaController.setMediaPlayer(null);\r
-                    mMediaController = null;\r
-                }\r
-                mMediaServiceBinder = null;\r
-                mMediaServiceConnection = null;\r
-            }\r
-        }\r
-    }    \r
-\r
-\r
     /**\r
      * Opens mFile.\r
      */\r