From: Bartek Przybylski Date: Sat, 19 May 2012 17:08:39 +0000 (+0200) Subject: Merge branch 'master' of gitorious.org:owncloud/android-devel X-Git-Tag: oc-android-1.4.3~409 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ef45634ffe1978a8717d60af6feb5d61968eac39?hp=d4a339871d8f40ccd9f086becfdd8a6c615700d9 Merge branch 'master' of gitorious.org:owncloud/android-devel --- 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..a7669574 100644 --- a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java +++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java @@ -96,6 +96,7 @@ public class FileDataStorageManager implements DataStorageManager { cv.put(ProviderTableMeta.FILE_PATH, file.getPath()); cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath()); cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name); + cv.put(ProviderTableMeta.FILE_LAST_SYNC_DATE, file.getLastSyncDate()); if (fileExists(file.getPath())) { OCFile tmpfile = getFileByPath(file.getPath()); @@ -283,8 +284,27 @@ public class FileDataStorageManager implements DataStorageManager { .getColumnIndex(ProviderTableMeta.FILE_CREATION))); file.setModificationTimestamp(c.getLong(c .getColumnIndex(ProviderTableMeta.FILE_MODIFIED))); + file.setLastSyncDate(c.getLong(c + .getColumnIndex(ProviderTableMeta.FILE_LAST_SYNC_DATE))); } return file; } + + public void removeFile(OCFile file) { + Uri file_uri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, ""+file.getFileId()); + if (getContentProvider() != null) { + try { + getContentProvider().delete(file_uri, + ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?", + new String[]{mAccount.name}); + } catch (RemoteException e) { + e.printStackTrace(); + } + } else { + getContentResolver().delete(file_uri, + ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?", + new String[]{mAccount.name}); + } + } } 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 diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java index 9350d82b..1e1a5e37 100644 --- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java +++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java @@ -19,6 +19,8 @@ package eu.alefzero.owncloud.syncadapter; import java.io.IOException; +import java.net.URLDecoder; +import java.util.Vector; import org.apache.jackrabbit.webdav.DavException; import org.apache.jackrabbit.webdav.MultiStatus; @@ -45,6 +47,8 @@ import eu.alefzero.webdav.WebdavEntry; */ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { + private long mCurrentSyncTime; + public FileSyncAdapter(Context context, boolean autoInitialize) { super(context, autoInitialize); } @@ -68,7 +72,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { PropFindMethod query; try { - Log.e("ASD", getUri().toString()); + mCurrentSyncTime = System.currentTimeMillis(); query = new PropFindMethod(getUri().toString() + "/"); getClient().executeMethod(query); MultiStatus resp = null; @@ -111,8 +115,13 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { if (parentId == 0) parentId = file.getFileId(); if (we.contentType().equals("DIR")) - fetchData(getUri().toString() + we.path(), syncResult, - file.getFileId()); + fetchData(getUri().toString() + we.path(), syncResult, file.getFileId()); + } + Vector files = getStorageManager().getDirectoryContent( + getStorageManager().getFileById(parentId)); + for (OCFile file : files) { + if (file.getLastSyncDate() != mCurrentSyncTime && file.getLastSyncDate() != 0) + getStorageManager().removeFile(file); } } catch (OperationCanceledException e) { e.printStackTrace(); @@ -129,11 +138,12 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter { } private OCFile fillOCFile(WebdavEntry we) { - OCFile file = new OCFile(we.path()); + OCFile file = new OCFile(URLDecoder.decode(we.path())); file.setCreationTimestamp(we.createTimestamp()); file.setFileLength(we.contentLength()); file.setMimetype(we.contentType()); file.setModificationTimestamp(we.modifiedTimesamp()); + file.setLastSyncDate(mCurrentSyncTime); return file; }