storage manager, removing db logic from ocfile

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / syncadapter / FileSyncAdapter.java

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index ef9da41..02920a1 100644 (file)
--- 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;\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
@@ -64,12 +65,13 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                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
                        TreeNode root = this.fireRequest(query);\r
 \r
-                       commitToDatabase(root, null);\r
+               //      commitToDatabase(root, null);\r
                } catch (OperationCanceledException e) {\r
                        e.printStackTrace();\r
                } catch (AuthenticatorException e) {\r
@@ -78,9 +80,9 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                } catch (IOException e) {\r
                        syncResult.stats.numIoExceptions++;\r
                        e.printStackTrace();\r
-               } catch (RemoteException e) {\r
-                       e.printStackTrace();\r
-               }\r
+               }// catch (RemoteException e) {\r
+               //      e.printStackTrace();\r
+               // q}\r
        }\r
 \r
        private void commitToDatabase(TreeNode root, String parentId) throws RemoteException {\r
@@ -110,7 +112,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                cv.put(ProviderTableMeta.FILE_PATH, n.getProperty(NodeProperty.PATH));\r
                                cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, this.getAccount().name);\r
                                Uri entry = this.getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);\r
-                               Log.d(TAG, "Inserting new entry " + path + name);\r
+                               Log.d(TAG, "Inserting new entry " + path);\r
                                c = this.getContentProvider().query(entry, null, null, null, null);\r
                                c.moveToFirst();\r
                        }\r