X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/63f68f102066b63f62160c6b0d76e4eda6de900b..a4ba6170ea7696e085b07adfef73eeb8b77cb8e2:/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
deleted file mode 100644
index 28749a55..00000000
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ /dev/null
@@ -1,564 +0,0 @@
-/* ownCloud Android client application
- * Copyright (C) 2011 Bartek Przybylski
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- *
- */
-
-package eu.alefzero.owncloud.ui.activity;
-
-import java.io.File;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.app.Dialog;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-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;
-
-import com.actionbarsherlock.app.ActionBar;
-import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.app.SherlockFragmentActivity;
-import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
-import com.actionbarsherlock.view.MenuItem;
-import com.actionbarsherlock.view.Window;
-
-import eu.alefzero.owncloud.AccountUtils;
-import eu.alefzero.owncloud.R;
-import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
-import eu.alefzero.owncloud.datamodel.DataStorageManager;
-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;
-
-/**
- * Displays, what files the user has available in his ownCloud.
- *
- * @author Bartek Przybylski
- *
- */
-
-public class FileDisplayActivity extends SherlockFragmentActivity implements
- 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 ACTION_SELECT_FILE = 1;
-
- @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);
- }
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- MenuInflater inflater = getSherlock().getMenuInflater();
- inflater.inflate(R.menu.menu, menu);
- return true;
- }
-
- @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
- protected Dialog onCreateDialog(int id) {
- Dialog dialog;
- AlertDialog.Builder builder;
- switch (id) {
- case DIALOG_SETUP_ACCOUNT:
- builder = new AlertDialog.Builder(this);
- builder.setTitle(R.string.main_tit_accsetup);
- builder.setMessage(R.string.main_wrn_accsetup);
- builder.setCancelable(false);
- builder.setPositiveButton(android.R.string.ok, this);
- builder.setNegativeButton(android.R.string.cancel, this);
- dialog = builder.create();
- break;
- case DIALOG_CREATE_DIR: {
- builder = new Builder(this);
- final EditText dirNameInput = new EditText(getBaseContext());
- final Account a = AccountUtils.getCurrentOwnCloudAccount(this);
- builder.setView(dirNameInput);
- builder.setTitle(R.string.uploader_info_dirname);
- int typed_color = getResources().getColor(R.color.setup_text_typed);
- dirNameInput.setTextColor(typed_color);
-
- builder.setPositiveButton(android.R.string.ok,
- new OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- String directoryName = dirNameInput.getText().toString();
- if (directoryName.trim().length() == 0) {
- dialog.cancel();
- return;
- }
-
- // 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();
-
- // 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,
- new OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- dialog.cancel();
- }
- });
- dialog = builder.create();
- break;
- }
- default:
- dialog = null;
- }
-
- 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();
- 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();
- }
-
- }
-
- /**
- * 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);
- if (cursor != null) {
- int column_index = cursor
- .getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
- cursor.moveToFirst();
- return cursor.getString(column_index);
- }
- return 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();
- }
-
- /**
- * 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;
- }
-
- }
-
- private class SyncBroadcastReceiver extends BroadcastReceiver {
- /**
- * {@link BroadcastReceiver} to enable syncing feedback in UI
- */
- @Override
- public void onReceive(Context context, Intent intent) {
- boolean inProgress = intent.getBooleanExtra(
- FileSyncService.IN_PROGRESS, false);
- String account_name = intent
- .getStringExtra(FileSyncService.ACCOUNT_NAME);
- Log.d("FileDisplay", "sync of account " + account_name
- + " is in_progress: " + inProgress);
- setProgressBarIndeterminateVisibility(inProgress);
- if (!inProgress) {
- FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()
- .findFragmentById(R.id.fileList);
- if (fileListFramgent != null)
- 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);
- }
- }
-
-}