Refactoring and clean-up of fragment for media previews

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / fragment / FileDetailFragment.java

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 148c9f2..da21531 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -102,7 +102,7 @@ import com.owncloud.android.ui.activity.FileDetailActivity;
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r
 import com.owncloud.android.ui.OnSwipeTouchListener;\r
 import com.owncloud.android.ui.activity.TransferServiceGetter;\r
 import com.owncloud.android.ui.activity.FileDisplayActivity;\r
 import com.owncloud.android.ui.OnSwipeTouchListener;\r
 import com.owncloud.android.ui.activity.TransferServiceGetter;\r

-import com.owncloud.android.ui.activity.VideoActivity;\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
 import com.owncloud.android.ui.dialog.EditNameDialog;\r
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r
 import com.owncloud.android.utils.OwnCloudVersion;\r


@@ -253,11 +253,9 @@ public class FileDetailFragment extends SherlockFragment implements
 \r
     @Override\r
     public void onSaveInstanceState(Bundle outState) {\r
 \r
     @Override\r
     public void onSaveInstanceState(Bundle outState) {\r

-        Log.i(getClass().toString(), "onSaveInstanceState() start");\r

         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mFile);\r
         outState.putParcelable(FileDetailFragment.EXTRA_ACCOUNT, mAccount);\r
         super.onSaveInstanceState(outState);\r
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mFile);\r
         outState.putParcelable(FileDetailFragment.EXTRA_ACCOUNT, mAccount);\r

-        Log.i(getClass().toString(), "onSaveInstanceState() end");\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -294,10 +292,9 @@ public class FileDetailFragment extends SherlockFragment implements
         \r
         getActivity().unregisterReceiver(mUploadFinishReceiver);\r
         mUploadFinishReceiver = null;\r
         \r
         getActivity().unregisterReceiver(mUploadFinishReceiver);\r
         mUploadFinishReceiver = null;\r

-        \r

     }\r
 \r
     }\r
 \r

-\r
+    \r

     @Override\r
     public void onStop() {\r
         super.onStop();\r
     @Override\r
     public void onStop() {\r
         super.onStop();\r


@@ -384,7 +381,6 @@ public class FileDetailFragment extends SherlockFragment implements
                                    FileObserverService.CMD_DEL_OBSERVED_FILE));\r
                 intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);\r
                 intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);\r
                                    FileObserverService.CMD_DEL_OBSERVED_FILE));\r
                 intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);\r
                 intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);\r

-                Log.e(TAG, "starting observer service");\r

                 getActivity().startService(intent);\r
                 \r
                 if (mFile.keepInSync()) {\r
                 getActivity().startService(intent);\r
                 \r
                 if (mFile.keepInSync()) {\r


@@ -424,9 +420,9 @@ public class FileDetailFragment extends SherlockFragment implements
     \r
     \r
     private void startVideoActivity() {\r
     \r
     \r
     private void startVideoActivity() {\r

-        Intent i = new Intent(getActivity(), VideoActivity.class);\r
-        i.putExtra(VideoActivity.EXTRA_FILE, mFile);\r
-        i.putExtra(VideoActivity.EXTRA_ACCOUNT, mAccount);\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
         startActivity(i);\r
     }\r
 \r


@@ -838,6 +834,8 @@ public class FileDetailFragment extends SherlockFragment implements
                     if (downloadWasFine) {\r
                         mFile = mStorageManager.getFileByPath(downloadedRemotePath);\r
                     }\r
                     if (downloadWasFine) {\r
                         mFile = mStorageManager.getFileByPath(downloadedRemotePath);\r
                     }\r

+                    mContainerActivity.notifySuccessfulDownload(mFile, intent, downloadWasFine);\r
+                    getActivity().removeStickyBroadcast(intent);\r

                     updateFileDetails(false);    // it updates the buttons; must be called although !downloadWasFine\r
                 }\r
             }\r
                     updateFileDetails(false);    // it updates the buttons; must be called although !downloadWasFine\r
                 }\r
             }\r