Fixed ClassCastException in FileUploader

[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 1a4dd22..85312b9 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -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


@@ -365,7 +362,6 @@ public class FileDetailFragment extends SherlockFragment implements
                     // update ui \r
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                     getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r
                     // update ui \r
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;\r
                     getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);\r

-                    setButtonsForTransferring(); // disable button immediately, although the synchronization does not result in a file transference\r

                     \r
                 }\r
                 break;\r
                     \r
                 }\r
                 break;\r


@@ -385,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


@@ -776,6 +771,8 @@ public class FileDetailFragment extends SherlockFragment implements
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r

+            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);\r
+            progressText.setVisibility(View.GONE);\r

         }\r
     }\r
 \r
         }\r
     }\r
 \r


@@ -795,6 +792,8 @@ public class FileDetailFragment extends SherlockFragment implements
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r
             // hides the progress bar\r
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);\r
             progressBar.setVisibility(View.GONE);\r

+            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);\r
+            progressText.setVisibility(View.GONE);\r

         }\r
     }\r
     \r
         }\r
     }\r
     \r


@@ -1092,6 +1091,7 @@ public class FileDetailFragment extends SherlockFragment implements
             \r
         } else {\r
             if (operation.transferWasRequested()) {\r
             \r
         } else {\r
             if (operation.transferWasRequested()) {\r

+                setButtonsForTransferring();\r

                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r
                                                             // checking the service to see if the file is downloading results in FALSE\r
             } else {\r
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so \r
                                                             // checking the service to see if the file is downloading results in FALSE\r
             } else {\r