X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/576e2923ccbb2175b7177b26aca90b4b4c0253d0..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 e7ee4cc1..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,8 +62,8 @@ 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.owncloud.utils.OwnCloudVersion; import eu.alefzero.webdav.WebdavClient; /** @@ -73,25 +74,266 @@ 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_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; - - private static final int REQUEST_ACCOUNT_SETUP = 0; private static final int ACTION_SELECT_FILE = 1; - public void pushPath(String path) { - mDirectories.insert(path, 0); + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + setProgressBarIndeterminateVisibility(false); + + if(savedInstanceState != null){ + mCurrentDir = (OCFile) savedInstanceState.getParcelable(KEY_CURRENT_DIR); + } } - public boolean popPath() { - mDirectories.remove(mDirectories.getItem(0)); - return !mDirectories.isEmpty(); + @Override + public boolean onCreateOptionsMenu(Menu menu) { + if (accountsAreSetup()) { + MenuInflater inflater = getSherlock().getMenuInflater(); + inflater.inflate(R.menu.menu, menu); + return true; + } + return false; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + boolean retval = true; + switch (item.getItemId()) { + case R.id.createDirectoryItem: { + showDialog(DIALOG_CREATE_DIR); + break; + } + case R.id.startSync: { + Bundle bundle = new Bundle(); + bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); + ContentResolver.requestSync( + AccountUtils.getCurrentOwnCloudAccount(this), + "org.owncloud", bundle); + break; + } + case R.id.action_upload: { + Intent action = new Intent(Intent.ACTION_GET_CONTENT); + action = action.setType("*/*") + .addCategory(Intent.CATEGORY_OPENABLE); + startActivityForResult( + Intent.createChooser(action, "Upload file from..."), + ACTION_SELECT_FILE); + break; + } + case R.id.action_accounts: { + Intent accountIntent = new Intent(this, AccountSelectActivity.class); + startActivity(accountIntent); + } + case android.R.id.home: { + if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ + onBackPressed(); + } + break; + } + default: + retval = false; + } + return retval; + } + + @Override + public boolean onNavigationItemSelected(int itemPosition, long itemId) { + int i = itemPosition; + while (i-- != 0) { + onBackPressed(); + } + 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) { + Uri selectedImageUri = data.getData(); + + String filemanagerstring = selectedImageUri.getPath(); + String selectedImagePath = getPath(selectedImageUri); + String filepath; + + if (selectedImagePath != null) + filepath = selectedImagePath; + else + filepath = filemanagerstring; + + if (filepath == null) { + Log.e("FileDisplay", "Couldnt resolve path to file"); + return; + } + + Intent i = new Intent(this, FileUploader.class); + i.putExtra(FileUploader.KEY_ACCOUNT, + AccountUtils.getCurrentOwnCloudAccount(this)); + String remotepath = new String(); + for (int j = mDirectories.getCount() - 2; j >= 0; --j) { + remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j)); + } + if (!remotepath.endsWith("/")) + remotepath += "/"; + remotepath += URLEncoder.encode(new File(filepath).getName()); + Log.e("ASD", remotepath + ""); + + i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath); + i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath); + i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE); + startService(i); + } + } + } + + @Override + public void onBackPressed() { + if (mDirectories == null || mDirectories.getCount() == 1) { + finish(); + return; + } + 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); + mDirs = savedInstanceState.getStringArray(KEY_DIR_ARRAY); + mDirectories = new CustomArrayAdapter(this, R.layout.sherlock_spinner_dropdown_item); + mDirectories.add("/"); + if (mDirs != null) + for (String s : mDirs) + mDirectories.insert(s, 0); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + 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()) { + 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); + } + + // Listen for sync messages + IntentFilter syncIntentFilter = new IntentFilter(FileSyncService.SYNC_MESSAGE); + syncBroadcastRevceiver = new SyncBroadcastReceiver(); + 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); + + + // 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.add(s); + } else { + mDirectories.add("/"); + } + + // Actionbar setup + ActionBar action_bar = getSupportActionBar(); + action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); + action_bar.setDisplayShowTitleEnabled(false); + action_bar.setListNavigationCallbacks(mDirectories, this); + if(mCurrentDir != null && mCurrentDir.getParentId() != 0){ + action_bar.setDisplayHomeAsUpEnabled(true); + } else { + action_bar.setDisplayHomeAsUpEnabled(false); + } + + // List dir here + mFileList.listDirectory(mCurrentDir); + } + + @Override + protected void onPause() { + super.onPause(); + if (syncBroadcastRevceiver != null) { + unregisterReceiver(syncBroadcastRevceiver); + syncBroadcastRevceiver = null; + } + } @Override @@ -110,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, @@ -157,164 +400,38 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements default: dialog = null; } - + return dialog; } + + /** + * Responds to the "There are no ownCloud Accounts setup" dialog + * TODO: Dialog is 100% useless -> Remove + */ @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - return; - } - - requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - setProgressBarIndeterminateVisibility(false); - // if (getSupportFragmentManager().findFragmentById(R.id.fileList) == - // null) - setContentView(R.layout.files); - - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - boolean retval = true; - switch (item.getItemId()) { - case R.id.settingsItem: { - Intent i = new Intent(this, Preferences.class); - startActivity(i); - break; - } - case R.id.createDirectoryItem: { - showDialog(DIALOG_CREATE_DIR); - break; - } - case R.id.startSync: { - Bundle bundle = new Bundle(); - bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true); - ContentResolver.requestSync( - AccountUtils.getCurrentOwnCloudAccount(this), - "org.owncloud", bundle); - break; - } - case R.id.action_upload: { - Intent action = new Intent(Intent.ACTION_GET_CONTENT); - action = action.setType("*/*") - .addCategory(Intent.CATEGORY_OPENABLE); - startActivityForResult( - Intent.createChooser(action, "Upload file from..."), - ACTION_SELECT_FILE); - break; - } - - case android.R.id.home: { - Intent i = new Intent(this, AccountSelectActivity.class); - startActivity(i); - finish(); + public void onClick(DialogInterface dialog, int which) { + // In any case - we won't need it anymore + dialog.dismiss(); + switch (which) { + case DialogInterface.BUTTON_POSITIVE: + Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); + intent.putExtra("authorities", + new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); + startActivity(intent); break; - } - default: - retval = false; - } - return retval; - } - - @Override - public void onBackPressed() { - if (mDirectories.getCount() == 1) { + case DialogInterface.BUTTON_NEGATIVE: finish(); - return; - } - popPath(); - ((FileListFragment) getSupportFragmentManager().findFragmentById( - R.id.fileList)).onNavigateUp(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - MenuInflater inflater = getSherlock().getMenuInflater(); - inflater.inflate(R.menu.menu, menu); - return true; - } - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - // Check, if there are ownCloud accounts - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - } - } - - @Override - protected void onResume() { - super.onResume(); - if (!accountsAreSetup()) { - showDialog(DIALOG_SETUP_ACCOUNT); - return; - } - - IntentFilter f = new IntentFilter(FileSyncService.SYNC_MESSAGE); - syncBroadcastRevceiver = new SyncBroadcastReceiver(); - registerReceiver(syncBroadcastRevceiver, f); - - mDirectories = new CustomArrayAdapter(this, - R.layout.sherlock_spinner_dropdown_item); - mDirectories.add("/"); - - mStorageManager = new FileDataStorageManager( - AccountUtils.getCurrentOwnCloudAccount(this), - getContentResolver()); - ActionBar action_bar = getSupportActionBar(); - action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); - action_bar.setDisplayShowTitleEnabled(false); - action_bar.setListNavigationCallbacks(mDirectories, this); - action_bar.setDisplayHomeAsUpEnabled(true); - } - - public void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.e("ASD", requestCode + " " + resultCode); - if (resultCode == RESULT_OK) { - if (requestCode == ACTION_SELECT_FILE) { - Uri selectedImageUri = data.getData(); - - String filemanagerstring = selectedImageUri.getPath(); - String selectedImagePath = getPath(selectedImageUri); - String filepath; - - if (selectedImagePath != null) - filepath = selectedImagePath; - else - filepath = filemanagerstring; - - if (filepath == null) { - Log.e("FileDisplay", "Couldnt resolve path to file"); - return; - } - - Intent i = new Intent(this, FileUploader.class); - i.putExtra(FileUploader.KEY_ACCOUNT, - AccountUtils.getCurrentOwnCloudAccount(this)); - String remotepath = new String(); - for (int j = mDirectories.getCount() - 2; j >= 0; --j) { - remotepath += "/" + URLDecoder.decode(mDirectories.getItem(j)); - } - if (!remotepath.endsWith("/")) - remotepath += "/"; - remotepath += new File(filepath).getName(); - Log.e("ASD", remotepath + ""); - - i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath); - i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath); - i.putExtra(FileUploader.KEY_UPLOAD_TYPE, - FileUploader.UPLOAD_SINGLE_FILE); - startService(i); - } } + } + /** + * 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); @@ -323,109 +440,96 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements .getColumnIndexOrThrow(MediaStore.Images.Media.DATA); cursor.moveToFirst(); return cursor.getString(column_index); - } else - return null; + } + return null; } - - @Override - protected void onPause() { - super.onPause(); - if (syncBroadcastRevceiver != null) { - unregisterReceiver(syncBroadcastRevceiver); - syncBroadcastRevceiver = null; + + /** + * 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; + } + /** + * 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(); } - @Override - public boolean onNavigationItemSelected(int itemPosition, long itemId) { - int i = itemPosition; - while (i-- != 0) { - onBackPressed(); - } - return true; + /** + * Checks, whether or not there are any ownCloud accounts setup. + * + * @return true, if there is at least one account. + */ + private boolean accountsAreSetup() { + AccountManager accMan = AccountManager.get(this); + Account[] accounts = accMan + .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE); + return accounts.length > 0; } private class DirectoryCreator implements Runnable { private String mTargetPath; private Account mAccount; private AccountManager mAm; - + public DirectoryCreator(String targetPath, Account account) { mTargetPath = targetPath; mAccount = account; mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE); } - + @Override public void run() { WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData( mAccount, AccountAuthenticator.KEY_OC_URL))); - + String username = mAccount.name.substring(0, mAccount.name.lastIndexOf('@')); String password = mAm.getPassword(mAccount); - + wdc.setCredentials(username, password); wdc.allowUnsignedCertificates(); wdc.createDirectory(mTargetPath); } - + } // Custom array adapter to override text colors private class CustomArrayAdapter extends ArrayAdapter { - + public CustomArrayAdapter(FileDisplayActivity ctx, int view) { super(ctx, view); } - + public View getView(int position, View convertView, ViewGroup parent) { View v = super.getView(position, convertView, parent); - + ((TextView) v).setTextColor(getResources().getColorStateList( android.R.color.white)); return v; } - + public View getDropDownView(int position, View convertView, ViewGroup parent) { View v = super.getDropDownView(position, convertView, parent); - + ((TextView) v).setTextColor(getResources().getColorStateList( android.R.color.white)); - + return v; } - - } - - public void onClick(DialogInterface dialog, int which) { - // In any case - we won't need it anymore - dialog.dismiss(); - switch (which) { - case DialogInterface.BUTTON_POSITIVE: - Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS"); - intent.putExtra("authorities", - new String[] { AccountAuthenticator.AUTH_TOKEN_TYPE }); - startActivity(intent); - break; - case DialogInterface.BUTTON_NEGATIVE: - finish(); - } - - } - - /** - * Checks, whether or not there are any ownCloud accounts setup. - * - * @return true, if there is at least one account. - */ - private boolean accountsAreSetup() { - AccountManager accMan = AccountManager.get(this); - Account[] accounts = accMan - .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE); - return accounts.length > 0; + } private class SyncBroadcastReceiver extends BroadcastReceiver { @@ -445,10 +549,19 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager() .findFragmentById(R.id.fileList); if (fileListFramgent != null) - fileListFramgent.populateFileList(); + fileListFramgent.listDirectory(); } } } + @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); + } + } + }