From: Bartek Przybylski Date: Sat, 14 Apr 2012 20:28:55 +0000 (+0200) Subject: storage manager, removing db logic from ocfile X-Git-Tag: oc-android-1.4.3~443^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b7ca8521e6aeb97c95641905ad7f5b28e3436faf storage manager, removing db logic from ocfile --- diff --git a/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java new file mode 100644 index 00000000..1df12fdc --- /dev/null +++ b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java @@ -0,0 +1,36 @@ +/* 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 . + * + */ + +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 getDirectoryContent(OCFile f); +} diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java new file mode 100644 index 00000000..827435fe --- /dev/null +++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java @@ -0,0 +1,246 @@ +/* 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 . + * + */ + +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 getDirectoryContent(OCFile f) { + if (f.isDirectory() && f.getFileId() != -1) { + Vector ret = new Vector(); + + 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; + } + +} diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java index 46f5fa18..62705f15 100644 --- a/src/eu/alefzero/owncloud/datamodel/OCFile.java +++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java @@ -19,20 +19,8 @@ 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_; @@ -42,161 +30,19 @@ public class OCFile { 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 * @@ -323,117 +169,19 @@ public class OCFile { } /** - * 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 getDirectoryContent() { - if (isDirectory() && id_ != -1) { - Vector ret = new Vector(); - - 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!"); } /** @@ -450,27 +198,31 @@ public class OCFile { 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_; + } } diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java index 41a0503e..a3eead94 100644 --- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java +++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java @@ -44,6 +44,7 @@ import android.net.Uri; import android.text.TextUtils; import android.util.Log; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; +import eu.alefzero.owncloud.datamodel.DataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; import eu.alefzero.webdav.HttpPropFind; import eu.alefzero.webdav.TreeNode; @@ -65,6 +66,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends private Account account; private ContentProviderClient contentProvider; private Date lastUpdated; + private DataStorageManager mStoreManager; private HttpHost mHost; private WebdavClient mClient = null; @@ -107,6 +109,14 @@ public abstract class AbstractOwnCloudSyncAdapter extends this.lastUpdated = lastUpdated; } + public void setStorageManager(DataStorageManager storage_manager) { + mStoreManager = storage_manager; + } + + public DataStorageManager getStorageManager() { + return mStoreManager; + } + protected ConnectionKeepAliveStrategy getKeepAliveStrategy() { return new ConnectionKeepAliveStrategy() { public long getKeepAliveDuration(HttpResponse response, @@ -206,9 +216,9 @@ public abstract class AbstractOwnCloudSyncAdapter extends long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0 : Long.parseLong(n .getProperty(NodeProperty.LAST_MODIFIED_DATE)); - OCFile file = new OCFile(getContentProvider(), getAccount(), - n.getProperty(NodeProperty.PATH)); - if (file.fileExists() && file.getModificationTimestamp() >= mod) { + + OCFile file = getStorageManager().getFileByPath(n.getProperty(NodeProperty.PATH)); + if (file != null && file.fileExists() && file.getModificationTimestamp() >= mod) { Log.d(TAG, "No update for file/dir " + file.getFileName() + " is needed"); } else { @@ -221,10 +231,13 @@ public abstract class AbstractOwnCloudSyncAdapter extends long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0 : Long.parseLong(n .getProperty(NodeProperty.CREATE_DATE)); - file = OCFile.createNewFile(getContentProvider(), getAccount(), - n.getProperty(NodeProperty.PATH), len, create, mod, - n.getProperty(NodeProperty.RESOURCE_TYPE), parent_id); - file.save(); + file = new OCFile(n.getProperty(NodeProperty.PATH)); + file.setFileLength(len); + file.setCreationTimestamp(create); + file.setModificationTimestamp(mod); + file.setMimetype(n.getProperty(NodeProperty.RESOURCE_TYPE)); + file.setParentId(parent_id); + getStorageManager().saveFile(file); if (override_parent) { parent_id = file.getFileId(); override_parent = false; diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java index 43b15477..02920a14 100644 --- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java +++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java @@ -34,6 +34,7 @@ import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; import android.util.Log; +import eu.alefzero.owncloud.datamodel.FileDataStorageManager; import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta; import eu.alefzero.webdav.HttpPropFind; import eu.alefzero.webdav.TreeNode; @@ -64,6 +65,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { try { this.setAccount(account); this.setContentProvider(provider); + this.setStorageManager(new FileDataStorageManager(account, getContentProvider())); HttpPropFind query = this.getPropFindQuery(); query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind())); diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java index 0d042515..5bf71466 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -45,6 +45,8 @@ import com.actionbarsherlock.view.MenuItem; import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.authenticator.AuthUtils; +import eu.alefzero.owncloud.datamodel.DataStorageManager; +import eu.alefzero.owncloud.datamodel.FileDataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; import eu.alefzero.owncloud.ui.fragment.FileListFragment; import eu.alefzero.webdav.WebdavClient; @@ -59,6 +61,7 @@ import eu.alefzero.webdav.WebdavClient; public class FileDisplayActivity extends SherlockFragmentActivity implements OnNavigationListener { private ArrayAdapter mDirectories; + private DataStorageManager mStorageManager; private static final int DIALOG_CHOOSE_ACCOUNT = 0; @@ -92,12 +95,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements for (int i = mDirectories.getCount() - 2; i >= 0; --i) { path += "/" + mDirectories.getItem(i); } - OCFile parent = new OCFile(getContentResolver(), a, path + "/"); - path += "/" + s + "/"; + OCFile parent = mStorageManager.getFileByPath(path + "/"); + path += s + "/"; Thread thread = new Thread(new DirectoryCreator(path, a)); thread.start(); - OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0, - "DIR", parent.getFileId()).save(); + + OCFile new_file = new OCFile(path); + new_file.setMimetype("DIR"); + new_file.setParentId(parent.getParentId()); + mStorageManager.saveFile(new_file); dialog.dismiss(); } @@ -118,6 +124,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements R.layout.sherlock_spinner_dropdown_item); mDirectories.add("/"); setContentView(R.layout.files); + mStorageManager = new FileDataStorageManager(AuthUtils.getCurrentOwnCloudAccount(this), getContentResolver()); ActionBar action_bar = getSupportActionBar(); action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); action_bar.setDisplayShowTitleEnabled(false); diff --git a/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java index fa72803d..d0d102a4 100644 --- a/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java +++ b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java @@ -21,6 +21,7 @@ import java.util.Vector; import eu.alefzero.owncloud.DisplayUtils; import eu.alefzero.owncloud.R; +import eu.alefzero.owncloud.datamodel.DataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; import android.content.Context; @@ -42,10 +43,12 @@ public class FileListListAdapter implements ListAdapter { private Context mContext; private OCFile mFile; private Vector mFiles; + private DataStorageManager mStorageManager; - public FileListListAdapter(OCFile file, Context context) { + public FileListListAdapter(OCFile file, DataStorageManager storage_man, Context context) { mFile = file; - mFiles = mFile.getDirectoryContent(); + mStorageManager = storage_man; + mFiles = mStorageManager.getDirectoryContent(mFile); mContext = context; } diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java index a8bc9d39..3f762da6 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java @@ -27,6 +27,8 @@ import android.view.View; import android.widget.AdapterView; import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.authenticator.AuthUtils; +import eu.alefzero.owncloud.datamodel.DataStorageManager; +import eu.alefzero.owncloud.datamodel.FileDataStorageManager; import eu.alefzero.owncloud.datamodel.OCFile; import eu.alefzero.owncloud.ui.FragmentListView; import eu.alefzero.owncloud.ui.activity.FileDetailActivity; @@ -42,6 +44,7 @@ public class FileListFragment extends FragmentListView { private Account mAccount; private Stack mDirNames; private Vector mFiles; + private DataStorageManager mStorageManager; public FileListFragment() { mDirNames = new Stack(); @@ -102,9 +105,10 @@ public class FileListFragment extends FragmentListView { for (String a : mDirNames) s+= a+"/"; - OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, s); - mFiles = file.getDirectoryContent(); - setListAdapter(new FileListListAdapter(file, getActivity())); + mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver()); + OCFile file = new OCFile(s); + mFiles = mStorageManager.getDirectoryContent(file); + setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity())); } //TODO: Delete this testing stuff.