--- /dev/null
+/* ownCloud Android client application
+ * Copyright (C) 2012 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package eu.alefzero.owncloud.datamodel;
+
+import java.util.Vector;
+
+public interface DataStorageManager {
+
+ public OCFile getFileByPath(String path);
+
+ public OCFile getFileById(long id);
+
+ public boolean fileExists(String path);
+
+ public boolean fileExists(long id);
+
+ public boolean saveFile(OCFile file);
+
+ public Vector<OCFile> getDirectoryContent(OCFile f);
+}
--- /dev/null
+/* ownCloud Android client application
+ * Copyright (C) 2012 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 <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package eu.alefzero.owncloud.datamodel;
+
+import java.util.Vector;
+
+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 FileDataStorageManager implements DataStorageManager {
+
+ private ContentResolver mContentResolver;
+ private ContentProviderClient mContentProvider;
+ private Account mAccount;
+
+ private static String TAG = "FileDataStorageManager";
+
+ public FileDataStorageManager(Account account, ContentResolver cr) {
+ mContentProvider = null;
+ mContentResolver = cr;
+ mAccount = account;
+ }
+
+ public FileDataStorageManager(Account account, ContentProviderClient cp) {
+ mContentProvider = cp;
+ mContentResolver = null;
+ mAccount = account;
+ }
+
+ @Override
+ public OCFile getFileByPath(String path) {
+ Cursor c = getCursorForValue(ProviderTableMeta.FILE_PATH, path);
+ if (c.moveToFirst())
+ return createFileInstance(c);
+ return null;
+ }
+
+ @Override
+ public OCFile getFileById(long id) {
+ Cursor c = getCursorForValue(ProviderTableMeta._ID, String.valueOf(id));
+ if (c.moveToFirst())
+ return createFileInstance(c);
+ return null;
+ }
+
+ @Override
+ public boolean fileExists(long id) {
+ return fileExists(ProviderTableMeta._ID, String.valueOf(id));
+ }
+
+ @Override
+ public boolean fileExists(String path) {
+ return fileExists(ProviderTableMeta.FILE_PATH, path);
+ }
+
+ @Override
+ public boolean saveFile(OCFile file) {
+ boolean overriden = false;
+ ContentValues cv = new ContentValues();
+ cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp());
+ cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp());
+ cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength());
+ cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype());
+ cv.put(ProviderTableMeta.FILE_NAME, file.getFileName());
+ if (file.getParentId() != 0)
+ cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId());
+ cv.put(ProviderTableMeta.FILE_PATH, file.getPath());
+ cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath());
+ cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name);
+
+ if (fileExists(file.getPath())) {
+ overriden = true;
+ if (getContentResolver() != null) {
+ getContentResolver().update(ProviderTableMeta.CONTENT_URI,
+ cv,
+ ProviderTableMeta._ID + "=?",
+ new String[] {String.valueOf(file.getFileId())});
+ } else {
+ try {
+ getContentProvider().update(ProviderTableMeta.CONTENT_URI,
+ cv,
+ ProviderTableMeta._ID + "=?",
+ new String[] {String.valueOf(file.getFileId())});
+ } catch (RemoteException e) {
+ Log.e(TAG, "Fail to insert insert file to database " + e.getMessage());
+ }
+ }
+ } else {
+ if (getContentResolver() != null) {
+ getContentResolver().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+ } else {
+ try {
+ getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Fail to insert insert file to database " + e.getMessage());
+ }
+ }
+ }
+
+ if (file.isDirectory() && file.needsUpdatingWhileSaving())
+ for (OCFile f : getDirectoryContent(file))
+ saveFile(f);
+
+ return overriden;
+ }
+
+ public void setAccount(Account account) {
+ mAccount = account;
+ }
+
+ public Account getAccount() {
+ return mAccount;
+ }
+
+ public void setContentResolver(ContentResolver cr) {
+ mContentResolver = cr;
+ }
+
+ public ContentResolver getContentResolver() {
+ return mContentResolver;
+ }
+
+ public void setContentProvider(ContentProviderClient cp) {
+ mContentProvider = cp;
+ }
+
+ public ContentProviderClient getContentProvider() {
+ return mContentProvider;
+ }
+
+ public Vector<OCFile> getDirectoryContent(OCFile f) {
+ if (f.isDirectory() && f.getFileId() != -1) {
+ Vector<OCFile> ret = new Vector<OCFile>();
+
+ Uri req_uri = Uri.withAppendedPath(
+ ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(f.getFileId()));
+ Cursor c = null;
+ if (getContentProvider() != null) {
+ try {
+ c = getContentProvider().query(req_uri, null, null, null, null);
+ } catch (RemoteException e) {
+ Log.e(TAG, e.getMessage());
+ return ret;
+ }
+ } else {
+ c = getContentResolver().query(req_uri, null, null, null, null);
+ }
+
+ if (c.moveToFirst())
+ do {
+ OCFile child = createFileInstance(c);
+ ret.add(child);
+ } while (c.moveToNext());
+
+ c.close();
+ return ret;
+ }
+ return null;
+ }
+
+
+ private boolean fileExists(String cmp_key, String value) {
+ Cursor c;
+ if (getContentResolver() != null) {
+ c = getContentResolver().query(ProviderTableMeta.CONTENT_URI,
+ null,
+ cmp_key + "=?",
+ new String[] {value},
+ null);
+ } else {
+ try {
+ c = getContentProvider().query(ProviderTableMeta.CONTENT_URI,
+ null,
+ cmp_key + "=?",
+ new String[] {value},
+ null);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Couldn't determine file existance, assuming non existance: " + e.getMessage());
+ return false;
+ }
+ }
+ return c.moveToFirst();
+ }
+
+ private Cursor getCursorForValue(String key, String value) {
+ Cursor c = null;
+ if (getContentResolver() != null) {
+ c = getContentResolver().query(ProviderTableMeta.CONTENT_URI,
+ null,
+ key + "=?",
+ new String[] {value},
+ null);
+ } else {
+ try {
+ c = getContentProvider().query(ProviderTableMeta.CONTENT_URI,
+ null,
+ key + "=?",
+ new String[]{value},
+ null);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Could not get file details: " + e.getMessage());
+ c = null;
+ }
+ }
+ return c;
+ }
+
+ private OCFile createFileInstance(Cursor c) {
+ OCFile file = null;
+ if (c != null) {
+ file = new OCFile(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH)));
+ file.setFileId(c.getLong(c.getColumnIndex(ProviderTableMeta._ID)));
+ file.setParentId(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_PARENT)));
+ file.setStoragePath(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH)));
+ file.setMimetype(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)));
+ file.setFileLength(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH)));
+ file.setCreationTimestamp(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CREATION)));
+ file.setModificationTimestamp(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_MODIFIED)));
+ }
+ return file;
+ }
+
+}
package eu.alefzero.owncloud.datamodel;
import java.io.File;
-import java.util.Vector;
-
-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;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
public class OCFile {
- private static String TAG = "OCFile";
private long id_;
private long parent_id_;
private String path_;
private String storage_path_;
private String mimetype_;
-
- private ContentResolver contentResolver_;
- private ContentProviderClient providerClient_;
- private Account account_;
-
- private OCFile(ContentProviderClient providerClient, Account account) {
- account_ = account;
- providerClient_ = providerClient;
- resetData();
- }
-
- private OCFile(ContentResolver contentResolver, Account account) {
- account_ = account;
- contentResolver_ = contentResolver;
- resetData();
- }
-
- /**
- * Query the database for a {@link OCFile} belonging to a given account
- * and id.
- *
- * @param resolver The {@link ContentResolver} to use
- * @param account The {@link Account} the {@link OCFile} belongs to
- * @param id The ID the file has in the database
- */
- public OCFile(ContentResolver resolver, Account account, long id) {
- contentResolver_ = resolver;
- account_ = account;
- Cursor c = contentResolver_.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);
- }
+ private boolean update_while_saving_;
/**
- * Query the database for a {@link OCFile} belonging to a given account
- * and that matches remote path
+ * Create new {@link OCFile} with given path
*
- * @param contentResolver The {@link ContentResolver} to use
- * @param account The {@link Account} the {@link OCFile} belongs to
* @param path The remote path of the file
*/
- public OCFile(ContentResolver contentResolver, Account account, String path) {
- contentResolver_ = contentResolver;
- account_ = account;
-
- Cursor c = contentResolver_.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;
- }
- }
-
- public OCFile(ContentProviderClient cp, Account account, String path) {
- providerClient_ = cp;
- account_ = account;
-
- try {
- Cursor c = providerClient_.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;
- }
- } catch (RemoteException e) {
- Log.d(TAG, e.getMessage());
- }
- }
-
- /**
- * Creates a new {@link OCFile}
- *
- * @param providerClient The {@link ContentProviderClient} to use
- * @param account The {@link Account} that this file belongs to
- * @param path The remote path
- * @param length The file size in bytes
- * @param creation_timestamp The UNIX timestamp of the creation date
- * @param modified_timestamp The UNIX timestamp of the modification date
- * @param mimetype The mimetype to set
- * @param parent_id The parent folder of that file
- * @return A new instance of {@link OCFile}
- */
- public static OCFile createNewFile(ContentProviderClient providerClient,
- Account account, String path, long length, long creation_timestamp,
- long modified_timestamp, String mimetype, long parent_id) {
- OCFile new_file = new OCFile(providerClient, account);
-
- try {
- Cursor c = new_file.providerClient_.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);
- c.close();
- } 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;
-
- return new_file;
- }
-
- /**
- * Creates a new {@link OCFile}
- *
- * @param contentResolver The {@link ContentResolver} to use
- * @param account The {@link Account} that this file belongs to
- * @param path The remote path
- * @param length The file size in bytes
- * @param creation_timestamp The UNIX timestamp of the creation date
- * @param modified_timestamp The UNIX timestamp of the modification date
- * @param mimetype The mimetype to set
- * @param parent_id The parent folder of that file
- * @return A new instance of {@link OCFile}
- */
- public static OCFile createNewFile(ContentResolver contentResolver,
- Account account, String path, int length, int creation_timestamp,
- int modified_timestamp, String mimetype, long parent_id) {
- OCFile new_file = new OCFile(contentResolver, account);
- Cursor c = new_file.contentResolver_.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);
- c.close();
-
- 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;
-
- return new_file;
+ public OCFile(String path) {
+ update_while_saving_ = false;
+ path_ = path;
+ resetData();
}
-
/**
* Gets the ID of the file
*
}
/**
- * Instruct the file to save itself to the database
- */
- 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.FILE_CONTENT_TYPE, mimetype_);
- cv.put(ProviderTableMeta.FILE_NAME, getFileName());
- 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 (fileExists()) {
- if (providerClient_ != null) {
- try {
- providerClient_.update(ProviderTableMeta.CONTENT_URI, cv,
- ProviderTableMeta._ID + "=?",
- new String[] { String.valueOf(id_) });
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- return;
- }
- } else {
- contentResolver_.update(ProviderTableMeta.CONTENT_URI, cv,
- ProviderTableMeta._ID + "=?",
- new String[] { String.valueOf(id_) });
- }
- } else {
- Uri new_entry = null;
- if (providerClient_ != null) {
- try {
- new_entry = providerClient_.insert(ProviderTableMeta.CONTENT_URI_FILE,
- cv);
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- id_ = -1;
- return;
- }
- } else {
- new_entry = contentResolver_.insert(
- ProviderTableMeta.CONTENT_URI_FILE, cv);
- }
- try {
- 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;
- }
- }
- }
-
- /**
- * List the directory content
- *
- * @return The directory content or null, if the file is not a directory
- */
- 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 = null;
- if (providerClient_ != null) {
- try {
- c = providerClient_.query(req_uri, null, null, null, null);
- } catch (RemoteException e) {
- Log.e(TAG, e.getMessage());
- return ret;
- }
- } else {
- c = contentResolver_.query(req_uri, null, null, null, null);
- }
-
- if (c.moveToFirst())
- do {
- OCFile child = new OCFile(providerClient_, account_);
- child.setFileData(c);
- ret.add(child);
- } while (c.moveToNext());
-
- c.close();
- return ret;
- }
- return null;
- }
-
- /**
* Adds a file to this directory. If this file is not a directory, an
* exception gets thrown.
*
- * @param file
- * to add
- * @throws IllegalStateException
- * if you try to add a something and this is not a directory
+ * @param file to add
+ * @throws IllegalStateException if you try to add a something and this is not a directory
*/
public void addFile(OCFile file) throws IllegalStateException {
if (isDirectory()) {
file.parent_id_ = id_;
- file.save();
+ update_while_saving_ = true;
return;
}
- throw new IllegalStateException(
- "This is not a directory where you can add stuff to!");
+ throw new IllegalStateException("This is not a directory where you can add stuff to!");
}
/**
modified_timestamp_ = 0;
}
- /**
- * Used internally. Set properties based on the information in a {@link android.database.Cursor}
- * @param c the Cursor containing the information
- */
- private void setFileData(Cursor c) {
- resetData();
- if (c != null) {
- id_ = c.getLong(c.getColumnIndex(ProviderTableMeta._ID));
- path_ = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH));
- 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));
- }
+ public void setFileId(long file_id) {
+ id_ = file_id;
}
+
+ public void setMimetype(String mimetype) {
+ mimetype_ = mimetype;
+ }
+
+ public void setParentId(long parent_id) {
+ parent_id_ = parent_id;
+ }
+
+ public void setFileLength(long file_len) {
+ length_ = file_len;
+ }
+
+ public long getFileLength() {
+ return length_;
+ }
+
+ public long getParentId() {
+ return parent_id_;
+ }
+
+ public boolean needsUpdatingWhileSaving() {
+ return update_while_saving_;
+ }
}
import android.text.TextUtils;\r
import android.util.Log;\r
import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.webdav.HttpPropFind;\r
import eu.alefzero.webdav.TreeNode;\r
private Account account;\r
private ContentProviderClient contentProvider;\r
private Date lastUpdated;\r
+ private DataStorageManager mStoreManager;\r
\r
private HttpHost mHost;\r
private WebdavClient mClient = null;\r
this.lastUpdated = lastUpdated;\r
}\r
\r
+ public void setStorageManager(DataStorageManager storage_manager) {\r
+ mStoreManager = storage_manager;\r
+ }\r
+ \r
+ public DataStorageManager getStorageManager() {\r
+ return mStoreManager;\r
+ }\r
+ \r
protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {\r
return new ConnectionKeepAliveStrategy() {\r
public long getKeepAliveDuration(HttpResponse response,\r
long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0\r
: Long.parseLong(n\r
.getProperty(NodeProperty.LAST_MODIFIED_DATE));\r
- OCFile file = new OCFile(getContentProvider(), getAccount(),\r
- n.getProperty(NodeProperty.PATH));\r
- if (file.fileExists() && file.getModificationTimestamp() >= mod) {\r
+ \r
+ OCFile file = getStorageManager().getFileByPath(n.getProperty(NodeProperty.PATH));\r
+ if (file != null && file.fileExists() && file.getModificationTimestamp() >= mod) {\r
Log.d(TAG, "No update for file/dir " + file.getFileName()\r
+ " is needed");\r
} else {\r
long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
: Long.parseLong(n\r
.getProperty(NodeProperty.CREATE_DATE));\r
- file = OCFile.createNewFile(getContentProvider(), getAccount(),\r
- n.getProperty(NodeProperty.PATH), len, create, mod,\r
- n.getProperty(NodeProperty.RESOURCE_TYPE), parent_id);\r
- file.save();\r
+ file = new OCFile(n.getProperty(NodeProperty.PATH));\r
+ file.setFileLength(len);\r
+ file.setCreationTimestamp(create);\r
+ file.setModificationTimestamp(mod);\r
+ file.setMimetype(n.getProperty(NodeProperty.RESOURCE_TYPE));\r
+ file.setParentId(parent_id);\r
+ getStorageManager().saveFile(file);\r
if (override_parent) {\r
parent_id = file.getFileId();\r
override_parent = false;\r
import android.os.Bundle;\r
import android.os.RemoteException;\r
import android.util.Log;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
import eu.alefzero.webdav.HttpPropFind;\r
import eu.alefzero.webdav.TreeNode;\r
try {\r
this.setAccount(account);\r
this.setContentProvider(provider);\r
+ this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));\r
\r
HttpPropFind query = this.getPropFindQuery();\r
query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind()));\r
import eu.alefzero.owncloud.R;\r
import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
import eu.alefzero.owncloud.authenticator.AuthUtils;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
import eu.alefzero.webdav.WebdavClient;\r
public class FileDisplayActivity extends SherlockFragmentActivity implements\r
OnNavigationListener {\r
private ArrayAdapter<String> mDirectories;\r
+ private DataStorageManager mStorageManager;\r
\r
private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r
\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
+ OCFile parent = mStorageManager.getFileByPath(path + "/");\r
+ path += s + "/";\r
Thread thread = new Thread(new DirectoryCreator(path, a));\r
thread.start();\r
- OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0,\r
- "DIR", parent.getFileId()).save();\r
+ \r
+ OCFile new_file = new OCFile(path);\r
+ new_file.setMimetype("DIR");\r
+ new_file.setParentId(parent.getParentId());\r
+ mStorageManager.saveFile(new_file);\r
\r
dialog.dismiss();\r
}\r
R.layout.sherlock_spinner_dropdown_item);\r
mDirectories.add("/");\r
setContentView(R.layout.files);\r
+ mStorageManager = new FileDataStorageManager(AuthUtils.getCurrentOwnCloudAccount(this), getContentResolver());\r
ActionBar action_bar = getSupportActionBar();\r
action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
action_bar.setDisplayShowTitleEnabled(false);\r
\r
import eu.alefzero.owncloud.DisplayUtils;\r
import eu.alefzero.owncloud.R;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
import eu.alefzero.owncloud.datamodel.OCFile;\r
\r
import android.content.Context;\r
private Context mContext;\r
private OCFile mFile;\r
private Vector<OCFile> mFiles;\r
+ private DataStorageManager mStorageManager;\r
\r
- public FileListListAdapter(OCFile file, Context context) {\r
+ public FileListListAdapter(OCFile file, DataStorageManager storage_man, Context context) {\r
mFile = file;\r
- mFiles = mFile.getDirectoryContent();\r
+ mStorageManager = storage_man;\r
+ mFiles = mStorageManager.getDirectoryContent(mFile);\r
mContext = context;\r
}\r
\r
import android.widget.AdapterView;\r
import eu.alefzero.owncloud.R;\r
import eu.alefzero.owncloud.authenticator.AuthUtils;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
import eu.alefzero.owncloud.datamodel.OCFile;\r
import eu.alefzero.owncloud.ui.FragmentListView;\r
import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
private Account mAccount;\r
private Stack<String> mDirNames;\r
private Vector<OCFile> mFiles;\r
+ private DataStorageManager mStorageManager;\r
\r
public FileListFragment() {\r
mDirNames = new Stack<String>();\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
+ mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+ OCFile file = new OCFile(s);\r
+ mFiles = mStorageManager.getDirectoryContent(file);\r
+ setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));\r
}\r
\r
//TODO: Delete this testing stuff.\r
projects / pub / Android / ownCloud.git / commitdiff