X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/cfb68a69ddfcaa35dfbed8023a5063fe063bc504..2f1aaa8b15cac2e5fe8fdae3b9a3d5214d7df2f0:/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 1a4dd221..da215317 100644
--- 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;
 import com.owncloud.android.ui.OnSwipeTouchListener;
 import com.owncloud.android.ui.activity.TransferServiceGetter;
-import com.owncloud.android.ui.activity.VideoActivity;
+import com.owncloud.android.ui.activity.PreviewVideoActivity;
 import com.owncloud.android.ui.dialog.EditNameDialog;
 import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;
 import com.owncloud.android.utils.OwnCloudVersion;
@@ -253,11 +253,9 @@ public class FileDetailFragment extends SherlockFragment implements
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        Log.i(getClass().toString(), "onSaveInstanceState() start");
         super.onSaveInstanceState(outState);
         outState.putParcelable(FileDetailFragment.EXTRA_FILE, mFile);
         outState.putParcelable(FileDetailFragment.EXTRA_ACCOUNT, mAccount);
-        Log.i(getClass().toString(), "onSaveInstanceState() end");
     }
 
     @Override
@@ -294,10 +292,9 @@ public class FileDetailFragment extends SherlockFragment implements
         
         getActivity().unregisterReceiver(mUploadFinishReceiver);
         mUploadFinishReceiver = null;
-        
     }
 
-
+    
     @Override
     public void onStop() {
         super.onStop();
@@ -365,7 +362,6 @@ public class FileDetailFragment extends SherlockFragment implements
                     // update ui 
                     boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
                     getActivity().showDialog((inDisplayActivity)? FileDisplayActivity.DIALOG_SHORT_WAIT : FileDetailActivity.DIALOG_SHORT_WAIT);
-                    setButtonsForTransferring(); // disable button immediately, although the synchronization does not result in a file transference
                     
                 }
                 break;
@@ -385,7 +381,6 @@ public class FileDetailFragment extends SherlockFragment implements
                                    FileObserverService.CMD_DEL_OBSERVED_FILE));
                 intent.putExtra(FileObserverService.KEY_CMD_ARG_FILE, mFile);
                 intent.putExtra(FileObserverService.KEY_CMD_ARG_ACCOUNT, mAccount);
-                Log.e(TAG, "starting observer service");
                 getActivity().startService(intent);
                 
                 if (mFile.keepInSync()) {
@@ -425,9 +420,9 @@ public class FileDetailFragment extends SherlockFragment implements
     
     
     private void startVideoActivity() {
-        Intent i = new Intent(getActivity(), VideoActivity.class);
-        i.putExtra(VideoActivity.EXTRA_FILE, mFile);
-        i.putExtra(VideoActivity.EXTRA_ACCOUNT, mAccount);
+        Intent i = new Intent(getActivity(), PreviewVideoActivity.class);
+        i.putExtra(PreviewVideoActivity.EXTRA_FILE, mFile);
+        i.putExtra(PreviewVideoActivity.EXTRA_ACCOUNT, mAccount);
         startActivity(i);
     }
 
@@ -776,6 +771,8 @@ public class FileDetailFragment extends SherlockFragment implements
             // hides the progress bar
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
             progressBar.setVisibility(View.GONE);
+            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
+            progressText.setVisibility(View.GONE);
         }
     }
 
@@ -795,6 +792,8 @@ public class FileDetailFragment extends SherlockFragment implements
             // hides the progress bar
             ProgressBar progressBar = (ProgressBar)getView().findViewById(R.id.fdProgressBar);
             progressBar.setVisibility(View.GONE);
+            TextView progressText = (TextView)getView().findViewById(R.id.fdProgressText);
+            progressText.setVisibility(View.GONE);
         }
     }
     
@@ -835,6 +834,8 @@ public class FileDetailFragment extends SherlockFragment implements
                     if (downloadWasFine) {
                         mFile = mStorageManager.getFileByPath(downloadedRemotePath);
                     }
+                    mContainerActivity.notifySuccessfulDownload(mFile, intent, downloadWasFine);
+                    getActivity().removeStickyBroadcast(intent);
                     updateFileDetails(false);    // it updates the buttons; must be called although !downloadWasFine
                 }
             }
@@ -1092,6 +1093,7 @@ public class FileDetailFragment extends SherlockFragment implements
             
         } else {
             if (operation.transferWasRequested()) {
+                setButtonsForTransferring();
                 mContainerActivity.onFileStateChanged();    // this is not working; FileDownloader won't do NOTHING at all until this method finishes, so 
                                                             // checking the service to see if the file is downloading results in FALSE
             } else {