Merge branch 'bug_hunting' into feature_previews

[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 62937b1..6d1524f 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -126,6 +126,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private OCFileListFragment mFileList;\r
     \r
     private boolean mDualPane;\r
     private OCFileListFragment mFileList;\r
     \r
     private boolean mDualPane;\r

+    private boolean mBackFromCreatingFirstAccount;\r

     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r


@@ -241,6 +242,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         // show changelog, if needed\r
         //showChangeLog();\r
         \r
         // show changelog, if needed\r
         //showChangeLog();\r

+        mBackFromCreatingFirstAccount = false;\r

         \r
         Log.d(getClass().toString(), "onCreate() end");\r
     }\r
         \r
         Log.d(getClass().toString(), "onCreate() end");\r
     }\r


@@ -590,6 +592,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 if (mDualPane) {\r
                     initFileDetailsInDualPane();\r
                 }\r
                 if (mDualPane) {\r
                     initFileDetailsInDualPane();\r
                 }\r

+                mBackFromCreatingFirstAccount = true;\r

             }\r
             \r
             // Listen for sync messages\r
             }\r
             \r
             // Listen for sync messages\r


@@ -978,6 +981,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r
                 }\r
                 \r
                 setSupportProgressBarIndeterminateVisibility(inProgress);\r

+                if (mBackFromCreatingFirstAccount) {\r
+                    // awful patch to fix problem with visibility of progress circle with the first refresh of the first account\r
+                    // TODO - kill this Activity when the first account has to be created instead of stack the account creation on it\r
+                    getSupportActionBar().hide();\r
+                    getSupportActionBar().show();\r
+                    mBackFromCreatingFirstAccount = false;\r
+                }\r

                 removeStickyBroadcast(intent);\r
                 \r
             }\r
                 removeStickyBroadcast(intent);\r
                 \r
             }\r