Better failure handling in files renaming and removal

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDetailActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
index e481cdb..461485c 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java
@@ -18,11 +18,12 @@
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 import android.accounts.Account;\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
 import android.accounts.Account;\r

+import android.app.Dialog;\r
+import android.app.ProgressDialog;\r

 import android.content.Intent;\r
 import android.content.res.Configuration;\r
 import android.os.Bundle;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.content.Intent;\r
 import android.content.res.Configuration;\r
 import android.os.Bundle;\r
 import android.support.v4.app.FragmentTransaction;\r

-import android.util.Log;\r

 \r
 import com.actionbarsherlock.app.ActionBar;\r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 \r
 import com.actionbarsherlock.app.ActionBar;\r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r


@@ -32,7 +33,6 @@ import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileDownloader;\r
 import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.files.services.FileDownloader;\r
 import eu.alefzero.owncloud.ui.fragment.FileDetailFragment;\r

-import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r

 \r
 /**\r
  * This activity displays the details of a file like its name, its size and so\r
 \r
 /**\r
  * This activity displays the details of a file like its name, its size and so\r


@@ -43,6 +43,8 @@ import eu.alefzero.owncloud.ui.fragment.FileListFragment;
  */\r
 public class FileDetailActivity extends SherlockFragmentActivity implements FileDetailFragment.ContainerActivity {\r
     \r
  */\r
 public class FileDetailActivity extends SherlockFragmentActivity implements FileDetailFragment.ContainerActivity {\r
     \r

+    public static final int DIALOG_SHORT_WAIT = 0;\r
+    \r

     private boolean mConfigurationChangedToLandscape = false;\r
 \r
     @Override\r
     private boolean mConfigurationChangedToLandscape = false;\r
 \r
     @Override\r


@@ -110,6 +112,27 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
         finish();\r
     }\r
     \r
         finish();\r
     }\r
     \r

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

     /**\r
      * {@inheritDoc}\r
      */\r
     /**\r
      * {@inheritDoc}\r
      */\r


@@ -117,6 +140,5 @@ public class FileDetailActivity extends SherlockFragmentActivity implements File
     public void onFileStateChanged() {\r
         // nothing to do here!\r
     }\r
     public void onFileStateChanged() {\r
         // nothing to do here!\r
     }\r

-    \r

 \r
 }\r
 \r
 }\r