Fixed 'keep both' action in conflicts dialog (both resulting file were linked to...
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 20 Nov 2012 13:12:32 +0000 (14:12 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 20 Nov 2012 13:12:32 +0000 (14:12 +0100)
commit195b0092129ba4e38c6bb7981022a63c7a0cdfc4
tree6c810c6b59cfa85b2d3b2f0af11d4fb91186eb45
parent69ac5b6bfb63327e64edc718bdcd9a5f2c7c161b
Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device)
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java