mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bug_hunting' into feature_previews

Browse source
This commit is contained in:
David A. Velasco 2013-04-09 12:54:24 +02:00
commit 8638936ce7
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
View file

@ -126,6 +126,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
private OCFileListFragment mFileList; private OCFileListFragment mFileList;
private boolean mDualPane; private boolean mDualPane;
private boolean mBackFromCreatingFirstAccount;
private static final int DIALOG_SETUP_ACCOUNT = 0; private static final int DIALOG_SETUP_ACCOUNT = 0;
private static final int DIALOG_CREATE_DIR = 1; private static final int DIALOG_CREATE_DIR = 1;
@ -241,6 +242,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
// show changelog, if needed // show changelog, if needed
//showChangeLog(); //showChangeLog();
mBackFromCreatingFirstAccount = false;
Log.d(getClass().toString(), "onCreate() end"); Log.d(getClass().toString(), "onCreate() end");
} }
@ -590,6 +592,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
if (mDualPane) { if (mDualPane) {
initFileDetailsInDualPane(); initFileDetailsInDualPane();
} }
mBackFromCreatingFirstAccount = true;
} }
// Listen for sync messages // Listen for sync messages
@ -978,6 +981,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
} }
setSupportProgressBarIndeterminateVisibility(inProgress); setSupportProgressBarIndeterminateVisibility(inProgress);
if (mBackFromCreatingFirstAccount) {
// awful patch to fix problem with visibility of progress circle with the first refresh of the first account
// TODO - kill this Activity when the first account has to be created instead of stack the account creation on it
getSupportActionBar().hide();
getSupportActionBar().show();
mBackFromCreatingFirstAccount = false;
}
removeStickyBroadcast(intent); removeStickyBroadcast(intent);
} }