Skip to content

Fix vanishing images #4647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 1 commit into from
Oct 10, 2019
Merged

Fix vanishing images #4647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,16 @@ public void saveFolder(OCFile folder, Collection<OCFile> updatedFiles, Collectio
ContentValues cv = createContentValueForFile(file, folder);

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
operations.add(ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI)
.withValues(cv)
.withSelection(ProviderTableMeta._ID + "=?", new String[]{String.valueOf(file.getFileId())})
.withSelection(ProviderTableMeta._ID + "=?", new String[]{String.valueOf(fileId)})
.build());
} else {
// adding a new file
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/owncloud/android/operations/RefreshFolderOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,10 @@ private void synchronizeData(List<Object> folderAndFiles) {
// retrieve local data for the read file
localFile = localFilesMap.remove(remoteFile.getRemotePath());

if (localFile == null) {
localFile = mStorageManager.getFileByPath(updatedFile.getRemotePath());
}

// add to updatedFile data about LOCAL STATE (not existing in server)
updatedFile.setLastSyncDateForProperties(mCurrentSyncTime);

Expand Down