}\r
\r
SQLiteDatabase db = mDbHelper.getWritableDatabase();\r
- long rowId = db.insert(ProviderTableMeta.DB_NAME, ProviderTableMeta.FILE_NAME, values);\r
+ long rowId = db.insert(ProviderTableMeta.DB_NAME, null, values);\r
if (rowId > 0) {\r
Uri insertedFileUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);\r
getContext().getContentResolver().notifyChange(insertedFileUri, null);\r
import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
import android.accounts.Account;
+import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.database.Cursor;
import android.net.Uri;
+import android.os.RemoteException;
import android.util.Log;
public class OCFile {
private static String TAG = "OCFile";
-
+
private long id_;
private long parent_id_;
private long length_;
private String path_;
private String storage_path_;
private String mimetype_;
-
- private ContentResolver cp_;
+
+ private ContentResolver cr_;
+ private ContentProviderClient cp_;
private Account account_;
-
- public OCFile(ContentResolver cp, Account account, long id) {
- cp_ = cp;
+
+ public static OCFile createNewFile(ContentProviderClient cr, Account account,
+ String path, long length, long creation_timestamp,
+ long modified_timestamp, String mimetype, long parent_id) {
+ OCFile new_file = new OCFile(cr, account);
+
+ try {
+ Cursor c = new_file.cp_.query(ProviderTableMeta.CONTENT_URI_FILE, null,
+ ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
+ + ProviderTableMeta.FILE_PATH + "=?", new String[]{new_file.account_.name,
+ path}, null);
+ if (c.moveToFirst())
+ new_file.setFileData(c);
+ } catch (RemoteException e) {
+ Log.e(TAG, e.getMessage());
+ }
+
+ new_file.path_ = path;
+ new_file.length_ = length;
+ new_file.creation_timestamp_ = creation_timestamp;
+ new_file.modified_timestamp_ = modified_timestamp;
+ new_file.mimetype_ = mimetype;
+ new_file.parent_id_ = parent_id;
+ Log.e(TAG, parent_id+"");
+
+ return new_file;
+ }
+
+ public OCFile(ContentResolver cr, Account account, long id) {
+ cr_ = cr;
account_ = account;
- Cursor c = cp_.query(ProviderTableMeta.CONTENT_URI_FILE,
- null,
- ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " +
- ProviderTableMeta._ID + "=?",
- new String[]{account_.name, String.valueOf(id)},
- null);
+ Cursor c = cr_.query(ProviderTableMeta.CONTENT_URI_FILE, null,
+ ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
+ + ProviderTableMeta._ID + "=?",
+ new String[]{account_.name, String.valueOf(id)}, null);
if (c.moveToFirst())
setFileData(c);
}
-
- public OCFile(ContentResolver cp, Account account, String path) {
- cp_ = cp;
+
+ public OCFile(ContentResolver cr, Account account, String path) {
+ cr_ = cr;
account_ = account;
- Cursor c = cp_.query(ProviderTableMeta.CONTENT_URI_FILE,
- null,
- ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " +
- ProviderTableMeta.FILE_PATH + "=?",
- new String[]{account_.name, path},
- null);
+
+ Cursor c = cr_.query(ProviderTableMeta.CONTENT_URI_FILE, null,
+ ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
+ + ProviderTableMeta.FILE_PATH + "=?", new String[]{account_.name,
+ path}, null);
if (c.moveToFirst()) {
setFileData(c);
- if (path_ != null) path_ = path;
+ if (path_ != null)
+ path_ = path;
}
}
-
- public long getFileId() { return id_; }
-
- public String getPath() { return path_; }
-
- public boolean fileExtist() { return id_ != -1; }
-
- public boolean isDirectory() { return mimetype_ != null && mimetype_.equals("dir"); }
-
- public boolean isDownloaded() { return storage_path_ != null; }
-
- public String getStoragePath() { return storage_path_; }
- public void setStoragePath(String storage_path) { storage_path_ = storage_path; }
-
- public long getCreationTimestamp() { return creation_timestamp_; }
- public void setCreationTimestamp(long creation_timestamp) { creation_timestamp_ = creation_timestamp; }
- public long getModificationTimestamp() { return modified_timestamp_; }
- public void setModificationTimestamp(long modification_timestamp) { modified_timestamp_ = modification_timestamp; }
+ public long getFileId() {
+ return id_;
+ }
+
+ public String getPath() {
+ return path_;
+ }
+
+ public boolean fileExtist() {
+ return id_ != -1;
+ }
+
+ public boolean isDirectory() {
+ return mimetype_ != null && mimetype_.equals("DIR");
+ }
+
+ public boolean isDownloaded() {
+ return storage_path_ != null;
+ }
+
+ public String getStoragePath() {
+ return storage_path_;
+ }
+ public void setStoragePath(String storage_path) {
+ storage_path_ = storage_path;
+ }
+
+ public long getCreationTimestamp() {
+ return creation_timestamp_;
+ }
+ public void setCreationTimestamp(long creation_timestamp) {
+ creation_timestamp_ = creation_timestamp;
+ }
+
+ public long getModificationTimestamp() {
+ return modified_timestamp_;
+ }
+ public void setModificationTimestamp(long modification_timestamp) {
+ modified_timestamp_ = modification_timestamp;
+ }
public String getFileName() {
if (path_ != null) {
File f = new File(path_);
- return f.getName();
+ return f.getName().equals("") ? "/" : f.getName();
}
return null;
}
+ public String getMimetype() {
+ return mimetype_;
+ }
+
public void save() {
ContentValues cv = new ContentValues();
cv.put(ProviderTableMeta.FILE_MODIFIED, modified_timestamp_);
cv.put(ProviderTableMeta.FILE_CREATION, creation_timestamp_);
cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, length_);
- cv.put(ProviderTableMeta.CONTENT_TYPE, mimetype_);
+ cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, mimetype_);
cv.put(ProviderTableMeta.FILE_NAME, getFileName());
- cv.put(ProviderTableMeta.FILE_PARENT, parent_id_);
+ if (parent_id_ != 0)
+ cv.put(ProviderTableMeta.FILE_PARENT, parent_id_);
cv.put(ProviderTableMeta.FILE_PATH, path_);
cv.put(ProviderTableMeta.FILE_STORAGE_PATH, storage_path_);
cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, account_.name);
-
+
if (fileExtist()) {
- cp_.update(ProviderTableMeta.CONTENT_URI,
- cv,
- ProviderTableMeta._ID + "=?", new String[]{String.valueOf(id_)});
+ if (cp_ != null) {
+ try {
+ cp_.update(ProviderTableMeta.CONTENT_URI, cv, ProviderTableMeta._ID
+ + "=?", new String[]{String.valueOf(id_)});
+ } catch (RemoteException e) {
+ Log.e(TAG, e.getMessage());
+ return;
+ }
+ } else {
+ cr_.update(ProviderTableMeta.CONTENT_URI, cv, ProviderTableMeta._ID
+ + "=?", new String[]{String.valueOf(id_)});
+ }
} else {
- Uri new_entry = cp_.insert(ProviderTableMeta.CONTENT_URI, cv);
+ Uri new_entry = null;
+ if (cp_ != null) {
+ try {
+ new_entry = cp_.insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+ } catch (RemoteException e) {
+ Log.e(TAG, e.getMessage());
+ id_ = -1;
+ return;
+ }
+ } else {
+ new_entry = cr_.insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+ }
try {
- id_ = Integer.parseInt(new_entry.getEncodedPath());
- } catch (NumberFormatException e) {
- Log.e(TAG, "Can't retrieve file id from uri: " + new_entry.toString() +
- ", reason: " + e.getMessage());
- id_ = -1;
+ String p = new_entry.getEncodedPath();
+ id_ = Integer.parseInt(p.substring(p.lastIndexOf('/')+1));
+ } catch (NumberFormatException e) {
+ Log.e(TAG, "Can't retrieve file id from uri: " + new_entry.toString()
+ + ", reason: " + e.getMessage());
+ id_ = -1;
}
}
}
-
+
public Vector<OCFile> getDirectoryContent() {
if (isDirectory() && id_ != -1) {
Vector<OCFile> ret = new Vector<OCFile>();
- Uri req_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(id_));
- Cursor c = cp_.query(req_uri, null, null, null, null);
+ Uri req_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR,
+ String.valueOf(id_));
+ Cursor c = null;
+ if (cp_ != null) {
+ try {
+ c = cp_.query(req_uri, null, null, null, null);
+ } catch (RemoteException e) {
+ Log.e(TAG, e.getMessage());
+ return ret;
+ }
+ } else {
+ c = cr_.query(req_uri, null, null, null, null);
+ }
if (c.moveToFirst())
do {
}
return null;
}
-
+
public void addFile(OCFile file) {
file.parent_id_ = id_;
file.save();
}
- private OCFile(ContentResolver cp, Account account) {
+ private OCFile(ContentProviderClient cp, Account account) {
account_ = account;
cp_ = cp;
+ resetData();
}
-
- private void setFileData(Cursor c) {
+
+ private OCFile(ContentResolver cr, Account account) {
+ account_ = account;
+ cr_ = cr;
+ resetData();
+ }
+
+ private void resetData() {
id_ = -1;
path_ = null;
+ parent_id_ = 0;
storage_path_ = null;
mimetype_ = null;
length_ = 0;
creation_timestamp_ = 0;
- modified_timestamp_ = 0;
+ modified_timestamp_ = 0;
+ }
+
+ private void setFileData(Cursor c) {
+ resetData();
if (c != null) {
id_ = c.getLong(c.getColumnIndex(ProviderTableMeta._ID));
path_ = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH));
- storage_path_ = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
- mimetype_ = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));
- length_ = c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
- creation_timestamp_ = c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CREATION));
- modified_timestamp_ = c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_MODIFIED));
+ parent_id_ = c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_PARENT));
+ storage_path_ = c.getString(c
+ .getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
+ mimetype_ = c.getString(c
+ .getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));
+ length_ = c.getLong(c
+ .getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
+ creation_timestamp_ = c.getLong(c
+ .getColumnIndex(ProviderTableMeta.FILE_CREATION));
+ modified_timestamp_ = c.getLong(c
+ .getColumnIndex(ProviderTableMeta.FILE_MODIFIED));
}
}
}
import android.accounts.OperationCanceledException;\r
import android.content.AbstractThreadedSyncAdapter;\r
import android.content.ContentProviderClient;\r
+import android.content.ContentResolver;\r
import android.content.Context;\r
import android.net.Uri;\r
import android.text.TextUtils;\r
+import android.util.Log;\r
import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
+import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.webdav.HttpPropFind;\r
import eu.alefzero.webdav.TreeNode;\r
import eu.alefzero.webdav.WebdavClient;\r
HttpResponse response = fireRawRequest(query);
TreeNode root = new TreeNode();
- root.setProperty(TreeNode.NodeProperty.NAME, "/");
- this.parseResponse(response, getUri(), getClient(), mHost, root.getChildList());
+ root.setProperty(TreeNode.NodeProperty.NAME, "");
+ this.parseResponse(response, getUri(), getClient(), mHost, root.getChildList(), false, 0);
return root;
}
return mClient.getHttpClient();
}
- private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList) throws IOException, OperationCanceledException, AuthenticatorException {
- boolean skipFirst = true;
- for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {
- String path = n.stripPathFromFilename(uri.getPath());
- if (skipFirst) {
- skipFirst = false;
- continue;
+ private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList, boolean sf, long parent_id) throws IOException, OperationCanceledException, AuthenticatorException {
+ boolean skipFirst = sf, override_parent = true;
+ for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {\r
+ if (skipFirst) {\r
+ skipFirst = false;\r
+ continue;\r
+ }
+ String path = n.stripPathFromFilename(uri.getPath());\r
+ OCFile new_file = OCFile.createNewFile(getContentProvider(),\r
+ getAccount(),\r
+ n.getProperty(NodeProperty.PATH),\r
+ 0,//Long.parseLong(n.getProperty(NodeProperty.CONTENT_LENGTH)),\r
+ 0,//Long.parseLong(n.getProperty(NodeProperty.CREATE_DATE)),\r
+ 0,//Long.parseLong(n.getProperty(NodeProperty.LAST_MODIFIED_DATE)),\r
+ n.getProperty(NodeProperty.RESOURCE_TYPE),\r
+ parent_id);\r
+ new_file.save();\r
+ Log.e("ASD", new_file.getFileId()+"");\r
+ Log.e("ASD", new_file.getFileName()+"");\r
+ Log.e("ASD", new_file.getPath()+"");\r
+ if (override_parent) {\r
+ parent_id = new_file.getFileId();\r
+ override_parent = false;\r
}
- insertList.add(n);
if (!TextUtils.isEmpty(n.getProperty(NodeProperty.NAME)) &&
n.getProperty(NodeProperty.RESOURCE_TYPE).equals("DIR")) {
HttpPropFind method = new HttpPropFind(uri.getPath() + path + n.getProperty(NodeProperty.NAME).replace(" ", "%20") + "/");
HttpResponse response = fireRawRequest(method);
- parseResponse(response, uri, client, targetHost, n.getChildList());
+ parseResponse(response, uri, client, targetHost, n.getChildList(), true, new_file.getFileId());
}
}
}
query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind()));\r
TreeNode root = this.fireRequest(query);\r
\r
- commitToDatabase(root, null);\r
+ // commitToDatabase(root, null);\r
} catch (OperationCanceledException e) {\r
e.printStackTrace();\r
} catch (AuthenticatorException e) {\r
} catch (IOException e) {\r
syncResult.stats.numIoExceptions++;\r
e.printStackTrace();\r
- } catch (RemoteException e) {\r
- e.printStackTrace();\r
- }\r
+ }// catch (RemoteException e) {\r
+ // e.printStackTrace();\r
+ //}\r
}\r
\r
private void commitToDatabase(TreeNode root, String parentId) throws RemoteException {\r
*/\r
package eu.alefzero.owncloud.ui.adapter;\r
\r
+import java.util.Vector;\r
+\r
import eu.alefzero.owncloud.DisplayUtils;\r
import eu.alefzero.owncloud.R;\r
+import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.owncloud.db.ProviderMeta;\r
import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
\r
import android.content.Context;\r
import android.database.Cursor;\r
import android.database.DataSetObserver;\r
+import android.util.Log;\r
import android.view.LayoutInflater;\r
import android.view.View;\r
import android.view.ViewGroup;\r
*\r
*/\r
public class FileListListAdapter implements ListAdapter {\r
-\r
- private Cursor mCursor;\r
private Context mContext;\r
+ private OCFile mFile;\r
+ private Vector<OCFile> mFiles;\r
\r
- public FileListListAdapter(Cursor c, Context context) {\r
- mCursor = c;\r
+ public FileListListAdapter(OCFile f, Context context) {\r
+ mFile = f;\r
+ mFiles = mFile.getDirectoryContent();\r
mContext = context;\r
}\r
\r
\r
public int getCount() {\r
// TODO Auto-generated method stub\r
- return mCursor.getCount();\r
+ return mFiles.size();\r
}\r
\r
public Object getItem(int position) {\r
- // TODO Auto-generated method stub\r
- return null;\r
+ if (mFiles.size() <= position)\r
+ return null;\r
+ return mFiles.get(position);\r
}\r
\r
public long getItemId(int position) {\r
LayoutInflater vi = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
v = vi.inflate(R.layout.list_layout, null);\r
}\r
- if (mCursor.moveToPosition(position)) {\r
+ if (mFiles.size() > position) {\r
+ OCFile f = mFiles.get(position);\r
TextView tv = (TextView) v.findViewById(R.id.Filename);\r
- tv.setText(DisplayUtils.HtmlDecode(mCursor.getString(mCursor.getColumnIndex(ProviderMeta.ProviderTableMeta.FILE_NAME))));\r
- if (!mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) {\r
+ tv.setText(DisplayUtils.HtmlDecode(f.getFileName()));\r
+ if (!f.getMimetype().equals("DIR")) {\r
ImageView iv = (ImageView) v.findViewById(R.id.imageView1);\r
iv.setImageResource(R.drawable.file);\r
}\r
}\r
- \r
+\r
return v;\r
}\r
\r
package eu.alefzero.owncloud.ui.fragment;\r
\r
import java.util.Stack;\r
+import java.util.Vector;\r
\r
import android.accounts.Account;\r
import android.accounts.AccountManager;\r
*\r
*/\r
public class FileList extends FragmentListView {\r
- private Cursor mCursor;\r
private Account mAccount;\r
private AccountManager mAccountManager;\r
private Stack<String> mDirNames;\r
private Stack<String> mParentsIds;\r
+ private Vector<OCFile> mFiles;\r
\r
public FileList() {\r
mDirNames = new Stack<String>();\r
\r
@Override\r
public void onItemClick(AdapterView<?> l, View v, int position, long id) {\r
- if (!mCursor.moveToPosition(position)) {\r
+ if (mFiles.size() <= position) {\r
throw new IndexOutOfBoundsException("Incorrect item selected");\r
}\r
- String id_ = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta._ID));\r
- if (mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)).equals("DIR")) {\r
- String dirname = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME));\r
+ OCFile file = mFiles.get(position);\r
+ String id_ = String.valueOf(file.getFileId());\r
+ if (file.getMimetype().equals("DIR")) {\r
+ String dirname = file.getFileName();\r
\r
mDirNames.push(dirname);\r
mParentsIds.push(id_);\r
}\r
\r
private void populateFileList() {\r
- if (mParentsIds.empty()) {\r
- OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, "/");\r
- Log.d("ASD", file.getFileName()+"");\r
- Log.d("ASD", file.getFileId()+"");\r
- if (file.getDirectoryContent() != null)\r
- Log.d("ASD", file.getDirectoryContent().size()+"");\r
- \r
- mCursor = getActivity().getContentResolver().query(ProviderTableMeta.CONTENT_URI,\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
- new String[]{mAccount.name},\r
- null);\r
- } else {\r
- mCursor = getActivity().managedQuery(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParentsIds.peek()),\r
- null,\r
- ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
- new String[]{mAccount.name}, null);\r
- }\r
- setListAdapter(new FileListListAdapter(mCursor, getActivity()));\r
+ String s = "/";\r
+ for (String a : mDirNames)\r
+ s+= a+"/";\r
+\r
+ OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, s);\r
+ mFiles = file.getDirectoryContent();\r
+ setListAdapter(new FileListListAdapter(file, getActivity()));\r
}\r
}\r
path = name.substring(0, name.lastIndexOf('/')+1);
name = name.substring(name.lastIndexOf('/')+1);
name = name.replace("%20", " ");
- if (TextUtils.isEmpty(name)) {
- name = "/";
- }
propertyMap_.remove(NodeProperty.NAME);
propertyMap_.put(NodeProperty.NAME, name);
if (currentElement.getElementsByTagName(davPrefix + LAST_MODIFIED).getLength() != 0) {
Date date = parseResponseDate(
currentElement.getElementsByTagName(davPrefix + LAST_MODIFIED).item(0).getFirstChild().getNodeValue());
- resultNode.setProperty(NodeProperty.LAST_MODIFIED_DATE, DISPLAY_DATE_FORMAT.format(date));
+ resultNode.setProperty(NodeProperty.LAST_MODIFIED_DATE, String.valueOf(date.getTime()));
}
if (currentElement.getElementsByTagName(davPrefix + CREATE_DATE).getLength() != 0) {
Date date = parseResponseDate(
currentElement.getElementsByTagName(davPrefix + CREATE_DATE).item(0).getFirstChild().getNodeValue());
- resultNode.setProperty(NodeProperty.CREATE_DATE, DISPLAY_DATE_FORMAT.format(date));
+ resultNode.setProperty(NodeProperty.CREATE_DATE, String.valueOf(date));
}
}
projects / pub / Android / ownCloud.git / commitdiff