Fix Select Local Version or Keep Both behaviour when solving file coflict
authormasensio <masensio@solidgear.es>
Tue, 27 Oct 2015 13:32:42 +0000 (14:32 +0100)
committermasensio <masensio@solidgear.es>
Tue, 27 Oct 2015 13:32:42 +0000 (14:32 +0100)
commitbcfa07f565b675143b70e665aa7bed896e642364
tree614832b434861dd62dce458efefd0e156bd14e1c
parentb9ef747a0be9e50d50b709474daf9dca47d60f5f
Fix Select Local Version or Keep Both behaviour when solving file coflict
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/RefreshFolderOperation.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/providers/FileContentProvider.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java