From: Magnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Date: Tue, 11 Nov 2014 11:49:22 +0000 (+0100)
Subject: merge
X-Git-Tag: oc-android-1.7.0_signed~69^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/437d3315e00d072ff72e23800947abeec2a0fee2?ds=sidebyside;hp=-c

merge
---

437d3315e00d072ff72e23800947abeec2a0fee2
diff --combined owncloud-android-library
index 99f8c869,4f315c7e..d7097983
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 99f8c869702a3261d9868207968700277e208507
 -Subproject commit 4f315c7e06f6eef48df246be0ee9252fdfccdf00
++Subproject commit d7097983594347167b5bde3fa5b2b4ad1d843392
diff --combined src/com/owncloud/android/datamodel/FileDataStorageManager.java
index e7895e49,41a51063..b10e525c
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@@ -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())) {
@@@ -1401,7 -1402,7 +1402,7 @@@
                  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)) {