import android.net.Uri;\r
import android.os.Bundle;\r
import android.provider.MediaStore;\r
+import android.support.v4.app.FragmentTransaction;\r
import android.util.Log;\r
import android.view.View;\r
import android.view.ViewGroup;\r
import android.widget.ArrayAdapter;\r
import android.widget.EditText;\r
import android.widget.TextView;\r
-import android.widget.Toast;\r
\r
import com.actionbarsherlock.app.ActionBar;\r
import com.actionbarsherlock.app.ActionBar.OnNavigationListener;\r
*/\r
\r
public class FileDisplayActivity extends SherlockFragmentActivity implements\r
- OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r
+ FileListFragment.ContainerActivity, OnNavigationListener, OnClickListener, android.view.View.OnClickListener {\r
\r
private ArrayAdapter<String> mDirectories;\r
private OCFile mCurrentDir;\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_ABOUT_APP = 2;\r
\r
private static final int ACTION_SELECT_FILE = 1;\r
- //private static final int ACTION_CREATE_FIRST_ACCOUNT = 2; dvelasco: WIP\r
-\r
+ \r
@Override\r
public void onCreate(Bundle savedInstanceState) {\r
Log.i(getClass().toString(), "onCreate() start");\r
\r
Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r
\r
- if(savedInstanceState != null){\r
- mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); // this is never saved with this key :S\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("/");\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
- setContentView(mLayoutView); \r
\r
- } else {\r
+ initDelayedTilAccountAvailabe();\r
+ \r
+ } else {\r
+ \r
setContentView(R.layout.no_account_available);\r
- setProgressBarIndeterminateVisibility(false);\r
getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE);\r
findViewById(R.id.setup_account).setOnClickListener(this);\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
Log.i(getClass().toString(), "onCreate() end");\r
}\r
\r
@Override\r
- protected void onRestoreInstanceState(Bundle savedInstanceState) {\r
- Log.i(getClass().toString(), "onRestoreInstanceState() start");\r
- super.onRestoreInstanceState(savedInstanceState);\r
- mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY);\r
- mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
- mDirectories.add("/");\r
- if (mDirs != null)\r
- for (String s : mDirs)\r
- mDirectories.insert(s, 0);\r
- mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);\r
- Log.i(getClass().toString(), "onRestoreInstanceState() end");\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
super.onSaveInstanceState(outState);\r
if(mDirectories != null && mDirectories.getCount() != 0){\r
Log.i(getClass().toString(), "onResume() start");\r
super.onResume();\r
\r
- if (!AccountUtils.accountsAreSetup(this)) {\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
- startActivityForResult(intent, ACTION_CREATE_FIRST_ACCOUNT);*/\r
+ if (AccountUtils.accountsAreSetup(this)) {\r
+ // at least an account exist: normal operation\r
\r
- } else { // at least an account exist: normal operation\r
-\r
// set the layout only if it couldn't be set in onCreate\r
- if (findViewById(R.id.file_list_view) == null)\r
- setContentView(mLayoutView);\r
+ if (mForcedLoginToCreateFirstAccount) {\r
+ initDelayedTilAccountAvailabe();\r
+ mForcedLoginToCreateFirstAccount = false;\r
+ }\r
\r
// Listen for sync messages\r
IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE);\r
AccountUtils.getCurrentOwnCloudAccount(this),\r
getContentResolver());\r
\r
- // File list\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
@Override\r
public void run() {\r
WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());\r
- \r
+ \r
String username = mAccount.name.substring(0,\r
mAccount.name.lastIndexOf('@'));\r
String password = mAm.getPassword(mAccount);\r
@Override\r
public void onClick(View v) {\r
if (v.getId() == R.id.setup_account) {\r
- Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
- intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE });\r
- startActivity(intent);\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
+ * {@inheritDoc}\r
+ */\r
+ @Override\r
public DataStorageManager getStorageManager() {\r
return mStorageManager;\r
- } \r
+ }\r
+ \r
+ \r
+ /**\r
+ * {@inheritDoc}\r
+ */\r
+ @Override\r
+ public void onDirectoryClick(OCFile directory) {\r
+ pushDirname(directory);\r
+ ActionBar actionBar = getSupportActionBar();\r
+ actionBar.setDisplayHomeAsUpEnabled(true);\r
+ \r
+ if (mDualPane) {\r
+ // Resets the FileDetailsFragment on Tablets so that it always displays\r
+ FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+ if (fileDetails != null) {\r
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+ transaction.remove(fileDetails);\r
+ transaction.add(R.id.file_details_container, new FileDetailFragment(null, null));\r
+ transaction.commit();\r
+ }\r
+ }\r
+ }\r
+ \r
+ \r
+ /**\r
+ * {@inheritDoc}\r
+ */\r
+ @Override\r
+ public void onFileClick(OCFile file) {\r
+ \r
+ // If we are on a large device -> update fragment\r
+ if (mDualPane) {\r
+ FileDetailFragment fileDetails = (FileDetailFragment) getSupportFragmentManager().findFragmentByTag(FileDetailFragment.FTAG);\r
+ if (fileDetails == null) {\r
+ // first selected file since the current directory was listed\r
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();\r
+ transaction.replace(R.id.file_details_container, new FileDetailFragment(file, AccountUtils.getCurrentOwnCloudAccount(this)), FileDetailFragment.FTAG);\r
+ transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);\r
+ transaction.commit();\r
+ } else {\r
+ // another select file\r
+ fileDetails.updateFileDetails(file, AccountUtils.getCurrentOwnCloudAccount(this));\r
+ } \r
+ \r
+ } else { // small or medium screen device -> new Activity\r
+ Intent showDetailsIntent = new Intent(this, FileDetailActivity.class);\r
+ showDetailsIntent.putExtra(FileDetailFragment.EXTRA_FILE, file);\r
+ showDetailsIntent.putExtra(FileDownloader.EXTRA_ACCOUNT, AccountUtils.getCurrentOwnCloudAccount(this));\r
+ startActivity(showDetailsIntent);\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
+\r
+ }\r
+\r
+ \r
}\r
projects / pub / Android / ownCloud.git / blobdiff