Removed interface DataStorageManager

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index 0ff0907..9ce6445 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -55,7 +55,6 @@ import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
 import com.owncloud.android.authentication.AccountAuthenticator;
 import android.widget.Toast;
 
 import com.owncloud.android.authentication.AccountAuthenticator;

-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;


@@ -77,7 +76,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     private ArrayList<Parcelable> mStreamsToUpload;
     private boolean mCreateDir;
     private String mUploadPath;
     private ArrayList<Parcelable> mStreamsToUpload;
     private boolean mCreateDir;
     private String mUploadPath;

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     private OCFile mFile;
 
     private final static int DIALOG_NO_ACCOUNT = 0;
     private OCFile mFile;
 
     private final static int DIALOG_NO_ACCOUNT = 0;

diff --git a/src/com/owncloud/android/datamodel/DataStorageManager.java b/src/com/owncloud/android/datamodel/DataStorageManager.java
deleted file mode 100644 (file)
index 133ab8d..0000000
--- a/src/com/owncloud/android/datamodel/DataStorageManager.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012  Bartek Przybylski
- *   Copyright (C) 2012-2013 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   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 com.owncloud.android.datamodel;
-
-import java.util.List;
-import java.util.Vector;
-
-public interface DataStorageManager {
-
-    public static final int ROOT_PARENT_ID = 0;
-    
-    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 void saveFiles(List<OCFile> files);
-
-    public Vector<OCFile> getDirectoryContent(OCFile f);
-    
-    public void removeFile(OCFile file, boolean removeLocalCopy);
-    
-    public void removeDirectory(OCFile dir, boolean removeDBData, boolean removeLocalContent);
-
-    public void moveDirectory(OCFile dir, String newPath);
-
-    public Vector<OCFile> getDirectoryImages(OCFile mParentFolder);
-    
-    public void calculateFolderSize(long id);
-    
-}

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 1c9ff7a..39ddb92 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -42,7 +42,9 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
 
 import android.net.Uri;
 import android.os.RemoteException;
 

-public class FileDataStorageManager implements DataStorageManager {
+public class FileDataStorageManager {
+
+    public static final int ROOT_PARENT_ID = 0;

 
     private ContentResolver mContentResolver;
     private ContentProviderClient mContentProvider;
 
     private ContentResolver mContentResolver;
     private ContentProviderClient mContentProvider;


@@ -62,7 +64,7 @@ public class FileDataStorageManager implements DataStorageManager {
         mAccount = account;
     }
 
         mAccount = account;
     }
 

-    @Override
+

     public OCFile getFileByPath(String path) {
         Cursor c = getCursorForValue(ProviderTableMeta.FILE_PATH, path);
         OCFile file = null;
     public OCFile getFileByPath(String path) {
         Cursor c = getCursorForValue(ProviderTableMeta.FILE_PATH, path);
         OCFile file = null;


@@ -80,12 +82,11 @@ public class FileDataStorageManager implements DataStorageManager {
     private OCFile createRootDir() {
         OCFile file = new OCFile(OCFile.PATH_SEPARATOR);
         file.setMimetype("DIR");
     private OCFile createRootDir() {
         OCFile file = new OCFile(OCFile.PATH_SEPARATOR);
         file.setMimetype("DIR");

-        file.setParentId(DataStorageManager.ROOT_PARENT_ID);
+        file.setParentId(FileDataStorageManager.ROOT_PARENT_ID);

         saveFile(file);
         return file;
     }
 
         saveFile(file);
         return file;
     }
 

-    @Override

     public OCFile getFileById(long id) {
         Cursor c = getCursorForValue(ProviderTableMeta._ID, String.valueOf(id));
         OCFile file = null;
     public OCFile getFileById(long id) {
         Cursor c = getCursorForValue(ProviderTableMeta._ID, String.valueOf(id));
         OCFile file = null;


@@ -106,17 +107,14 @@ public class FileDataStorageManager implements DataStorageManager {
         return file;
     }
 
         return file;
     }
 

-    @Override

     public boolean fileExists(long id) {
         return fileExists(ProviderTableMeta._ID, String.valueOf(id));
     }
 
     public boolean fileExists(long id) {
         return fileExists(ProviderTableMeta._ID, String.valueOf(id));
     }
 

-    @Override

     public boolean fileExists(String path) {
         return fileExists(ProviderTableMeta.FILE_PATH, path);
     }
 
     public boolean fileExists(String path) {
         return fileExists(ProviderTableMeta.FILE_PATH, path);
     }
 

-    @Override

     public boolean saveFile(OCFile file) {
         boolean overriden = false;
         ContentValues cv = new ContentValues();
     public boolean saveFile(OCFile file) {
         boolean overriden = false;
         ContentValues cv = new ContentValues();


@@ -206,7 +204,6 @@ public class FileDataStorageManager implements DataStorageManager {
     }
 
 
     }
 
 

-    @Override

     public void saveFiles(List<OCFile> files) {
 
         Iterator<OCFile> filesIt = files.iterator();
     public void saveFiles(List<OCFile> files) {
 
         Iterator<OCFile> filesIt = files.iterator();


@@ -223,7 +220,7 @@ public class FileDataStorageManager implements DataStorageManager {
             cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength());
             cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype());
             cv.put(ProviderTableMeta.FILE_NAME, file.getFileName());
             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() != DataStorageManager.ROOT_PARENT_ID)
+            if (file.getParentId() != FileDataStorageManager.ROOT_PARENT_ID)

                 cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId());
             cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath());
             if (!file.isDirectory())
                 cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId());
             cv.put(ProviderTableMeta.FILE_PATH, file.getRemotePath());
             if (!file.isDirectory())


@@ -332,7 +329,6 @@ public class FileDataStorageManager implements DataStorageManager {
         return mContentProvider;
     }
     
         return mContentProvider;
     }
     

-    @Override

     public Vector<OCFile> getDirectoryContent(OCFile f) {
         if (f != null && f.isDirectory() && f.getFileId() != -1) {
             return getDirectoryContent(f.getFileId());
     public Vector<OCFile> getDirectoryContent(OCFile f) {
         if (f != null && f.isDirectory() && f.getFileId() != -1) {
             return getDirectoryContent(f.getFileId());


@@ -480,7 +476,6 @@ public class FileDataStorageManager implements DataStorageManager {
         return file;
     }
 
         return file;
     }
 

-    @Override

     public void removeFile(OCFile file, boolean removeLocalCopy) {
         Uri file_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, ""+file.getFileId());
         if (getContentProvider() != null) {
     public void removeFile(OCFile file, boolean removeLocalCopy) {
         Uri file_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, ""+file.getFileId());
         if (getContentProvider() != null) {


@@ -511,7 +506,6 @@ public class FileDataStorageManager implements DataStorageManager {
         }
     }
 
         }
     }
 

-    @Override

     public void removeDirectory(OCFile dir, boolean removeDBData, boolean removeLocalContent) {
         // TODO consider possible failures
         if (dir != null && dir.isDirectory() && dir.getFileId() != -1) {
     public void removeDirectory(OCFile dir, boolean removeDBData, boolean removeLocalContent) {
         // TODO consider possible failures
         if (dir != null && dir.isDirectory() && dir.getFileId() != -1) {


@@ -550,7 +544,6 @@ public class FileDataStorageManager implements DataStorageManager {
      * TODO explore better (faster) implementations
      * TODO throw exceptions up !
      */
      * TODO explore better (faster) implementations
      * TODO throw exceptions up !
      */

-    @Override

     public void moveDirectory(OCFile dir, String newPath) {
         // TODO check newPath
 
     public void moveDirectory(OCFile dir, String newPath) {
         // TODO check newPath
 


@@ -614,7 +607,6 @@ public class FileDataStorageManager implements DataStorageManager {
         }
     }
 
         }
     }
 

-    @Override

     public Vector<OCFile> getDirectoryImages(OCFile directory) {
         Vector<OCFile> ret = new Vector<OCFile>(); 
         if (directory != null) {
     public Vector<OCFile> getDirectoryImages(OCFile directory) {
         Vector<OCFile> ret = new Vector<OCFile>(); 
         if (directory != null) {


@@ -635,7 +627,6 @@ public class FileDataStorageManager implements DataStorageManager {
      * Calculate and save the folderSize on DB
      * @param id
      */
      * Calculate and save the folderSize on DB
      * @param id
      */

-    @Override

     public void calculateFolderSize(long id) {
         long folderSize = 0;
         
     public void calculateFolderSize(long id) {
         long folderSize = 0;
         


@@ -678,7 +669,7 @@ public class FileDataStorageManager implements DataStorageManager {
         
         OCFile file; 
 
         
         OCFile file; 
 

-        while (parentId != DataStorageManager.ROOT_PARENT_ID) {
+        while (parentId != FileDataStorageManager.ROOT_PARENT_ID) {

             
             // Update the size of the parent
             calculateFolderSize(parentId);
             
             // Update the size of the parent
             calculateFolderSize(parentId);

diff --git a/src/com/owncloud/android/operations/CreateFolderOperation.java b/src/com/owncloud/android/operations/CreateFolderOperation.java
index 5745ec2..c86d2fc 100644 (file)
--- a/src/com/owncloud/android/operations/CreateFolderOperation.java
+++ b/src/com/owncloud/android/operations/CreateFolderOperation.java
@@ -23,7 +23,7 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
 import com.owncloud.android.Log_OC;
 import org.apache.jackrabbit.webdav.client.methods.MkColMethod;
 
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavClient;
 import com.owncloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavClient;


@@ -43,7 +43,7 @@ public class CreateFolderOperation extends RemoteOperation {
     
     protected String mRemotePath;
     protected boolean mCreateFullPath;
     
     protected String mRemotePath;
     protected boolean mCreateFullPath;

-    protected DataStorageManager mStorageManager;
+    protected FileDataStorageManager mStorageManager;

     
     /**
      * Constructor
     
     /**
      * Constructor


@@ -52,7 +52,7 @@ public class CreateFolderOperation extends RemoteOperation {
      * @param createFullPath        'True' means that all the ancestor folders should be created if don't exist yet.
      * @param storageManager        Reference to the local database corresponding to the account where the file is contained. 
      */
      * @param createFullPath        'True' means that all the ancestor folders should be created if don't exist yet.
      * @param storageManager        Reference to the local database corresponding to the account where the file is contained. 
      */

-    public CreateFolderOperation(String remotePath, boolean createFullPath, DataStorageManager storageManager) {
+    public CreateFolderOperation(String remotePath, boolean createFullPath, FileDataStorageManager storageManager) {

         mRemotePath = remotePath;
         mCreateFullPath = createFullPath;
         mStorageManager = storageManager;
         mRemotePath = remotePath;
         mCreateFullPath = createFullPath;
         mStorageManager = storageManager;

diff --git a/src/com/owncloud/android/operations/RemoveFileOperation.java b/src/com/owncloud/android/operations/RemoveFileOperation.java
index 9dabfaf..192ca61 100644 (file)
--- a/src/com/owncloud/android/operations/RemoveFileOperation.java
+++ b/src/com/owncloud/android/operations/RemoveFileOperation.java
@@ -21,7 +21,7 @@ import org.apache.commons.httpclient.HttpStatus;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 
 import com.owncloud.android.Log_OC;
 import org.apache.jackrabbit.webdav.client.methods.DeleteMethod;
 
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavClient;
 import com.owncloud.android.datamodel.OCFile;
 
 import eu.alefzero.webdav.WebdavClient;


@@ -41,7 +41,7 @@ public class RemoveFileOperation extends RemoteOperation {
     
     OCFile mFileToRemove;
     boolean mDeleteLocalCopy;
     
     OCFile mFileToRemove;
     boolean mDeleteLocalCopy;

-    DataStorageManager mDataStorageManager;
+    FileDataStorageManager mDataStorageManager;

     
     
     /**
     
     
     /**


@@ -51,7 +51,7 @@ public class RemoveFileOperation extends RemoteOperation {
      * @param deleteLocalCopy       When 'true', and a local copy of the file exists, it is also removed.
      * @param storageManager        Reference to the local database corresponding to the account where the file is contained. 
      */
      * @param deleteLocalCopy       When 'true', and a local copy of the file exists, it is also removed.
      * @param storageManager        Reference to the local database corresponding to the account where the file is contained. 
      */

-    public RemoveFileOperation(OCFile fileToRemove, boolean deleteLocalCopy, DataStorageManager storageManager) {
+    public RemoveFileOperation(OCFile fileToRemove, boolean deleteLocalCopy, FileDataStorageManager storageManager) {

         mFileToRemove = fileToRemove;
         mDeleteLocalCopy = deleteLocalCopy;
         mDataStorageManager = storageManager;
         mFileToRemove = fileToRemove;
         mDeleteLocalCopy = deleteLocalCopy;
         mDataStorageManager = storageManager;

diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java
index fddb849..06bb91c 100644 (file)
--- a/src/com/owncloud/android/operations/RenameFileOperation.java
+++ b/src/com/owncloud/android/operations/RenameFileOperation.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.webdav.client.methods.DavMethodBase;
 import android.accounts.Account;
 
 import com.owncloud.android.Log_OC;
 import android.accounts.Account;
 
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.utils.FileStorageUtils;


@@ -51,7 +51,7 @@ public class RenameFileOperation extends RemoteOperation {
     private Account mAccount;
     private String mNewName;
     private String mNewRemotePath;
     private Account mAccount;
     private String mNewName;
     private String mNewRemotePath;

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     
     
     /**
     
     
     /**


@@ -62,7 +62,7 @@ public class RenameFileOperation extends RemoteOperation {
      * @param newName               New name to set as the name of file.
      * @param storageManager        Reference to the local database corresponding to the account where the file is contained. 
      */
      * @param newName               New name to set as the name of file.
      * @param storageManager        Reference to the local database corresponding to the account where the file is contained. 
      */

-    public RenameFileOperation(OCFile file, Account account, String newName, DataStorageManager storageManager) {
+    public RenameFileOperation(OCFile file, Account account, String newName, FileDataStorageManager storageManager) {

         mFile = file;
         mAccount = account;
         mNewName = newName;
         mFile = file;
         mAccount = account;
         mNewName = newName;

diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index cb4485e..7610e37 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -27,7 +27,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.owncloud.android.Log_OC;
 import android.content.Intent;
 
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;


@@ -45,7 +45,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
     
     private OCFile mLocalFile;
     private OCFile mServerFile;
     
     private OCFile mLocalFile;
     private OCFile mServerFile;

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     private Account mAccount;
     private boolean mSyncFileContents;
     private boolean mLocalChangeAlreadyKnown;
     private Account mAccount;
     private boolean mSyncFileContents;
     private boolean mLocalChangeAlreadyKnown;


@@ -56,7 +56,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
     public SynchronizeFileOperation(
             OCFile localFile,
             OCFile serverFile,          // make this null to let the operation checks the server; added to reuse info from SynchronizeFolderOperation 
     public SynchronizeFileOperation(
             OCFile localFile,
             OCFile serverFile,          // make this null to let the operation checks the server; added to reuse info from SynchronizeFolderOperation 

-            DataStorageManager storageManager, 
+            FileDataStorageManager storageManager, 

             Account account, 
             boolean syncFileContents,
             boolean localChangeAlreadyKnown, 
             Account account, 
             boolean syncFileContents,
             boolean localChangeAlreadyKnown, 

diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index f8b69f4..f85e4e7 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -37,7 +37,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import com.owncloud.android.Log_OC;
 import android.content.Intent;
 
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.syncadapter.FileSyncService;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.syncadapter.FileSyncService;


@@ -74,7 +74,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
     private boolean mUpdateFolderProperties;
 
     /** Access to the local database */
     private boolean mUpdateFolderProperties;
 
     /** Access to the local database */

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     
     /** Account where the file to synchronize belongs */
     private Account mAccount;
     
     /** Account where the file to synchronize belongs */
     private Account mAccount;


@@ -114,7 +114,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                                         long currentSyncTime, 
                                         boolean updateFolderProperties,
                                         boolean syncFullAccount,
                                         long currentSyncTime, 
                                         boolean updateFolderProperties,
                                         boolean syncFullAccount,

-                                        DataStorageManager dataStorageManager, 
+                                        FileDataStorageManager dataStorageManager, 

                                         Account account, 
                                         Context context ) {
         mLocalFolder = folder;
                                         Account account, 
                                         Context context ) {
         mLocalFolder = folder;

diff --git a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
index 26bfff7..43c0f2f 100644 (file)
--- a/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/com/owncloud/android/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -30,7 +30,7 @@ import org.apache.http.client.ClientProtocolException;
 \r
 import com.owncloud.android.authentication.AccountUtils;\r
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;\r
 \r
 import com.owncloud.android.authentication.AccountUtils;\r
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;\r

-import com.owncloud.android.datamodel.DataStorageManager;\r
+import com.owncloud.android.datamodel.FileDataStorageManager;\r

 import com.owncloud.android.network.OwnCloudClientUtils;\r
 \r
 import android.accounts.Account;\r
 import com.owncloud.android.network.OwnCloudClientUtils;\r
 \r
 import android.accounts.Account;\r


@@ -58,7 +58,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
     private Account account;\r
     private ContentProviderClient contentProvider;\r
     //private Date lastUpdated;\r
     private Account account;\r
     private ContentProviderClient contentProvider;\r
     //private Date lastUpdated;\r

-    private DataStorageManager mStoreManager;\r
+    private FileDataStorageManager mStoreManager;\r

 \r
     private WebdavClient mClient = null;\r
 \r
 \r
     private WebdavClient mClient = null;\r
 \r


@@ -91,11 +91,11 @@ public abstract class AbstractOwnCloudSyncAdapter extends
         this.contentProvider = contentProvider;\r
     }\r
 \r
         this.contentProvider = contentProvider;\r
     }\r
 \r

-    public void setStorageManager(DataStorageManager storage_manager) {\r
+    public void setStorageManager(FileDataStorageManager storage_manager) {\r

         mStoreManager = storage_manager;\r
     }\r
 \r
         mStoreManager = storage_manager;\r
     }\r
 \r

-    public DataStorageManager getStorageManager() {\r
+    public FileDataStorageManager getStorageManager() {\r

         return mStoreManager;\r
     }\r
 \r
         return mStoreManager;\r
     }\r
 \r

diff --git a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index 61ac8f5..f0895bf 100644 (file)
--- a/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -19,7 +19,6 @@
 package com.owncloud.android.ui.activity;
 
 import com.owncloud.android.Log_OC;
 package com.owncloud.android.ui.activity;
 
 import com.owncloud.android.Log_OC;

-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;


@@ -81,7 +80,7 @@ public class ConflictsResolveActivity extends FileActivity implements OnConflict
                 finish();
             } else {
                 /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account
                 finish();
             } else {
                 /// Check whether the 'main' OCFile handled by the Activity is contained in the current Account

-                DataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());
+                FileDataStorageManager storageManager = new FileDataStorageManager(getAccount(), getContentResolver());

                 file = storageManager.getFileByPath(file.getRemotePath());   // file = null if not in the current Account
                 if (file != null) {
                     setFile(file);
                 file = storageManager.getFileByPath(file.getRemotePath());   // file = null if not in the current Account
                 if (file != null) {
                     setFile(file);

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index 1953336..477515d 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -60,7 +60,6 @@ import com.actionbarsherlock.view.Window;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;

-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;


@@ -103,7 +102,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
     private ArrayAdapter<String> mDirectories;
 
     /** Access point to the cached database for the current ownCloud {@link Account} */
     private ArrayAdapter<String> mDirectories;
 
     /** Access point to the cached database for the current ownCloud {@link Account} */

-    private DataStorageManager mStorageManager = null;
+    private FileDataStorageManager mStorageManager = null;

 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;
 
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private UploadFinishReceiver mUploadFinishReceiver;


@@ -985,7 +984,7 @@ OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNa
      * {@inheritDoc}
      */
     @Override
      * {@inheritDoc}
      */
     @Override

-    public DataStorageManager getStorageManager() {
+    public FileDataStorageManager getStorageManager() {

         return mStorageManager;
     }
 
         return mStorageManager;
     }
 

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 3e8eecd..4000318 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -31,7 +31,7 @@ import android.widget.TextView;
 import com.owncloud.android.DisplayUtils;\r
 import com.owncloud.android.R;\r
 import com.owncloud.android.authentication.AccountUtils;\r
 import com.owncloud.android.DisplayUtils;\r
 import com.owncloud.android.R;\r
 import com.owncloud.android.authentication.AccountUtils;\r

-import com.owncloud.android.datamodel.DataStorageManager;\r
+import com.owncloud.android.datamodel.FileDataStorageManager;\r

 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r


@@ -51,7 +51,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
     private Context mContext;\r
     private OCFile mFile = null;\r
     private Vector<OCFile> mFiles = null;\r
     private Context mContext;\r
     private OCFile mFile = null;\r
     private Vector<OCFile> mFiles = null;\r

-    private DataStorageManager mStorageManager;\r
+    private FileDataStorageManager mStorageManager;\r

     private Account mAccount;\r
     private TransferServiceGetter mTransferServiceGetter;\r
     //total size of a directory (recursive)\r
     private Account mAccount;\r
     private TransferServiceGetter mTransferServiceGetter;\r
     //total size of a directory (recursive)\r


@@ -195,7 +195,7 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
      * @param directory                 New file to adapt. Can be NULL, meaning "no content to adapt".\r
      * @param updatedStorageManager     Optional updated storage manager; used to replace mStorageManager if is different (and not NULL)\r
      */\r
      * @param directory                 New file to adapt. Can be NULL, meaning "no content to adapt".\r
      * @param updatedStorageManager     Optional updated storage manager; used to replace mStorageManager if is different (and not NULL)\r
      */\r

-    public void swapDirectory(OCFile directory, DataStorageManager updatedStorageManager) {\r
+    public void swapDirectory(OCFile directory, FileDataStorageManager updatedStorageManager) {\r

         mFile = directory;\r
         if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {\r
             mStorageManager = updatedStorageManager;\r
         mFile = directory;\r
         if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {\r
             mStorageManager = updatedStorageManager;\r

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 10b132b..4f0a5a4 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -24,7 +24,6 @@ import java.util.List;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;

-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileHandler;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.FileHandler;


@@ -32,11 +31,9 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.OnRemoteOperationListener;
 import com.owncloud.android.operations.RemoteOperation;

-import com.owncloud.android.operations.RemoteOperationResult;

 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoveFileOperation;
 import com.owncloud.android.operations.RenameFileOperation;
 import com.owncloud.android.operations.SynchronizeFileOperation;

-import com.owncloud.android.operations.RemoteOperationResult.ResultCode;

 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.TransferServiceGetter;
 import com.owncloud.android.ui.adapter.FileListListAdapter;
 import com.owncloud.android.ui.activity.FileDisplayActivity;
 import com.owncloud.android.ui.activity.TransferServiceGetter;
 import com.owncloud.android.ui.adapter.FileListListAdapter;


@@ -136,7 +133,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         int moveCount = 0;
         
         if(mFile != null){
         int moveCount = 0;
         
         if(mFile != null){

-            DataStorageManager storageManager = mContainerActivity.getStorageManager();
+            FileDataStorageManager storageManager = mContainerActivity.getStorageManager();

             
             String parentPath = null;
             if (mFile.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) {
             
             String parentPath = null;
             if (mFile.getParentId() != FileDataStorageManager.ROOT_PARENT_ID) {


@@ -377,7 +374,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
      * @param directory File to be listed
      */
     public void listDirectory(OCFile directory) {
      * @param directory File to be listed
      */
     public void listDirectory(OCFile directory) {

-        DataStorageManager storageManager = mContainerActivity.getStorageManager();
+        FileDataStorageManager storageManager = mContainerActivity.getStorageManager();

         if (storageManager != null) {
 
             // Check input parameters for null
         if (storageManager != null) {
 
             // Check input parameters for null


@@ -432,7 +429,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         /**
          * Getter for the current DataStorageManager in the container activity
          */
         /**
          * Getter for the current DataStorageManager in the container activity
          */

-        public DataStorageManager getStorageManager();
+        public FileDataStorageManager getStorageManager();

         
         
         /**
         
         
         /**

diff --git a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
index ef1e977..93078b5 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImageActivity.java
@@ -38,7 +38,6 @@ import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.authentication.AccountUtils;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.authentication.AccountUtils;

-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;


@@ -69,7 +68,7 @@ public class PreviewImageActivity extends FileActivity implements FileFragment.C
     
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
     
     
     private static final String DIALOG_WAIT_TAG = "DIALOG_WAIT";
     

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     
     private ViewPager mViewPager; 
     private PreviewImagePagerAdapter mPreviewImagePagerAdapter;    
     
     private ViewPager mViewPager; 
     private PreviewImagePagerAdapter mPreviewImagePagerAdapter;    

diff --git a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
index 3db62e9..ab78690 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
+++ b/src/com/owncloud/android/ui/preview/PreviewImagePagerAdapter.java
@@ -28,7 +28,7 @@ import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.view.ViewGroup;
 

-import com.owncloud.android.datamodel.DataStorageManager;
+import com.owncloud.android.datamodel.FileDataStorageManager;

 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.fragment.FileFragment;
 
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.fragment.FileFragment;
 


@@ -45,7 +45,7 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
     private Set<Object> mObsoleteFragments;
     private Set<Integer> mObsoletePositions;
     private Set<Integer> mDownloadErrors;
     private Set<Object> mObsoleteFragments;
     private Set<Integer> mObsoletePositions;
     private Set<Integer> mDownloadErrors;

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     
     private Map<Integer, FileFragment> mCachedFragments;
 
     
     private Map<Integer, FileFragment> mCachedFragments;
 


@@ -56,7 +56,7 @@ public class PreviewImagePagerAdapter extends FragmentStatePagerAdapter {
      * @param parentFolder      Folder where images will be searched for.
      * @param storageManager    Bridge to database.
      */
      * @param parentFolder      Folder where images will be searched for.
      * @param storageManager    Bridge to database.
      */

-    public PreviewImagePagerAdapter(FragmentManager fragmentManager, OCFile parentFolder, Account account, DataStorageManager storageManager) {
+    public PreviewImagePagerAdapter(FragmentManager fragmentManager, OCFile parentFolder, Account account, FileDataStorageManager storageManager) {

         super(fragmentManager);
         
         if (fragmentManager == null) {
         super(fragmentManager);
         
         if (fragmentManager == null) {

diff --git a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
index 0cab2e2..47441ff 100644 (file)
--- a/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
+++ b/src/com/owncloud/android/ui/preview/PreviewVideoActivity.java
@@ -32,7 +32,6 @@ import android.widget.VideoView;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;

-import com.owncloud.android.datamodel.DataStorageManager;

 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AccountUtils.AccountNotFoundException;


@@ -60,7 +59,7 @@ public class PreviewVideoActivity extends FileActivity implements OnCompletionLi
     
     private static final String TAG = PreviewVideoActivity.class.getSimpleName();
 
     
     private static final String TAG = PreviewVideoActivity.class.getSimpleName();
 

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     
     private int mSavedPlaybackPosition;         // in the unit time handled by MediaPlayer.getCurrentPosition()
     private boolean mAutoplay;                  // when 'true', the playback starts immediately with the activity
     
     private int mSavedPlaybackPosition;         // in the unit time handled by MediaPlayer.getCurrentPosition()
     private boolean mAutoplay;                  // when 'true', the playback starts immediately with the activity