Merge branch 'develop' into fix_loading_dialog_crash

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 42aab23..6bacaab 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -123,7 +123,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     private static final int DIALOG_SSL_VALIDATOR = 2;
     private static final int DIALOG_CERT_NOT_SAVED = 3;
     
     private static final int DIALOG_SSL_VALIDATOR = 2;
     private static final int DIALOG_CERT_NOT_SAVED = 3;
     

-    public static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
+    private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";

 
     public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
 
 
     public static final String ACTION_DETAILS = "com.owncloud.android.ui.activity.action.DETAILS";
 


@@ -612,6 +612,8 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
         Log_OC.d(TAG, "onSaveInstanceState() end");
     }
         outState.putParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW, mWaitingToPreview);
         Log_OC.d(TAG, "onSaveInstanceState() end");
     }

+    
+

 
     @Override
     protected void onResume() {
 
     @Override
     protected void onResume() {


@@ -753,7 +755,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     /**
      * Show loading dialog 
      */
     /**
      * Show loading dialog 
      */

-    public void showDialog() {
+    public void showLoadingDialog() {

         // Construct dialog
         LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
         FragmentManager fm = getSupportFragmentManager();
         // Construct dialog
         LoadingDialog loading = new LoadingDialog(getResources().getString(R.string.wait_a_moment));
         FragmentManager fm = getSupportFragmentManager();


@@ -762,6 +764,17 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
         
     }
     
         
     }
     

+    /**
+     * Dismiss loading dialog
+     */
+    public void dismissLoadingDialog(){
+        Fragment frag = getSupportFragmentManager().findFragmentByTag(DIALOG_WAIT_TAG);
+      if (frag != null) {
+          LoadingDialog loading = (LoadingDialog) frag;
+            loading.dismiss();
+        }
+    }
+    

     
     /**
      * Translates a content URI of an image to a physical path
     
     /**
      * Translates a content URI of an image to a physical path


@@ -1173,7 +1186,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
      * @param result        Result of the removal.
      */
     private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {
      * @param result        Result of the removal.
      */
     private void onRemoveFileOperationFinish(RemoveFileOperation operation, RemoteOperationResult result) {

-        dismissDialog(DIALOG_SHORT_WAIT);
+        dismissLoadingDialog();

         if (result.isSuccess()) {
             Toast msg = Toast.makeText(this, R.string.remove_success_msg, Toast.LENGTH_LONG);
             msg.show();
         if (result.isSuccess()) {
             Toast msg = Toast.makeText(this, R.string.remove_success_msg, Toast.LENGTH_LONG);
             msg.show();


@@ -1205,11 +1218,12 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
      */
     private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {
      */
     private void onCreateFolderOperationFinish(CreateFolderOperation operation, RemoteOperationResult result) {
         if (result.isSuccess()) {

-            dismissDialog(DIALOG_SHORT_WAIT);
+            dismissLoadingDialog();

             refeshListOfFilesFragment();
 
         } else {
             refeshListOfFilesFragment();
 
         } else {

-            dismissDialog(DIALOG_SHORT_WAIT);
+            //dismissDialog(DIALOG_SHORT_WAIT);
+            dismissLoadingDialog();

             try {
                 Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); 
                 msg.show();
             try {
                 Toast msg = Toast.makeText(FileDisplayActivity.this, R.string.create_dir_fail_msg, Toast.LENGTH_LONG); 
                 msg.show();


@@ -1229,7 +1243,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
      * @param result        Result of the renaming.
      */
     private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) {
      * @param result        Result of the renaming.
      */
     private void onRenameFileOperationFinish(RenameFileOperation operation, RemoteOperationResult result) {

-        dismissDialog(DIALOG_SHORT_WAIT);
+        dismissLoadingDialog();

         OCFile renamedFile = operation.getFile();
         if (result.isSuccess()) {
             if (mDualPane) {
         OCFile renamedFile = operation.getFile();
         if (result.isSuccess()) {
             if (mDualPane) {


@@ -1260,7 +1274,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
 
 
     private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {
 
 
     private void onSynchronizeFileOperationFinish(SynchronizeFileOperation operation, RemoteOperationResult result) {

-        dismissDialog(DIALOG_SHORT_WAIT);
+        dismissLoadingDialog();

         OCFile syncedFile = operation.getLocalFile();
         if (!result.isSuccess()) {
             if (result.getCode() == ResultCode.SYNC_CONFLICT) {
         OCFile syncedFile = operation.getLocalFile();
         if (!result.isSuccess()) {
             if (result.getCode() == ResultCode.SYNC_CONFLICT) {


@@ -1321,7 +1335,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
                         mHandler,
                         FileDisplayActivity.this);
 
                         mHandler,
                         FileDisplayActivity.this);
 

-                showDialog(DIALOG_SHORT_WAIT);
+                showLoadingDialog();

             }
         }
     }
             }
         }
     }