mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 17:46:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed wrong conflict badge after resolving conflict with 'Keep both'

Browse source
This commit is contained in:
David A. Velasco 2016-04-18 13:49:11 +02:00 committed by Juan Carlos González Cabrero
parent bd96e2c9ce
commit a97b6ca88f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/owncloud/android/operations/UploadFileOperation.java
View file

@ -765,8 +765,8 @@ public class UploadFileOperation extends SyncOperation {
}
if (mWasRenamed) {
OCFile oldFile = mOldFile;
if (oldFile.fileExists()) {
OCFile oldFile = getStorageManager().getFileByPath(mOldFile.getRemotePath());
if (oldFile != null) {
oldFile.setStoragePath(null);
getStorageManager().saveFile(oldFile);
getStorageManager().saveConflict(oldFile, null);