\r
package eu.alefzero.owncloud.ui.activity;\r
\r
-import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.FileNotFoundException;\r
-import java.io.IOException;\r
-import java.util.LinkedList;\r
-import java.util.Stack;\r
-\r
import android.accounts.Account;\r
import android.accounts.AccountManager;\r
import android.app.AlertDialog;\r
import android.app.Dialog;\r
-import android.app.ListActivity;\r
+import android.app.AlertDialog.Builder;\r
import android.content.DialogInterface;\r
-import android.content.Intent;\r
import android.content.DialogInterface.OnCancelListener;\r
-import android.content.res.Configuration;\r
-import android.database.Cursor;\r
-import android.graphics.Bitmap;\r
-import android.graphics.BitmapFactory;\r
-import android.graphics.Matrix;\r
+import android.content.DialogInterface.OnClickListener;\r
+import android.content.Intent;\r
import android.net.Uri;\r
import android.os.Bundle;\r
-import android.os.Environment;\r
-import android.support.v4.app.FragmentActivity;\r
-import android.support.v4.app.FragmentTransaction;\r
-import android.text.TextUtils;\r
-import android.util.Log;\r
-import android.view.Menu;\r
+import android.support.v4.app.ActionBar;\r
+import android.support.v4.app.ActionBar.OnNavigationListener;\r
+import android.support.v4.view.Menu;\r
+import android.support.v4.view.MenuItem;\r
import android.view.MenuInflater;\r
-import android.view.MenuItem;\r
-import android.view.View;\r
-import android.view.Window;\r
-import android.widget.ImageView;\r
-import android.widget.ListView;\r
-import android.widget.TextView;\r
+import android.widget.ArrayAdapter;\r
+import android.widget.EditText;\r
import eu.alefzero.owncloud.R;\r
-import eu.alefzero.owncloud.R.id;\r
-import eu.alefzero.owncloud.R.layout;\r
-import eu.alefzero.owncloud.R.menu;\r
-import eu.alefzero.owncloud.R.string;\r
import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
-import eu.alefzero.owncloud.db.DbHandler;\r
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
-import eu.alefzero.owncloud.ui.fragment.FileDetail;\r
+import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.owncloud.ui.fragment.FileList;\r
-import eu.alefzero.owncloud.ui.fragment.ActionBar;\r
+import eu.alefzero.webdav.WebdavClient;\r
\r
/**\r
* Displays, what files the user has available in his ownCloud.\r
* @author Bartek Przybylski\r
*\r
*/\r
-public class FileDisplayActivity extends FragmentActivity {\r
- private DbHandler mDBHandler;\r
- private Stack<String> mParents;\r
- private LinkedList<String> mPath;\r
- private Account mAccount;\r
- private Cursor mCursor;\r
- private boolean mIsDisplayingFile;\r
\r
+public class FileDisplayActivity extends android.support.v4.app.FragmentActivity implements OnNavigationListener {\r
+ private ArrayAdapter<String> mDirectories;\r
+ \r
private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r
-\r
+ \r
+ public void pushPath(String path) {\r
+ mDirectories.insert(path, 0);\r
+ }\r
+ \r
+ public boolean popPath() {\r
+ mDirectories.remove(mDirectories.getItem(0));\r
+ return !mDirectories.isEmpty();\r
+ }\r
+ \r
+ @Override\r
+ protected Dialog onCreateDialog(int id, Bundle args) {\r
+ final AlertDialog.Builder builder = new Builder(this);\r
+ final EditText dirName = new EditText(getBaseContext());\r
+ builder.setView(dirName);\r
+ builder.setTitle(R.string.uploader_info_dirname);\r
+ \r
+ builder.setPositiveButton(R.string.common_ok, new OnClickListener() {\r
+ public void onClick(DialogInterface dialog, int which) {\r
+ String s = dirName.getText().toString();\r
+ if (s.trim().isEmpty()) {\r
+ dialog.cancel();\r
+ return;\r
+ }\r
+ AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r
+ // following account choosing is incorrect and needs to be replaced\r
+ // with some sort of session mechanism\r
+ Account a = am.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[0];\r
+\r
+ String path = "";\r
+ for (int i = mDirectories.getCount()-2; i >= 0; --i) {\r
+ path += "/" + mDirectories.getItem(i);\r
+ }\r
+ OCFile parent = new OCFile(getContentResolver(), a, path+"/");\r
+ path += "/" + s + "/";\r
+ Thread thread = new Thread(new DirectoryCreator(path, a, am));\r
+ thread.start();\r
+ OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0, "DIR", parent.getFileId()).save();\r
+ \r
+ dialog.dismiss();\r
+ }\r
+ });\r
+ builder.setNegativeButton(R.string.common_cancel, new OnClickListener() {\r
+ public void onClick(DialogInterface dialog, int which) {\r
+ dialog.cancel();\r
+ }\r
+ });\r
+ return builder.create();\r
+ }\r
+ \r
@Override\r
public void onCreate(Bundle savedInstanceState) {\r
super.onCreate(savedInstanceState);\r
- getWindow().requestFeature(Window.FEATURE_NO_TITLE);\r
+ mDirectories = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item);\r
+ mDirectories.add("/");\r
setContentView(R.layout.files);\r
- \r
- FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
- //ft.add(R.id.actionBar, new ActionBar());\r
- ft.add(R.id.fileList, new FileList());\r
- if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
- ft.add(R.id.fileDetail, new FileDetail());\r
- }\r
- ft.commit();\r
-\r
- /*getSupportFragmentManager().beginTransaction().add(arg0, arg1);\r
- FileList fl = new FileList();\r
- ft.add(R.id.fileList, fl);\r
- ft.commit();\r
- /*\r
-\r
- \r
- if (savedInstanceState != null) {\r
- mParents = (Stack<String>)savedInstanceState.getSerializable("parentsStack");\r
- mIsDisplayingFile = savedInstanceState.getBoolean("isDisplayingFile");\r
- mPath = (LinkedList<String>)savedInstanceState.getSerializable("path");\r
- } else {\r
- mParents = new Stack<String>();\r
- mPath = new LinkedList<String>();\r
- mIsDisplayingFile = false;\r
- }\r
-\r
- mDBHandler = new DbHandler(getBaseContext());\r
- requestWindowFeature(Window.FEATURE_NO_TITLE);\r
- setContentView(R.layout.main);\r
-\r
- AccountManager accMan = AccountManager.get(this);\r
- Account[] accounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
-\r
- if (accounts.length == 0) {\r
- // using string value since in API7 this constatn is not defined\r
- // in API7 < this constatant is defined in Settings.ADD_ACCOUNT_SETTINGS\r
- // and Settings.EXTRA_AUTHORITIES\r
- Intent intent = new Intent("android.settings.ADD_ACCOUNT_SETTINGS");\r
- intent.putExtra("authorities", new String[] {AccountAuthenticator.AUTH_TOKEN_TYPE});\r
- startActivity(intent);\r
- } else if (accounts.length > 1) {\r
- showDialog(DIALOG_CHOOSE_ACCOUNT);\r
- } else {\r
- mAccount = accounts[0];\r
- populateFileList();\r
- }*/\r
+ ActionBar action_bar = getSupportActionBar();\r
+ action_bar.setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST);\r
+ action_bar.setDisplayShowTitleEnabled(false);\r
+ action_bar.setListNavigationCallbacks(mDirectories, this);\r
}\r
\r
@Override\r
public boolean onOptionsItemSelected(MenuItem item) {\r
switch (item.getItemId()) {\r
case R.id.settingsItem :\r
+ {\r
Intent i = new Intent(this, Preferences.class);\r
startActivity(i);\r
break;\r
+ }\r
+ case R.id.createDirectoryItem:\r
+ {\r
+ showDialog(0);\r
+ break;\r
+ }\r
}\r
return true;\r
}\r
inflater.inflate(R.menu.menu, menu);\r
return true;\r
}\r
- \r
+\r
private Dialog createChooseAccountDialog() {\r
final AccountManager accMan = AccountManager.get(this);\r
CharSequence[] items = new CharSequence[accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE).length];\r
builder.setCancelable(true);\r
builder.setItems(items, new DialogInterface.OnClickListener() {\r
public void onClick(DialogInterface dialog, int item) {\r
- mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r
+ //mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r
dialog.dismiss();\r
- populateFileList();\r
}\r
});\r
builder.setOnCancelListener(new OnCancelListener() {\r
return alert;\r
}\r
\r
- //@Override\r
- //public void onBackPressed() {\r
- /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
- if (mIsDisplayingFile) {\r
- mIsDisplayingFile = false;\r
- setContentView(R.layout.main);\r
- pl = (PathLayout) findViewById(R.id.pathLayout1);\r
- Uri uri;\r
- if (mParents.empty()) {\r
- uri = ProviderTableMeta.CONTENT_URI;\r
- } else {\r
- uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek());\r
- }\r
- mCursor = managedQuery(uri,\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
- new String[]{mAccount.name}, null);\r
- \r
- if (mCursor.moveToFirst()) {\r
- String s = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_PATH));\r
- for (String str : s.split("/")) {\r
- if (!TextUtils.isEmpty(str))\r
- pl.push(DisplayUtils.HtmlDecode(str));\r
- }\r
- }\r
- getListView().setAdapter(new FileListListAdapter(mCursor, this)); \r
- getListView().invalidate();\r
- return;\r
+ @Override\r
+ public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
+ int i = itemPosition;\r
+ while (i-- != 0) {\r
+ onBackPressed();\r
}\r
- if (mParents.size()==0) {\r
+ return true;\r
+ }\r
+ \r
+ @Override\r
+ public void onBackPressed() {\r
+ popPath();\r
+ if (mDirectories.getCount() == 0)\r
+ {\r
super.onBackPressed();\r
return;\r
- } else if (mParents.size() == 1) {\r
- mParents.pop();\r
- mPath.removeLast();\r
- pl.pop();\r
- mCursor = managedQuery(ProviderTableMeta.CONTENT_URI,\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
- new String[]{mAccount.name},\r
- null);\r
- } else {\r
- mParents.pop();\r
- mPath.removeLast();\r
- pl.pop();\r
- mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek()),\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
- new String[]{mAccount.name},\r
- null);\r
}\r
+ ((FileList)getSupportFragmentManager().findFragmentById(R.id.fileList)).onBackPressed();\r
+ }\r
+ \r
+ private class DirectoryCreator implements Runnable {\r
+ private String mTargetPath;\r
+ private Account mAccount;\r
+ private AccountManager mAm;\r
\r
- setListAdapter(new FileListListAdapter(mCursor, this));\r
- getListView().invalidate();*/\r
- //}\r
-\r
- //@Override\r
-/* protected void onListItemClick(ListView l, View v, int position, long id) {\r
- super.onListItemClick(l, v, position, id);\r
- /*PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
- if (!mCursor.moveToPosition(position)) {\r
- throw new IndexOutOfBoundsException("Incorrect item selected");\r
+ public DirectoryCreator(String targetPath, Account account, AccountManager am) {\r
+ mTargetPath = targetPath;\r
+ mAccount = account;\r
+ mAm = am;\r
}\r
- if (!mIsDisplayingFile) {\r
- if (mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) {\r
- String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
- String dirname = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
- pl.push(DisplayUtils.HtmlDecode(dirname));\r
- mPath.addLast(DisplayUtils.HtmlDecode(dirname));\r
- mParents.push(id_);\r
- mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, id_),\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
- new String[]{mAccount.name}, null);\r
- setListAdapter(new FileListListAdapter(mCursor, this));\r
- } else {\r
- mIsDisplayingFile = true;\r
- setContentView(R.layout.file_display);\r
- String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
- mCursor = managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, id_),\r
- null,\r
- null,\r
- null,\r
- null);\r
- mCursor.moveToFirst();\r
- // filename\r
- TextView tv = (TextView) findViewById(R.id.textView1);\r
- tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)));\r
- // filetype\r
- tv = (TextView) findViewById(R.id.textView2);\r
- tv.setText(DisplayUtils.convertMIMEtoPrettyPrint(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE))));\r
- // size\r
- tv = (TextView) findViewById(R.id.textView3);\r
- tv.setText(DisplayUtils.bitsToHumanReadable(mCursor.getLong(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH))));\r
- // modified\r
- tv = (TextView) findViewById(R.id.textView4);\r
- tv.setText(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_MODIFIED)));\r
- if (!TextUtils.isEmpty(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH))) &&\r
- mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).matches("image/*")) {\r
- ImageView iv = (ImageView) findViewById(R.id.imageView1);\r
- Bitmap bmp = BitmapFactory.decodeFile(mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH)));\r
- Matrix m = new Matrix();\r
- float scale;\r
- if (bmp.getWidth() > bmp.getHeight()) {\r
- scale = (float) (200./bmp.getWidth());\r
- } else {\r
- scale = (float) (200./bmp.getHeight());\r
- }\r
- m.postScale(scale, scale);\r
- Bitmap newBmp = Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), m, true);\r
- iv.setImageBitmap(newBmp);\r
- }\r
- setListAdapter(new FileListActionListAdapter(mCursor, this, mAccount));\r
- } \r
- getListView().invalidate();\r
- } else {\r
- Intent i = (Intent) getListAdapter().getItem(position);\r
- if (i.hasExtra("toDownload")) {\r
- \r
- Intent intent = new Intent(this, FileDownloader.class);\r
- intent.putExtra(FileDownloader.EXTRA_FILE_PATH, "/"+((TextView)findViewById(R.id.textView1)).getText().toString());\r
- intent.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);\r
- startService(intent);\r
- /*\r
- if (i.getBooleanExtra("toDownload", false)) {\r
- startActivityForResult(i, 200);\r
- } else {\r
- startActivity(i); \r
- }*/\r
- // }\r
-\r
- //}\r
-// }\r
- \r
- private void populateFileList() {\r
- if (mParents.empty()) {\r
- mCursor = getContentResolver().query(ProviderTableMeta.CONTENT_URI,\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
- new String[]{mAccount.name},\r
- null);\r
- } else {\r
- mCursor = getContentResolver().query(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek()),\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
- new String[]{mAccount.name}, null);\r
- if (!mIsDisplayingFile) {\r
- //PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
- //for (String s : mPath) {\r
- // pl.push(s);\r
- // }\r
- }\r
+ \r
+ @Override\r
+ public void run() {\r
+ WebdavClient wdc = new WebdavClient(Uri.parse(mAm.getUserData(mAccount,\r
+ AccountAuthenticator.KEY_OC_URL)));\r
+ \r
+ String username = mAccount.name.substring(0, mAccount.name.lastIndexOf('@'));\r
+ String password = mAm.getPassword(mAccount);\r
+ \r
+ wdc.setCredentials(username, password);\r
+ wdc.allowUnsignedCertificates();\r
+ wdc.createDirectory(mTargetPath);\r
}\r
-// setListAdapter(new FileListListAdapter(mCursor, this));\r
-// getListView().invalidate();\r
- }\r
- \r
- //@Override\r
- /*protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
- super.onActivityResult(requestCode, resultCode, data);\r
+ \r
}\r
- \r
- @Override\r
- protected void onSaveInstanceState(Bundle outState) {\r
- super.onSaveInstanceState(outState);\r
- outState.putSerializable("parentsStack", mParents);\r
- outState.putSerializable("path", mPath);\r
- outState.putBoolean("isDisplayingFile", mIsDisplayingFile);\r
- }*/\r
-\r
}
\ No newline at end of file
projects / pub / Android / ownCloud.git / blobdiff