mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4647 from nextcloud/fixVanishingImages

Browse source 
Fix vanishing images
This commit is contained in:
Andy Scherzinger 2019-10-10 13:56:29 +02:00 committed by GitHub
commit af7bf9b2f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -343,10 +343,16 @@ public class FileDataStorageManager {
ContentValues cv = createContentValueForFile(file, folder); ContentValues cv = createContentValueForFile(file, folder);
if (fileExists(file.getFileId()) || fileExists(file.getRemotePath())) { if (fileExists(file.getFileId()) || fileExists(file.getRemotePath())) {
long fileId;
if (file.getFileId() != -1) {
fileId = file.getFileId();
} else {
fileId = getFileByPath(file.getRemotePath()).getFileId();
}
// updating an existing file // updating an existing file
operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI) operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI)
.withValues(cv) .withValues(cv)
.withSelection(ProviderTableMeta._ID + "=?", new String[]{String.valueOf(file.getFileId())}) .withSelection(ProviderTableMeta._ID + "=?", new String[]{String.valueOf(fileId)})
.build()); .build());
} else { } else {
// adding a new file // adding a new file

4
src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
View file

@ -416,6 +416,10 @@ public class RefreshFolderOperation extends RemoteOperation {
// retrieve local data for the read file // retrieve local data for the read file
localFile = localFilesMap.remove(remoteFile.getRemotePath()); localFile = localFilesMap.remove(remoteFile.getRemotePath());
if (localFile == null) {
localFile = mStorageManager.getFileByPath(updatedFile.getRemotePath());
}
// add to updatedFile data about LOCAL STATE (not existing in server) // add to updatedFile data about LOCAL STATE (not existing in server)
updatedFile.setLastSyncDateForProperties(mCurrentSyncTime); updatedFile.setLastSyncDateForProperties(mCurrentSyncTime);