merge
authorMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Tue, 11 Nov 2014 11:49:22 +0000 (12:49 +0100)
committerMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Tue, 11 Nov 2014 11:49:22 +0000 (12:49 +0100)
1  2 
owncloud-android-library
src/com/owncloud/android/datamodel/FileDataStorageManager.java

diff --combined owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 99f8c869702a3261d9868207968700277e208507
 -Subproject commit 4f315c7e06f6eef48df246be0ee9252fdfccdf00
++Subproject commit d7097983594347167b5bde3fa5b2b4ad1d843392
@@@ -300,6 -300,7 +300,7 @@@ public class FileDataStorageManager 
              cv.put(ProviderTableMeta.FILE_PUBLIC_LINK, file.getPublicLink());
              cv.put(ProviderTableMeta.FILE_PERMISSIONS, file.getPermissions());
              cv.put(ProviderTableMeta.FILE_REMOTE_ID, file.getRemoteId());
+             cv.put(ProviderTableMeta.FILE_UPDATE_THUMBNAIL, file.needsUpdateThumbnail());
  
              boolean existsByPath = fileExists(file.getRemotePath());
              if (existsByPath || fileExists(file.getFileId())) {
                  path = path + FileUtils.PATH_SEPARATOR;
              }           
  
 -            // Update OCFile with data from share: ShareByLink  ¿and publicLink?
 +            // Update OCFile with data from share: ShareByLink  and publicLink
              OCFile file = getFileByPath(path);
              if (file != null) {
                  if (share.getShareType().equals(ShareType.PUBLIC_LINK)) {