X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e11de332ca2283d15ad313f8cb8ef8a8822aa762..17e1b2350ce8a2d49dbf66f1d2281dfb04c49cc4:/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java index fb3106cb..26953214 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -19,8 +19,8 @@ package eu.alefzero.owncloud.ui.activity; import java.io.File; -import java.net.URLDecoder; import java.net.URLEncoder; +import java.util.ArrayList; import android.accounts.Account; import android.accounts.AccountManager; @@ -42,6 +42,7 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.CheckedTextView; import android.widget.EditText; import android.widget.TextView; @@ -61,6 +62,7 @@ import eu.alefzero.owncloud.datamodel.FileDataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; import eu.alefzero.owncloud.files.services.FileUploader; import eu.alefzero.owncloud.syncadapter.FileSyncService; +import eu.alefzero.owncloud.ui.fragment.FileDetailFragment; import eu.alefzero.owncloud.ui.fragment.FileListFragment; import eu.alefzero.webdav.WebdavClient; @@ -72,14 +74,17 @@ import eu.alefzero.webdav.WebdavClient; */ public class FileDisplayActivity extends SherlockFragmentActivity implements - OnNavigationListener, OnClickListener { + OnNavigationListener, OnClickListener, android.view.View.OnClickListener { private ArrayAdapter mDirectories; private DataStorageManager mStorageManager; + private FileListFragment mFileList; + private OCFile mCurrentDir; private String[] mDirs = null; private SyncBroadcastReceiver syncBroadcastRevceiver; - private static final String KEY_DIR = "DIR"; + private static final String KEY_DIR_ARRAY = "DIR_ARRAY"; + private static final String KEY_CURRENT_DIR = "DIR"; private static final int DIALOG_SETUP_ACCOUNT = 0; private static final int DIALOG_CREATE_DIR = 1; @@ -89,23 +94,22 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - return; - } - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); setProgressBarIndeterminateVisibility(false); - setContentView(R.layout.files); - + if(savedInstanceState != null){ + mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); + } } @Override public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.menu, menu); - return true; + if (accountsAreSetup()) { + MenuInflater inflater = getSherlock().getMenuInflater(); + inflater.inflate(R.menu.menu, menu); + return true; + } + return false; } @Override @@ -133,11 +137,14 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements ACTION_SELECT_FILE); break; } - + case R.id.action_accounts: { + Intent accountIntent = new Intent(this, AccountSelectActivity.class); + startActivity(accountIntent); + } case android.R.id.home: { - Intent i = new Intent(this, AccountSelectActivity.class); - startActivity(i); - finish(); + if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ + onBackPressed(); + } break; } default: @@ -155,6 +162,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements return true; } + /** + * Called, when the user selected something for uploading + */ public void onActivityResult(int requestCode, int resultCode, Intent data) { if (resultCode == RESULT_OK) { if (requestCode == ACTION_SELECT_FILE) { @@ -196,23 +206,24 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override public void onBackPressed() { - if (mDirectories.getCount() == 1) { + if (mDirectories == null || mDirectories.getCount() == 1) { finish(); return; } - popPath(); - ((FileListFragment) getSupportFragmentManager().findFragmentById( - R.id.fileList)).onNavigateUp(); + popDirname(); + mFileList.onNavigateUp(); + mCurrentDir = mFileList.getCurrentFile(); + + if(mCurrentDir.getParentId() == 0){ + ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayHomeAsUpEnabled(false); + } } @Override protected void onRestoreInstanceState(Bundle savedInstanceState) { super.onRestoreInstanceState(savedInstanceState); - // Check, if there are ownCloud accounts - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - } - mDirs = savedInstanceState.getStringArray(KEY_DIR); + mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY); mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); mDirectories.add("/"); if (mDirs != null) @@ -223,44 +234,96 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - if(mDirectories != null){ + if(mDirectories != null && mDirectories.getCount() != 0){ mDirs = new String[mDirectories.getCount()-1]; for (int j = mDirectories.getCount() - 2, i = 0; j >= 0; --j, ++i) { mDirs[i] = mDirectories.getItem(j); } } + outState.putStringArray(KEY_DIR_ARRAY, mDirs); + outState.putParcelable(KEY_CURRENT_DIR, mCurrentDir); } @Override protected void onResume() { super.onResume(); + + //TODO: Dialog useless -> get rid of this if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); + setContentView(R.layout.no_account_available); + setProgressBarIndeterminateVisibility(false); + getSupportActionBar().setNavigationMode(ActionBar.DISPLAY_SHOW_TITLE); + findViewById(R.id.setup_account).setOnClickListener(this); return; + } else if (findViewById(R.id.file_list_view) == null) { + setContentView(R.layout.files); } - IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE); + // Listen for sync messages + IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE); syncBroadcastRevceiver = new SyncBroadcastReceiver(); - registerReceiver(syncBroadcastRevceiver, f); - + registerReceiver(syncBroadcastRevceiver, syncIntentFilter); + + // Storage manager initialization + mStorageManager = new FileDataStorageManager( + AccountUtils.getCurrentOwnCloudAccount(this), + getContentResolver()); + + // File list + mFileList = (FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList); + + // Figure out what directory to list. + // Priority: Intent (here), savedInstanceState (onCreate), root dir (dir is null) + if(getIntent().hasExtra(FileDetailFragment.EXTRA_FILE)){ + mCurrentDir = (OCFile) getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); + if(!mCurrentDir.isDirectory()){ + mCurrentDir = mStorageManager.getFileById(mCurrentDir.getParentId()); + } + + // Clear intent extra, so rotating the screen will not return us to this directory + getIntent().removeExtra(FileDetailFragment.EXTRA_FILE); + } + + // Drop-Down navigation and file list restore mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); - mDirectories.add("/"); + + + // Given the case we have a file to display: + if(mCurrentDir != null){ + ArrayList files = new ArrayList(); + OCFile currFile = mCurrentDir; + while(currFile != null){ + files.add(currFile); + currFile = mStorageManager.getFileById(currFile.getParentId()); + } + + // Insert in mDirs + mDirs = new String[files.size()]; + for(int i = files.size() - 1; i >= 0; i--){ + mDirs[i] = files.get(i).getFileName(); + } + } + if (mDirs != null) { for (String s : mDirs) - mDirectories.insert(s, 0); - FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager() - .findFragmentById(R.id.fileList); - if (fileListFramgent != null) fileListFramgent.listDirectory(); + mDirectories.add(s); + } else { + mDirectories.add("/"); } - - mStorageManager = new FileDataStorageManager( - AccountUtils.getCurrentOwnCloudAccount(this), - getContentResolver()); + + // Actionbar setup ActionBar action_bar = getSupportActionBar(); action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); action_bar.setDisplayShowTitleEnabled(false); action_bar.setListNavigationCallbacks(mDirectories, this); - action_bar.setDisplayHomeAsUpEnabled(true); + if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ + action_bar.setDisplayHomeAsUpEnabled(true); + } else { + action_bar.setDisplayHomeAsUpEnabled(false); + } + + // List dir here + mFileList.listDirectory(mCurrentDir); } @Override @@ -289,39 +352,40 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements break; case DIALOG_CREATE_DIR: { builder = new Builder(this); - final EditText dirName = new EditText(getBaseContext()); + final EditText dirNameInput = new EditText(getBaseContext()); final Account a = AccountUtils.getCurrentOwnCloudAccount(this); - builder.setView(dirName); + builder.setView(dirNameInput); builder.setTitle(R.string.uploader_info_dirname); int typed_color = getResources().getColor(R.color.setup_text_typed); - dirName.setTextColor(typed_color); + dirNameInput.setTextColor(typed_color); builder.setPositiveButton(android.R.string.ok, new OnClickListener() { public void onClick(DialogInterface dialog, int which) { - String s = dirName.getText().toString(); - if (s.trim().length() == 0) { + String directoryName = dirNameInput.getText().toString(); + if (directoryName.trim().length() == 0) { dialog.cancel(); return; } - String path = ""; - for (int i = mDirectories.getCount() - 2; i >= 0; --i) { - path += "/" + mDirectories.getItem(i); - } - OCFile parent = mStorageManager.getFileByPath(path - + "/"); - path += s + "/"; + // Figure out the path where the dir needs to be created + String path = mCurrentDir.getRemotePath(); + + // Create directory + path += directoryName + "/"; Thread thread = new Thread(new DirectoryCreator( path, a)); thread.start(); - OCFile new_file = new OCFile(path); - new_file.setMimetype("DIR"); - new_file.setParentId(parent.getParentId()); - mStorageManager.saveFile(new_file); + // Save new directory in local database + OCFile newDir = new OCFile(path); + newDir.setMimetype("DIR"); + newDir.setParentId(mCurrentDir.getFileId()); + mStorageManager.saveFile(newDir); + // Display the new folder right away dialog.dismiss(); + mFileList.listDirectory(mCurrentDir); } }); builder.setNegativeButton(R.string.common_cancel, @@ -340,6 +404,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements return dialog; } + + /** + * Responds to the "There are no ownCloud Accounts setup" dialog + * TODO: Dialog is 100% useless -> Remove + */ + @Override public void onClick(DialogInterface dialog, int which) { // In any case - we won't need it anymore dialog.dismiss(); @@ -356,6 +426,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } + /** + * Translates a content URI of an image to a physical path + * on the disk + * @param uri The URI to resolve + * @return The path to the image or null if it could not be found + */ public String getPath(Uri uri) { String[] projection = { MediaStore.Images.Media.DATA }; Cursor cursor = managedQuery(uri, projection, null, null, null); @@ -364,15 +440,28 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements .getColumnIndexOrThrow(MediaStore.Images.Media.DATA); cursor.moveToFirst(); return cursor.getString(column_index); - } else - return null; + } + return null; } - - public void pushPath(String path) { - mDirectories.insert(path, 0); + + /** + * Pushes a directory to the drop down list + * @param directory to push + * @throws IllegalArgumentException If the {@link OCFile#isDirectory()} returns false. + */ + public void pushDirname(OCFile directory) { + if(!directory.isDirectory()){ + throw new IllegalArgumentException("Only directories may be pushed!"); + } + mDirectories.insert(directory.getFileName(), 0); + mCurrentDir = directory; } - public boolean popPath() { + /** + * Pops a directory name from the drop down list + * @return True, unless the stack is empty + */ + public boolean popDirname() { mDirectories.remove(mDirectories.getItem(0)); return !mDirectories.isEmpty(); } @@ -466,4 +555,13 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements } + @Override + public void onClick(View v) { + if (v.getId() == R.id.setup_account) { + Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); + intent.putExtra("authorities", new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); + startActivity(intent); + } + } + }