@Override
protected void onCreate(Bundle savedInstanceState) {
Log_OC.d(TAG, "onCreate() start");
- super.onCreate(savedInstanceState);
-
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-
+
+ super.onCreate(savedInstanceState); // this calls onAccountChanged() when ownCloud Account is valid
+
mHandler = new Handler();
/// bindings to transference services
mRightFragmentContainer = findViewById(R.id.right_fragment_container);
if (savedInstanceState == null) {
createMinFragments();
- if (!isRedirectingToSetupAccount()) {
- initFragmentsWithFile();
- }
}
// Action bar setup
mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
- OCFile currFile = getFile();
- if (mStorageManager != null) {
- while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {
- if (currFile.isDirectory()) {
- mDirectories.add(currFile.getFileName());
- }
- currFile = mStorageManager.getFileById(currFile.getParentId());
- }
- }
- mDirectories.add(OCFile.PATH_SEPARATOR);
- ActionBar actionBar = getSupportActionBar();
- actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
- setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to workaround bug in its implementation
-
+ getSupportActionBar().setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation
+ setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to work around bug in its implementation
+
Log_OC.d(TAG, "onCreate() end");
}
}
if (file == null) {
// fall back to root folder
- file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); // never should return null
+ file = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR); // never returns null
}
setFile(file);
-
- if (findViewById(android.R.id.content) != null && !stateWasRecovered) {
+ mDirectories.clear();
+ OCFile fileIt = file;
+ while(fileIt != null && fileIt.getFileName() != OCFile.PATH_SEPARATOR) {
+ if (fileIt.isDirectory()) {
+ mDirectories.add(fileIt.getFileName());
+ }
+ fileIt = mStorageManager.getFileById(fileIt.getParentId());
+ }
+ mDirectories.add(OCFile.PATH_SEPARATOR);
+ if (!stateWasRecovered) {
Log_OC.e(TAG, "Initializing Fragments in onAccountChanged..");
initFragmentsWithFile();
+
} else {
- Log_OC.e(TAG, "Fragment initializacion ignored in onAccountChanged due to lack of CONTENT VIEW");
+ updateFragmentsVisibility(!file.isDirectory());
+ updateNavigationElementsInActionBar(file.isDirectory() ? null : file);
}
-
+
+
} else {
Log_OC.wtf(TAG, "onAccountChanged was called with NULL account associated!");
}
private void initFragmentsWithFile() {
if (getAccount() != null && getFile() != null) {
+ /// First fragment
+ OCFileListFragment listOfFiles = getListOfFilesFragment();
+ if (listOfFiles != null) {
+ listOfFiles.listDirectory(getCurrentDir());
+ } else {
+ Log.e(TAG, "Still have a chance to lose the initializacion of list fragment >(");
+ }
+
/// Second fragment
OCFile file = getFile();
Fragment secondFragment = chooseInitialSecondFragment(file);
if (secondFragment != null) {
setSecondFragment(secondFragment);
+ updateFragmentsVisibility(true);
+ updateNavigationElementsInActionBar(file);
+
+ } else {
+ cleanSecondFragment();
}
} else {
FragmentTransaction tr = getSupportFragmentManager().beginTransaction();
tr.remove(second);
tr.commit();
- updateFragmentsVisibility(false);
}
+ updateFragmentsVisibility(false);
+ updateNavigationElementsInActionBar(null);
}
protected void refeshListOfFilesFragment() {
setFile(listOfFiles.getCurrentFile());
}
cleanSecondFragment();
- updateNavigationElementsInActionBar(null);
}
@Override
}
@Override
- protected void onStart() {
- super.onStart();
- FileFragment second = getSecondFragment();
- updateFragmentsVisibility(second != null);
- updateNavigationElementsInActionBar((second == null) ? null : second.getFile());
- }
-
- @Override
protected void onResume() {
super.onResume();
Log_OC.e(TAG, "onResume() start");
downloadIntentFilter.addAction(FileDownloader.DOWNLOAD_FINISH_MESSAGE);
mDownloadFinishReceiver = new DownloadFinishReceiver();
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
-
- // List current directory
- OCFileListFragment listOfFiles = getListOfFilesFragment();
- if (listOfFiles != null) {
- listOfFiles.listDirectory(getCurrentDir()); // TODO we should find the way to avoid the need of this (maybe it's not necessary yet; to check)
- }
-
+
Log_OC.d(TAG, "onResume() end");
}
|| fillBlankRoot ) {
if (!fillBlankRoot)
currentDir = getStorageManager().getFileByPath(synchFolderRemotePath);
-// OCFileListFragment fileListFragment = getListOfFilesFragment();
-// if (fileListFragment != null) {
-// fileListFragment.listDirectory(currentDir);
-// }
- }
-
- OCFileListFragment fileListFragment = getListOfFilesFragment();
- if (fileListFragment != null) {
- fileListFragment.listDirectory(currentDir);
+ OCFileListFragment fileListFragment = getListOfFilesFragment();
+ if (fileListFragment != null) {
+ fileListFragment.listDirectory(currentDir);
+ }
+ if (getSecondFragment() == null)
+ setFile(currentDir);
}
-
- setFile(currentDir);
-
+
setSupportProgressBarIndeterminateVisibility(inProgress);
removeStickyBroadcast(intent);
public void onBrowsedDownTo(OCFile directory) {
pushDirname(directory);
cleanSecondFragment();
- updateNavigationElementsInActionBar(null);
}
/**
/**
* TODO
*/
- private void updateNavigationElementsInActionBar(OCFile currentFile) {
+ private void updateNavigationElementsInActionBar(OCFile chosenFile) {
ActionBar actionBar = getSupportActionBar();
- if (currentFile == null || mDualPane) {
+ if (chosenFile == null || mDualPane) {
// only list of files - set for browsing through folders
OCFile currentDir = getCurrentDir();
actionBar.setDisplayHomeAsUpEnabled(currentDir != null && currentDir.getParentId() != 0);
} else {
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowTitleEnabled(true);
- actionBar.setTitle(currentFile.getFileName());
+ actionBar.setTitle(chosenFile.getFileName());
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
}
}
* {@inheritDoc}
*/
@Override
- public OCFile getInitialDirectory() {
- return getCurrentDir();
- }
-
-
- /**
- * {@inheritDoc}
- */
- @Override
public void onFileStateChanged() {
refeshListOfFilesFragment();
updateNavigationElementsInActionBar(getSecondFragment().getFile());
if (file != null) {
if (file.isDirectory()) {
return file;
- } else {
+ } else if (mStorageManager != null) {
return mStorageManager.getFileById(file.getParentId());
}
- } else {
- return null;
}
+ return null;
}
}
public class OCFileListFragment extends ExtendedListFragment implements EditNameDialogListener, ConfirmationDialogFragmentListener {
private static final String TAG = OCFileListFragment.class.getSimpleName();
+
+ private static final String MY_PACKAGE = OCFileListFragment.class.getPackage() != null ? OCFileListFragment.class.getPackage().getName() : "com.owncloud.android.ui.fragment";
+ private static final String EXTRA_FILE = MY_PACKAGE + ".extra.FILE";
private OCFileListFragment.ContainerActivity mContainerActivity;
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
Log_OC.e(TAG, "onActivityCreated() start");
- mAdapter = new FileListListAdapter(mContainerActivity.getInitialDirectory(), mContainerActivity.getStorageManager(), getActivity(), mContainerActivity);
+ mAdapter = new FileListListAdapter(getActivity(), mContainerActivity);
+ if (savedInstanceState != null) {
+ mFile = savedInstanceState.getParcelable(EXTRA_FILE);
+ }
setListAdapter(mAdapter);
registerForContextMenu(getListView());
mHandler = new Handler();
}
-
+
+ /**
+ * Saves the current listed folder.
+ */
+ @Override
+ public void onSaveInstanceState (Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putParcelable(EXTRA_FILE, mFile);
+ }
+
/**
* Call this, when the user presses the up button
if (file != null) {
if (file.isDirectory()) {
// update state and view of this fragment
- mFile = file;
listDirectory(file);
// then, notify parent activity to let it update its state and view, and other fragments
mContainerActivity.onBrowsedDownTo(file);
/**
- * Callback method invoked when the parent activity is fully created to get the directory to list firstly.
- *
- * @return Directory to list firstly. Can be NULL.
- */
- public OCFile getInitialDirectory();
-
-
- /**
* Callback method invoked when a the 'transfer state' of a file changes.
*
* This happens when a download or upload is started or ended for a file.
projects / pub / Android / ownCloud.git / commitdiff