Synchronize kept-in-sync files during account synchronization, in both directions...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 16 Nov 2012 15:23:45 +0000 (16:23 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 16 Nov 2012 15:23:45 +0000 (16:23 +0100)
commitc301865c351da2c46c82cca268c0d7e32bc2fd83
tree120b9ed6206e52ed66c463f1f619a9be0799ad9d
parent3defb175cb59ae3158f92347a8045f198e3208c7
Synchronize kept-in-sync files during account synchronization, in both directions and considering conflicts
res/values/strings.xml
src/com/owncloud/android/files/OwnCloudFileObserver.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileObserverService.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/operations/UpdateOCVersionOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java