package com.owncloud.android.ui.activity;\r
\r
import java.io.File;\r
-import java.util.ArrayList;\r
\r
import android.accounts.Account;\r
import android.accounts.AccountManager;\r
*/\r
\r
public class FileDisplayActivity extends SherlockFragmentActivity implements\r
- FileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r
+ FileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener {\r
\r
private ArrayAdapter<String> mDirectories;\r
private OCFile mCurrentDir;\r
- private String[] mDirs = null;\r
\r
private DataStorageManager mStorageManager;\r
private SyncBroadcastReceiver mSyncBroadcastReceiver;\r
private UploadFinishReceiver mUploadFinishReceiver;\r
private DownloadFinishReceiver mDownloadFinishReceiver;\r
\r
- private View mLayoutView = null;\r
private FileListFragment mFileList;\r
\r
private boolean mDualPane;\r
\r
- private boolean mForcedLoginToCreateFirstAccount = false;\r
- \r
- private static final String KEY_DIR_ARRAY = "DIR_ARRAY";\r
- private static final String KEY_CURRENT_DIR = "DIR";\r
- \r
private static final int DIALOG_SETUP_ACCOUNT = 0;\r
private static final int DIALOG_CREATE_DIR = 1;\r
private static final int DIALOG_ABOUT_APP = 2;\r
\r
@Override\r
public void onCreate(Bundle savedInstanceState) {\r
- Log.i(getClass().toString(), "onCreate() start");\r
+ Log.d(getClass().toString(), "onCreate() start");\r
super.onCreate(savedInstanceState);\r
\r
- requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
-\r
Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
\r
+ /// saved instance state: keep this always before initDataFromCurrentAccount()\r
if(savedInstanceState != null) {\r
- mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
- mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
- mDirectories.add(OCFile.PATH_SEPARATOR);\r
- if (mDirs != null)\r
- for (String s : mDirs)\r
- mDirectories.insert(s, 0);\r
mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
}\r
\r
- mLayoutView = getLayoutInflater().inflate(R.layout.files, null); // always inflate this at onCreate() ; just once!\r
- \r
- if (AccountUtils.accountsAreSetup(this)) {\r
+ if (!AccountUtils.accountsAreSetup(this)) {\r
+ /// no account available: FORCE ACCOUNT CREATION\r
+ mStorageManager = null;\r
+ createFirstAccount();\r
\r
- initDelayedTilAccountAvailabe();\r
+ } else { /// at least an account is available\r
\r
- // PIN CODE request ; best location is to decide, let's try this first\r
- //if (savedInstanceState == null) {\r
- if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
- requestPinCode();\r
- }\r
+ initDataFromCurrentAccount();\r
\r
+ }\r
+\r
+ // PIN CODE request ; best location is to decide, let's try this first\r
+ if (getIntent().getAction() != null && getIntent().getAction().equals(Intent.ACTION_MAIN) && savedInstanceState == null) {\r
+ requestPinCode();\r
+ }\r
+\r
\r
- } else {\r
+ /// USER INTERFACE\r
+ requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
\r
- setContentView(R.layout.no_account_available);\r
- getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
- findViewById(R.id.setup_account).setOnClickListener(this);\r
+ // Drop-down navigation \r
+ mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
+ OCFile currFile = mCurrentDir;\r
+ while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {\r
+ mDirectories.insert(currFile.getFileName(), 0);\r
+ currFile = mStorageManager.getFileById(currFile.getParentId());\r
+ }\r
+ mDirectories.insert(OCFile.PATH_SEPARATOR, 0);\r
\r
- setSupportProgressBarIndeterminateVisibility(false);\r
+ // Inflate and set the layout view\r
+ setContentView(R.layout.files); \r
+ mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
+ mDualPane = (findViewById(R.id.file_details_container) != null);\r
+ if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+ transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
+ transaction.commit();\r
+ }\r
+ \r
+ // Action bar setup\r
+ ActionBar actionBar = getSupportActionBar();\r
+ actionBar.setHomeButtonEnabled(true); // mandatory since Android ICS, according to the official documentation\r
+ actionBar.setDisplayHomeAsUpEnabled(mCurrentDir != null && mCurrentDir.getParentId() != 0);\r
+ actionBar.setDisplayShowTitleEnabled(false);\r
+ actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
+ actionBar.setListNavigationCallbacks(mDirectories, this);\r
+ setSupportProgressBarIndeterminateVisibility(false); // always AFTER setContentView(...) ; to workaround bug in its implementation\r
+ \r
+ Log.d(getClass().toString(), "onCreate() end");\r
+ }\r
+\r
+\r
+ /**\r
+ * Launches the account creation activity. To use when no ownCloud account is available\r
+ */\r
+ private void createFirstAccount() {\r
+ Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
+ intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
+ startActivity(intent); // the new activity won't be created until this.onStart() and this.onResume() are finished;\r
+ }\r
\r
- Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
- intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
- startActivity(intent); // although the code is here, the activity won't be created until this.onStart() and this.onResume() are finished;\r
- mForcedLoginToCreateFirstAccount = true;\r
+\r
+ /**\r
+ * Load of state dependent of the existence of an ownCloud account\r
+ */\r
+ private void initDataFromCurrentAccount() {\r
+ /// Storage manager initialization - access to local database\r
+ mStorageManager = new FileDataStorageManager(\r
+ AccountUtils.getCurrentOwnCloudAccount(this),\r
+ getContentResolver());\r
+\r
+ /// State recovery - CURRENT DIRECTORY ; priority: 1/ getIntent(), 2/ savedInstanceState (in onCreate()), 3/ root dir\r
+ if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)) {\r
+ mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
+ if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r
+ mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
+ }\r
+ // clear intent extra, so rotating the screen will not return us to this directory\r
+ getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
}\r
- \r
- Log.i(getClass().toString(), "onCreate() end");\r
+ if (mCurrentDir == null)\r
+ mCurrentDir = mStorageManager.getFileByPath("/"); // this will return NULL if the database has not ever synchronized\r
}\r
+ \r
\r
@Override\r
public boolean onCreateOptionsMenu(Menu menu) {\r
while (i-- != 0) {\r
onBackPressed();\r
}\r
+ // the next operation triggers a new call to this method, but it's necessary to \r
+ // ensure that the name exposed in the action bar is the current directory when the \r
+ // user selected it in the navigation list\r
+ if (itemPosition != 0)\r
+ getSupportActionBar().setSelectedNavigationItem(0);\r
return true;\r
}\r
\r
\r
@Override\r
public void onBackPressed() {\r
- if (mDirectories == null || mDirectories.getCount() <= 1) {\r
+ if (mDirectories.getCount() <= 1) {\r
finish();\r
return;\r
}\r
\r
@Override\r
protected void onSaveInstanceState(Bundle outState) {\r
- // responsability of restore is prefered in onCreate() before than in onRestoreInstanceState when there are Fragments involved\r
- Log.i(getClass().toString(), "onSaveInstanceState() start");\r
+ // responsibility of restore is preferred in onCreate() before than in onRestoreInstanceState when there are Fragments involved\r
+ Log.d(getClass().toString(), "onSaveInstanceState() start");\r
super.onSaveInstanceState(outState);\r
- if(mDirectories != null && mDirectories.getCount() != 0){\r
- mDirs = new String[mDirectories.getCount()-1];\r
- for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) {\r
- mDirs[i] = mDirectories.getItem(j);\r
- }\r
- }\r
- outState.putStringArray(KEY_DIR_ARRAY, mDirs);\r
outState.putParcelable(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
- Log.i(getClass().toString(), "onSaveInstanceState() end");\r
+ Log.d(getClass().toString(), "onSaveInstanceState() end");\r
}\r
\r
@Override\r
protected void onResume() {\r
- Log.i(getClass().toString(), "onResume() start");\r
+ Log.d(getClass().toString(), "onResume() start");\r
super.onResume();\r
\r
if (AccountUtils.accountsAreSetup(this)) {\r
- // at least an account exist: normal operation\r
\r
- // set the layout only if it couldn't be set in onCreate\r
- if (mForcedLoginToCreateFirstAccount) {\r
- initDelayedTilAccountAvailabe();\r
- mForcedLoginToCreateFirstAccount = false;\r
+ if (mStorageManager == null) {\r
+ // this is necessary for handling the come back to FileDisplayActivity when the first ownCloud account is created \r
+ initDataFromCurrentAccount();\r
}\r
-\r
+ \r
// Listen for sync messages\r
IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
mSyncBroadcastReceiver = new SyncBroadcastReceiver();\r
mDownloadFinishReceiver = new DownloadFinishReceiver();\r
registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
\r
- // Storage manager initialization\r
- mStorageManager = new FileDataStorageManager(\r
- AccountUtils.getCurrentOwnCloudAccount(this),\r
- getContentResolver());\r
- \r
- // File list fragments \r
- mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
- \r
- \r
- // Figure out what directory to list. \r
- // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null)\r
- if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){\r
- mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE);\r
- if(mCurrentDir != null && !mCurrentDir.isDirectory()){\r
- mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId());\r
- }\r
+ // List current directory\r
+ mFileList.listDirectory(mCurrentDir);\r
\r
- // Clear intent extra, so rotating the screen will not return us to this directory\r
- getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
- }\r
+ } else {\r
\r
- if (mCurrentDir == null)\r
- mCurrentDir = mStorageManager.getFileByPath("/");\r
- \r
- // Drop-Down navigation and file list restore\r
- mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
- \r
- \r
- // Given the case we have a file to display:\r
- if(mCurrentDir != null){\r
- ArrayList<OCFile> files = new ArrayList<OCFile>();\r
- OCFile currFile = mCurrentDir;\r
- while(currFile != null){\r
- files.add(currFile);\r
- currFile = mStorageManager.getFileById(currFile.getParentId());\r
- }\r
+ mStorageManager = null; // an invalid object will be there if all the ownCloud accounts are removed\r
+ showDialog(DIALOG_SETUP_ACCOUNT);\r
\r
- // Insert in mDirs\r
- mDirs = new String[files.size()];\r
- for(int i = files.size() - 1; i >= 0; i--){\r
- mDirs[i] = files.get(i).getFileName();\r
- }\r
- }\r
- \r
- if (mDirs != null) {\r
- for (String s : mDirs)\r
- mDirectories.add(s);\r
- } else {\r
- mDirectories.add(OCFile.PATH_SEPARATOR);\r
- }\r
- \r
- // Actionbar setup\r
- ActionBar action_bar = getSupportActionBar();\r
- action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
- action_bar.setDisplayShowTitleEnabled(false);\r
- action_bar.setListNavigationCallbacks(mDirectories, this);\r
- if(mCurrentDir != null && mCurrentDir.getParentId() != 0){\r
- action_bar.setDisplayHomeAsUpEnabled(true);\r
- } else {\r
- action_bar.setDisplayHomeAsUpEnabled(false);\r
- }\r
- \r
- // List dir here\r
- mFileList.listDirectory(mCurrentDir);\r
}\r
- Log.i(getClass().toString(), "onResume() end");\r
+ Log.d(getClass().toString(), "onResume() end");\r
}\r
\r
@Override\r
protected void onPause() {\r
- Log.i(getClass().toString(), "onPause() start");\r
+ Log.d(getClass().toString(), "onPause() start");\r
super.onPause();\r
if (mSyncBroadcastReceiver != null) {\r
unregisterReceiver(mSyncBroadcastReceiver);\r
unregisterReceiver(mDownloadFinishReceiver);\r
mDownloadFinishReceiver = null;\r
}\r
+ if (!AccountUtils.accountsAreSetup(this)) {\r
+ dismissDialog(DIALOG_SETUP_ACCOUNT);\r
+ }\r
\r
getIntent().putExtra(FileDetailFragment.EXTRA_FILE, mCurrentDir);\r
- Log.i(getClass().toString(), "onPause() end");\r
+ Log.d(getClass().toString(), "onPause() end");\r
}\r
\r
@Override\r
Dialog dialog = null;\r
AlertDialog.Builder builder;\r
switch (id) {\r
- case DIALOG_SETUP_ACCOUNT:\r
+ case DIALOG_SETUP_ACCOUNT: {\r
builder = new AlertDialog.Builder(this);\r
builder.setTitle(R.string.main_tit_accsetup);\r
builder.setMessage(R.string.main_wrn_accsetup);\r
builder.setCancelable(false);\r
- builder.setPositiveButton(android.R.string.ok, this);\r
- builder.setNegativeButton(android.R.string.cancel, this);\r
+ builder.setPositiveButton(android.R.string.ok, new OnClickListener() {\r
+ public void onClick(DialogInterface dialog, int which) {\r
+ createFirstAccount();\r
+ dialog.dismiss();\r
+ }\r
+ });\r
+ builder.setNegativeButton(R.string.common_exit, new OnClickListener() {\r
+ public void onClick(DialogInterface dialog, int which) {\r
+ dialog.dismiss();\r
+ finish();\r
+ }\r
+ });\r
+ //builder.setNegativeButton(android.R.string.cancel, this);\r
dialog = builder.create();\r
break;\r
+ }\r
case DIALOG_ABOUT_APP: {\r
builder = new AlertDialog.Builder(this);\r
builder.setTitle(getString(R.string.about_title));\r
\r
\r
/**\r
- * Responds to the "There are no ownCloud Accounts setup" dialog\r
- * TODO: Dialog is 100% useless -> Remove\r
- */\r
- @Override\r
- public void onClick(DialogInterface dialog, int which) {\r
- // In any case - we won't need it anymore\r
- dialog.dismiss();\r
- switch (which) {\r
- case DialogInterface.BUTTON_POSITIVE:\r
- Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
- intent.putExtra("authorities",\r
- new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
- startActivity(intent);\r
- break;\r
- case DialogInterface.BUTTON_NEGATIVE:\r
- finish();\r
- }\r
- \r
- }\r
-\r
- /**\r
* Translates a content URI of an image to a physical path\r
* on the disk\r
* @param uri The URI to resolve\r
}\r
}\r
}\r
-\r
- \r
- @Override\r
- public void onClick(View v) {\r
- if (v.getId() == R.id.setup_account) {\r
- Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
- intent.putExtra(android.provider.Settings.EXTRA_AUTHORITIES, new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
- startActivity(intent); \r
- mForcedLoginToCreateFirstAccount = true;\r
- }\r
- }\r
-\r
\r
\r
\r
}\r
}\r
\r
- \r
- /**\r
- * Operations in this method should be preferably performed in onCreate to have a lighter onResume method. \r
- * \r
- * But we need to delay them to onResume for the first start of the application, when no account exists and the login activity must be shown; and \r
- * put instead the ugly view that shows the 'Setup' button to restart the login activity. \r
- * \r
- * In other way, if the users cancels or presses BACK in the login page that first time (users can be cruel sometimes) would show a blank view (the \r
- * FragmentList view empty).\r
- * \r
- * This is temporal, until we found out how to get a result in this activity after launching the ADD_ACCOUNT Intent with startActivityForResult (not trivial)\r
- */\r
- private void initDelayedTilAccountAvailabe() {\r
- setContentView(mLayoutView); \r
- mDualPane = (findViewById(R.id.file_details_container) != null);\r
- if (mDualPane && getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG) == null) {\r
- FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
- transaction.replace(R.id.file_details_container, new FileDetailFragment(null, null)); // empty FileDetailFragment\r
- transaction.commit();\r
- }\r
- setSupportProgressBarIndeterminateVisibility(false);\r
- }\r
- \r
-\r
/**\r
* Launch an intent to request the PIN code to the user before letting him use the app\r
*/\r
projects / pub / Android / ownCloud.git / blobdiff