always show image preview if there is only enough memory

[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 1e1a5e3..d5512a1 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -19,7 +19,6 @@
 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r
 package eu.alefzero.owncloud.syncadapter;\r
 \r
 import java.io.IOException;\r

-import java.net.URLDecoder;\r

 import java.util.Vector;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r
 import java.util.Vector;\r
 \r
 import org.apache.jackrabbit.webdav.DavException;\r


@@ -47,6 +46,8 @@ import eu.alefzero.webdav.WebdavEntry;
  */\r
 public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {\r
 \r
  */\r
 public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {\r
 \r

+    private final static String TAG = "FileSyncAdapter"; \r
+    \r

     private long mCurrentSyncTime;\r
     \r
     public FileSyncAdapter(Context context, boolean autoInitialize) {\r
     private long mCurrentSyncTime;\r
     \r
     public FileSyncAdapter(Context context, boolean autoInitialize) {\r


@@ -63,7 +64,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r
 \r
         this.setStorageManager(new FileDataStorageManager(account,\r
                 getContentProvider()));\r
 \r

-        Log.d("ASD", "syncing owncloud account " + account.name);\r
+        Log.d(TAG, "syncing owncloud account " + account.name);\r

 \r
         Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
         i.putExtra(FileSyncService.IN_PROGRESS, true);\r
 \r
         Intent i = new Intent(FileSyncService.SYNC_MESSAGE);\r
         i.putExtra(FileSyncService.IN_PROGRESS, true);\r


@@ -79,7 +80,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             resp = query.getResponseBodyAsMultiStatus();\r
 \r
             if (resp.getResponses().length > 0) {\r
             resp = query.getResponseBodyAsMultiStatus();\r
 \r
             if (resp.getResponses().length > 0) {\r

-                WebdavEntry we = new WebdavEntry(resp.getResponses()[0]);\r
+                WebdavEntry we = new WebdavEntry(resp.getResponses()[0], getUri().getPath());\r

                 OCFile file = fillOCFile(we);\r
                 file.setParentId(0);\r
                 getStorageManager().saveFile(file);\r
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(0);\r
                 getStorageManager().saveFile(file);\r


@@ -108,7 +109,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
             for (int i = 1; i < resp.getResponses().length; ++i) {\r
             MultiStatus resp = null;\r
             resp = query.getResponseBodyAsMultiStatus();\r
             for (int i = 1; i < resp.getResponses().length; ++i) {\r

-                WebdavEntry we = new WebdavEntry(resp.getResponses()[i]);\r
+                WebdavEntry we = new WebdavEntry(resp.getResponses()[i], getUri().getPath());\r

                 OCFile file = fillOCFile(we);\r
                 file.setParentId(parentId);\r
                 getStorageManager().saveFile(file);\r
                 OCFile file = fillOCFile(we);\r
                 file.setParentId(parentId);\r
                 getStorageManager().saveFile(file);\r


@@ -138,7 +139,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
     }\r
 \r
     private OCFile fillOCFile(WebdavEntry we) {\r
     }\r
 \r
     private OCFile fillOCFile(WebdavEntry we) {\r

-        OCFile file = new OCFile(URLDecoder.decode(we.path()));\r
+        OCFile file = new OCFile(we.path());\r

         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r
         file.setCreationTimestamp(we.createTimestamp());\r
         file.setFileLength(we.contentLength());\r
         file.setMimetype(we.contentType());\r