X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e81a7790eb434bbf4627e86aae14de4b7561c8a6..8f1566a21c1dfdc562d701c5514ee616509fcb65:/src/com/owncloud/android/datamodel/FileDataStorageManager.java diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index e0119531..1b0f083e 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -1,10 +1,10 @@ /* 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 as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * 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 @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Vector; +import com.owncloud.android.Log_OC; import com.owncloud.android.db.ProviderMeta; import com.owncloud.android.db.ProviderMeta.ProviderTableMeta; import com.owncloud.android.utils.FileStorageUtils; @@ -39,16 +40,15 @@ import android.content.OperationApplicationException; 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; @@ -69,9 +69,21 @@ public class FileDataStorageManager implements DataStorageManager { file = createFileInstance(c); } c.close(); + if (file == null && OCFile.PATH_SEPARATOR.equals(path)) { + return createRootDir(); // root should always exist + } return file; } + + private OCFile createRootDir() { + OCFile file = new OCFile(OCFile.PATH_SEPARATOR); + file.setMimetype("DIR"); + file.setParentId(DataStorageManager.ROOT_PARENT_ID); + saveFile(file); + return file; + } + @Override public OCFile getFileById(long id) { Cursor c = getCursorForValue(ProviderTableMeta._ID, String.valueOf(id)); @@ -108,6 +120,7 @@ public class FileDataStorageManager implements DataStorageManager { boolean overriden = false; ContentValues cv = new ContentValues(); cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp()); + cv.put(ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, file.getModificationTimestampAtLastSyncForData()); cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp()); cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength()); cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype()); @@ -142,7 +155,7 @@ public class FileDataStorageManager implements DataStorageManager { cv, ProviderTableMeta._ID + "=?", new String[] { String.valueOf(file.getFileId()) }); } catch (RemoteException e) { - Log.e(TAG, + Log_OC.e(TAG, "Fail to insert insert file to database " + e.getMessage()); } @@ -157,7 +170,7 @@ public class FileDataStorageManager implements DataStorageManager { result_uri = getContentProvider().insert( ProviderTableMeta.CONTENT_URI_FILE, cv); } catch (RemoteException e) { - Log.e(TAG, + Log_OC.e(TAG, "Fail to insert insert file to database " + e.getMessage()); } @@ -189,6 +202,7 @@ public class FileDataStorageManager implements DataStorageManager { file = filesIt.next(); ContentValues cv = new ContentValues(); cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp()); + cv.put(ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA, file.getModificationTimestampAtLastSyncForData()); cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp()); cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength()); cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype()); @@ -241,10 +255,10 @@ public class FileDataStorageManager implements DataStorageManager { } } catch (OperationApplicationException e) { - Log.e(TAG, "Fail to update/insert list of files to database " + e.getMessage()); + Log_OC.e(TAG, "Fail to update/insert list of files to database " + e.getMessage()); } catch (RemoteException e) { - Log.e(TAG, "Fail to update/insert list of files to database " + e.getMessage()); + Log_OC.e(TAG, "Fail to update/insert list of files to database " + e.getMessage()); } // update new id in file objects for insertions @@ -254,7 +268,7 @@ public class FileDataStorageManager implements DataStorageManager { if (results[i].uri != null) { newId = Long.parseLong(results[i].uri.getPathSegments().get(1)); files.get(i).setFileId(newId); - //Log.v(TAG, "Found and added id in insertion for " + files.get(i).getRemotePath()); + //Log_OC.v(TAG, "Found and added id in insertion for " + files.get(i).getRemotePath()); } } } @@ -306,7 +320,7 @@ public class FileDataStorageManager implements DataStorageManager { ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?", new String[] { mAccount.name }, null); } catch (RemoteException e) { - Log.e(TAG, e.getMessage()); + Log_OC.e(TAG, e.getMessage()); return ret; } } else { @@ -349,7 +363,7 @@ public class FileDataStorageManager implements DataStorageManager { + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?", new String[] { value, mAccount.name }, null); } catch (RemoteException e) { - Log.e(TAG, + Log_OC.e(TAG, "Couldn't determine file existance, assuming non existance: " + e.getMessage()); return false; @@ -379,7 +393,7 @@ public class FileDataStorageManager implements DataStorageManager { + "=?", new String[] { value, mAccount.name }, null); } catch (RemoteException e) { - Log.e(TAG, "Could not get file details: " + e.getMessage()); + Log_OC.e(TAG, "Could not get file details: " + e.getMessage()); c = null; } } @@ -414,6 +428,8 @@ public class FileDataStorageManager implements DataStorageManager { .getColumnIndex(ProviderTableMeta.FILE_CREATION))); file.setModificationTimestamp(c.getLong(c .getColumnIndex(ProviderTableMeta.FILE_MODIFIED))); + file.setModificationTimestampAtLastSyncForData(c.getLong(c + .getColumnIndex(ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA))); file.setLastSyncDateForProperties(c.getLong(c .getColumnIndex(ProviderTableMeta.FILE_LAST_SYNC_DATE))); file.setLastSyncDateForData(c.getLong(c. @@ -456,7 +472,7 @@ public class FileDataStorageManager implements DataStorageManager { // TODO consider possible failures if (dir != null && dir.isDirectory() && dir.getFileId() != -1) { Vector children = getDirectoryContent(dir); - if (children != null) { + if (children.size() > 0) { OCFile child = null; for (int i=0; i getDirectoryImages(OCFile directory) { + Vector ret = new Vector(); + if (directory != null) { + // TODO better implementation, filtering in the access to database (if possible) instead of here + Vector tmp = getDirectoryContent(directory); + OCFile current = null; + for (int i=0; i