From: Bartek Przybylski Date: Sat, 19 May 2012 16:30:03 +0000 (+0200) Subject: last sync field for oc file X-Git-Tag: oc-android-1.4.3~411 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/65523409c7e28372ee50c09a358169fe2df8cc69?ds=inline last sync field for oc file --- diff --git a/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java index 8d7d2eec..e4c385f5 100644 --- a/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java +++ b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java @@ -33,4 +33,6 @@ public interface DataStorageManager { public boolean saveFile(OCFile file); public Vector getDirectoryContent(OCFile f); + + public void removeFile(OCFile file); } diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java index 80072bbc..4ec57980 100644 --- a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java +++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java @@ -286,5 +286,18 @@ public class FileDataStorageManager implements DataStorageManager { } return file; } + + public void removeFile(OCFile file) { + Uri file_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI, ""+file.getFileId()); + if (getContentProvider() != null) { + try { + getContentProvider().delete(file_uri, null, null); + } catch (RemoteException e) { + e.printStackTrace(); + } + } else { + getContentResolver().delete(file_uri, null, null); + } + } } diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java index e2cebcfc..7e8f4285 100644 --- a/src/eu/alefzero/owncloud/datamodel/OCFile.java +++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java @@ -46,6 +46,7 @@ public class OCFile implements Parcelable { private String mLocalPath; private String mMimeType; private boolean mNeedsUpdating; + private long mLastSyncDate; /** * Create new {@link OCFile} with given path @@ -227,6 +228,7 @@ public class OCFile implements Parcelable { mLength = 0; mCreationTimestamp = 0; mModifiedTimestamp = 0; + mLastSyncDate = 0; } /** @@ -291,6 +293,14 @@ public class OCFile implements Parcelable { public boolean needsUpdatingWhileSaving() { return mNeedsUpdating; } + + public long getLastSyncDate() { + return mLastSyncDate; + } + + public void setLastSyncDate(long lastSyncDate) { + mLastSyncDate = lastSyncDate; + } @Override public int describeContents() { @@ -307,8 +317,8 @@ public class OCFile implements Parcelable { dest.writeString(mRemotePath); dest.writeString(mLocalPath); dest.writeString(mMimeType); - dest.writeInt(mNeedsUpdating ? 0 : 1); // No writeBoolean method exists - // - yay :D + dest.writeInt(mNeedsUpdating ? 1 : 0); + dest.writeLong(mLastSyncDate); } } diff --git a/src/eu/alefzero/owncloud/db/ProviderMeta.java b/src/eu/alefzero/owncloud/db/ProviderMeta.java index aa67109f..79f285ac 100644 --- a/src/eu/alefzero/owncloud/db/ProviderMeta.java +++ b/src/eu/alefzero/owncloud/db/ProviderMeta.java @@ -57,6 +57,7 @@ public class ProviderMeta { public static final String FILE_STORAGE_PATH = "media_path"; public static final String FILE_PATH = "path"; public static final String FILE_ACCOUNT_OWNER = "file_owner"; + public static final String FILE_LAST_SYNC_DATE = "last_sync_date"; public static final String DEFAULT_SORT_ORDER = FILE_NAME + " collate nocase asc"; diff --git a/src/eu/alefzero/owncloud/providers/FileContentProvider.java b/src/eu/alefzero/owncloud/providers/FileContentProvider.java index c1ecef3e..06338df7 100644 --- a/src/eu/alefzero/owncloud/providers/FileContentProvider.java +++ b/src/eu/alefzero/owncloud/providers/FileContentProvider.java @@ -66,6 +66,8 @@ public class FileContentProvider extends ContentProvider { ProviderTableMeta.FILE_CONTENT_TYPE); mProjectionMap.put(ProviderTableMeta.FILE_STORAGE_PATH, ProviderTableMeta.FILE_STORAGE_PATH); + mProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, + ProviderTableMeta.FILE_LAST_SYNC_DATE); } private static final int SINGLE_FILE = 1; @@ -207,7 +209,8 @@ public class FileContentProvider extends ContentProvider { + ProviderTableMeta.FILE_CONTENT_TYPE + " TEXT, " + ProviderTableMeta.FILE_CONTENT_LENGTH + " INTEGER, " + ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, " - + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT);"); + + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, " + + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER );"); } @Override