Changes from comments of PR

diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
index e7cfc94..5380a88 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -450,7 +450,6 @@ public class FileDetailFragment extends FileFragment implements
             mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
             
             // update ui 
             mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
             
             // update ui 

-            //boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;

             ((FileDisplayActivity) getActivity()).showLoadingDialog();
             
         }
             ((FileDisplayActivity) getActivity()).showLoadingDialog();
             
         }


@@ -465,8 +464,7 @@ public class FileDetailFragment extends FileFragment implements
                                                                 true, 
                                                                 mStorageManager);
                 mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
                                                                 true, 
                                                                 mStorageManager);
                 mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());

-                
-                //boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;
+                                

                 ((FileDisplayActivity) getActivity()).showLoadingDialog();
             }
         }
                 ((FileDisplayActivity) getActivity()).showLoadingDialog();
             }
         }


@@ -759,7 +757,6 @@ public class FileDetailFragment extends FileFragment implements
                                                             newFilename, 
                                                             new FileDataStorageManager(mAccount, getActivity().getContentResolver()));
             mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());
                                                             newFilename, 
                                                             new FileDataStorageManager(mAccount, getActivity().getContentResolver()));
             mLastRemoteOperation.execute(mAccount, getSherlockActivity(), this, mHandler, getSherlockActivity());

-            //boolean inDisplayActivity = getActivity() instanceof FileDisplayActivity;

             ((FileDisplayActivity) getActivity()).showLoadingDialog();
         }
     }
             ((FileDisplayActivity) getActivity()).showLoadingDialog();
         }
     }

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index 9ce0588..ef1e977 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -241,27 +241,6 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
         finish();
     }
     
         finish();
     }
     

-    
-//    @Override
-//    protected Dialog onCreateDialog(int id) {
-//        Dialog dialog = null;
-//        switch (id) {
-//        case DIALOG_SHORT_WAIT: {
-//            ProgressDialog working_dialog = new ProgressDialog(this);
-//            working_dialog.setMessage(getResources().getString(
-//                    R.string.wait_a_moment));
-//            working_dialog.setIndeterminate(true);
-//            working_dialog.setCancelable(false);
-//            dialog = working_dialog;
-//            break;
-//        }
-//        default:
-//            dialog = null;
-//        }
-//        return dialog;
-//    }
-    
-    

     /**
      * Show loading dialog 
      */
     /**
      * Show loading dialog 
      */