Merge branch 'share_link__unshare_file' into wide_scope_library_clean_up
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 17 Feb 2014 12:01:55 +0000 (13:01 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 17 Feb 2014 12:01:55 +0000 (13:01 +0100)
commit9e0f02131f17a2494d84886570617fd0dddb3530
tree3c3534717b92480b621faeed75078a235f8df7d9
parent7391fd5e5fb12a82e93d33df2f57b910ddec7aa1
parent4cc578faf9cfd7f32153549ce45b3acf7d563e5b
Merge branch 'share_link__unshare_file' into wide_scope_library_clean_up
15 files changed:
src/com/owncloud/android/datamodel/FileDataStorageManager.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/services/FileDownloader.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/CreateShareOperation.java
src/com/owncloud/android/operations/GetSharesOperation.java
src/com/owncloud/android/operations/UnshareLinkOperation.java
src/com/owncloud/android/services/OperationsService.java
src/com/owncloud/android/ui/activity/FileActivity.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewImageActivity.java
src/com/owncloud/android/ui/preview/PreviewImageFragment.java
src/com/owncloud/android/ui/preview/PreviewMediaFragment.java