Persist conflicts in local database and show with an icon in the list of files
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 20 Aug 2015 08:44:19 +0000 (10:44 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 25 Sep 2015 13:13:46 +0000 (15:13 +0200)
commite6c1454458419ff0c47c64fac3d11ebc158cccc8
tree018da21ebb3bbf5b1408fc16a254da249a2563fb
parent5f41bb14d370e0c9c0a8003e4ed122f466b0ce71
Persist conflicts in local database and show with an icon in the list of files
res/drawable/conflict_file_indicator.png [new file with mode: 0644]
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/operations/RefreshFolderOperation.java
src/com/owncloud/android/operations/SynchronizeFileOperation.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/providers/FileContentProvider.java
src/com/owncloud/android/ui/adapter/FileListListAdapter.java