mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 16:24:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
3052 commits 220 branches 1588 tags 639 MiB
Commit graph

1776 commits

Author SHA1 Message Date
tobiasKaminsky
04b77aa2f4 rebased 
footer view disabled due to GridView does not support it
 2015-01-19 22:10:29 +01:00
tobiasKaminsky
d4e0f3bdb1 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-19 21:02:37 +01:00
jabarros
115268008e Increase db number and added getters and setter for new 'uploading' and 'downloading' fields in OCFile 2015-01-19 14:41:34 +01:00
David A. Velasco
b6e4f0f4ae Merge pull request #798 from LukeOwncloud/develop 
On downgrading upload db, delete and re-create
 2015-01-19 13:44:30 +01:00
jabarros
3515ab160c Added uploading and downloading fields into filelist table 2015-01-19 13:10:21 +01:00
jabarros
e98fc8b141 Merge branch 'develop' into download_folder 2015-01-19 12:49:28 +01:00
jabarros
6022456fd5 Trigger Media Scan on parent folder when deleting a file or a folder from locally 2015-01-19 10:39:23 +01:00
tobiasKaminsky
6d5c6f86e5 Merge branch 'develop2' into imageGrid2 
Conflicts:
	owncloud-android-library
	res/layout/list_fragment.xml
	res/values-fr/strings.xml
	src/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
	src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2015-01-18 17:00:29 +01:00
David A. Velasco
2275f2eca4 Move every sendBroadcast from SynchronizeFolderOperation to SyncFolderHandler scope 2015-01-13 20:07:43 +01:00
jabarros
6c70154a50 Merge branch 'develop' into thumbnailForUpload 2015-01-12 14:30:06 +01:00
jabarros
b7e80e6ace Other minor changes after CR 2015-01-12 14:17:29 +01:00
David A. Velasco
5ee9c129a9 Fixed stuck 'downloading' icon in download of folders 2015-01-12 13:51:30 +01:00
jabarros
5d228838e2 Changes after CR 2015-01-12 12:52:40 +01:00
David A. Velasco
76904d2c8e Fix on search of operation to cancel 2015-01-12 10:43:40 +01:00
jabarros
6fee98e6a4 Fix. Subfolders are not cancelled correctly 2015-01-09 15:16:52 +01:00
jabarros
cc15321173 Fixed. In the upload view, videos does not have the correct icon 2015-01-09 09:46:43 +01:00
David A. Velasco
74d4f5302e Fixed icon for MIME type application/javascript 2015-01-09 09:44:02 +01:00
David A. Velasco
1975f9e776 Aesthetic fixes 2015-01-08 16:56:21 +01:00
David A. Velasco
cb5f8b3fcd Considered MIME types for .py, .js, and fixed .xls, .ppt, and some clean-up 2015-01-08 16:43:25 +01:00
jabarros
e6fc5d13ad Notify the download cancelation for updating the screen and remove the yellow arrow that continues being shown after the cancel 2015-01-08 15:02:42 +01:00
jabarros
737381eaad Fix for downloads that are not cancelled 2015-01-08 14:59:27 +01:00
jabarros
46d045fd62 Merge branch 'download_folder' into download_folder__fixing_recursive_cancellation 2015-01-08 14:26:38 +01:00
David A. Velasco
643162cac9 Consider application/xml for XML files 2015-01-08 10:55:42 +01:00
David A. Velasco
8da1926f02 Merge pull request #820 from owncloud/obeySortOrder_fixmerge 
Obey sort order in gallery of images.
 2015-01-08 09:08:42 +01:00
David A. Velasco
14bbe5bf01 First try 2015-01-07 18:23:53 +01:00
jabarros
d05d5ffe1a Merge branch 'develop' into download_folder 2015-01-07 14:04:46 +01:00
jabarros
f737785b4f Change error message when trying download a folder that does not exist 2015-01-07 13:47:38 +01:00
jabarros
90e49a96e4 Added folder name to 'file not found' error message 2015-01-07 13:04:46 +01:00
jabarros
1db11eb586 Fix. App does not realize that the folder does not exist 2015-01-07 11:22:24 +01:00
jabarros
fa159e4891 Fix. Some icons are not correct. Showed default file icon when there is not mimetype 2014-12-31 14:25:24 +01:00
jabarros
61b267d309 Fix. App does not realize that the folder does not exits when traying to download a folder 2014-12-31 13:48:36 +01:00
jabarros
6caad2be05 Fixed. Icons which have extensions in UpperCase, in the uploads view are not correct 2014-12-30 11:55:13 +01:00
tobiasKaminsky
0e061f6f06 - fix #47 2014-12-29 22:36:15 +01:00
jabarros
cd1a150bf9 Create getThumbnailDimension and add some comments 2014-12-29 17:06:33 +01:00
jabarros
fe5c6b6542 Refactor ThumbnailsCacheManager to reduce repeated code 2014-12-29 14:54:45 +01:00
jabarros
2319a52bab Merge branch 'develop' into thumbnailForUpload 2014-12-29 09:27:50 +01:00
jabarros
0d6320aa79 Move isImage method to BitmapUtils class 2014-12-29 09:26:44 +01:00
jabarros
da87634804 Merge branch 'develop' into rename_with_special_character 2014-12-26 14:27:52 +01:00
jabarros
4257aa1d9c Merge branch 'develop' into obeySortOrder_fixmerge 2014-12-26 11:10:22 +01:00
jabarros
0b7c37671f Merge pull request #755 from owncloud/OpenWithInContextMenu 
"open with" in ContextMenu of downloaded files
 2014-12-26 09:13:58 +01:00
jabarros
f0905fbaac Merge pull request #784 from ekeitho/develop 
subject mail populated when user shares >>file/folder<<
 2014-12-26 09:04:02 +01:00
Keith Abdulla
1db0d7daf2 create an extra string resource 2014-12-23 09:31:59 -08:00
jabarros
1cc6d8c612 Fixed. Yellow arrow is not gone when there is not something to download 2014-12-23 09:15:59 +01:00
Keith Abdulla
38d0a19307 fix string format and context method 2014-12-19 20:11:25 -08:00
David A. Velasco
981d4580cf Merge pull request #718 from owncloudChalmers/multi2 
Multiselect functionalty targeting https://github.com/owncloud/android/issues/596
 2014-12-19 12:56:14 +01:00
jabarros
6e3d3cd016 Merge branch 'develop' into thumbnailForUpload 2014-12-19 10:58:08 +01:00
tobiasKaminsky
e23fa3acaa renamed sortDirectory to sortFolder 2014-12-18 21:19:39 +01:00
jabarros
ec820a29ac Removed specific check for character '%' when renaming a folder 2014-12-17 13:36:38 +01:00
David A. Velasco
f382ae73e3 Removed unneeded logs 2014-12-17 12:54:45 +01:00
David A. Velasco
cc77ea37de Added cancellation checks in SynchronizeFolderOperation before every RemoteOperation execution 2014-12-17 11:10:53 +01:00
jabarros
732ab432a4 Merge pull request #812 from owncloud/download_folder__update_contextual_menu_asap 
Allow cancelling download of folders as soon as the SynchronizeFolderOpe...
 2014-12-17 09:47:18 +01:00
David A. Velasco
1d0f705509 Allow cancelling download of folders as soon as the SynchronizeFolderOperation is in the OperationsService 2014-12-17 09:32:13 +01:00
jabarros
98929a9c8f Merge branch 'download_folder' into download_folder_cancel_downloads 2014-12-16 15:04:39 +01:00
jabarros
f22693cd4e Added cancelation for each synchronizeFolderOperation when canceling download folder 2014-12-16 14:28:36 +01:00
jabarros
0c8d508a61 Run folder download cancelation in new thread 2014-12-16 14:15:46 +01:00
jabarros
cec7baba5b 'Cancel folder download' cancels downloads of files already in the FileDownloadService 2014-12-16 14:02:23 +01:00
David A. Velasco
727a941b3c Show the download-in-progress icon in the folder as soon as the SynchronizeFolderOperation is created 2014-12-16 10:42:55 +01:00
jabarros
5a4b0731f0 Merge pull request #806 from owncloud/download_folder__clean_SynchronizeFolderOperation 
Clean SynchronizeFolderOperation
 2014-12-15 15:01:55 +01:00
David A. Velasco
e650fd2c6f Avoid unneeded parameter 2014-12-15 14:46:52 +01:00
David A. Velasco
46b5e21ef5 Merge pull request #801 from owncloud/community_image-preview-save-position 
Restore the current image when the preview activity is hidden
 2014-12-15 10:22:10 +01:00
David A. Velasco
407a31b3ca Merge pull request #805 from owncloud/download_folder_cancel_menu_option 
Show 'cancel download' option in folder actions menu when folder is bein...
 2014-12-15 09:57:27 +01:00
David A. Velasco
e409b5afb6 Fixed a couple of null pointers 2014-12-12 13:30:55 +01:00
David A. Velasco
399251bc5a Optimize operation flow 2014-12-12 13:06:12 +01:00
David A. Velasco
ddac353a0a Delay load of cached information about folder (mLocalFolder) until the operation is really run 2014-12-12 12:57:53 +01:00
jabarros
bbf85d96de Show 'cancel download' option in folder actions menu when folder is being downloaded 2014-12-12 12:02:01 +01:00
jabarros
0be6894ec3 Changes after CR 2014-12-12 10:40:13 +01:00
jabarros
4e2f886b44 Merge pull request #766 from owncloud/feedbackWithVersionNumber 
Email from feedback contains version number
 2014-12-12 10:05:49 +01:00
jabarros
a6a010440d Added some fixes in OperationsService 2014-12-12 09:16:32 +01:00
jabarros
407f64f5e0 Update OperationsService to receive requests for cancelling downloads (WIP) 2014-12-11 18:44:29 +01:00
jabarros
f6f1c7e629 Add call to OperationService for canceling transference of downloading a folder 2014-12-11 18:18:23 +01:00
jabarros
8fc865ea76 Merge branch 'develop' into community_image-preview-save-position 2014-12-11 10:23:03 +01:00
David A. Velasco
1f796350b0 Merge pull request #781 from owncloud/fix_logs_change_orientation 
User chooser for sending mail in LogHistory (with crash fixed if device is rotated in the e-mail app)
 2014-12-11 10:21:41 +01:00
jabarros
92e8194f18 Merge branch 'develop' into community_rotateImage 2014-12-11 08:51:31 +01:00
Luke Owncloud
1077a6de29 on downgrading upload db, delete and re-create 2014-12-11 08:32:38 +01:00
David A. Velasco
eab9d689c5 Fixed compilation error 2014-12-10 18:52:57 +01:00
David A. Velasco
11f6daf403 Fixed access to storage manager in SynchronizeFolderOperation 2014-12-10 18:31:26 +01:00
David A. Velasco
b309cafc15 Refactored OperationsService to hold two separated Handlers in two separated worker threads, one for SyncFolder, one for the rest 2014-12-10 18:30:05 +01:00
David A. Velasco
56eaed4529 Added construction of SynchronizeFolderOperation to OperationService 2014-12-10 18:28:43 +01:00
jabarros
d564ef443c Resolve recursion on new SyncFolderOperation creating new instances of SynFolderOperation and running them 2014-12-10 16:23:46 +01:00
jabarros
c34646aed3 Merge branch 'fix_protocol_send_mail' into fix_logs_change_orientation 2014-12-10 14:13:32 +01:00
David A. Velasco
154188c38f Hurry up release of source bitmap in rotations 2014-12-10 12:48:31 +01:00
David A. Velasco
77554b2b51 Cancel load task when fragment becomes invisible (fixes crash in rotations) 2014-12-10 12:46:34 +01:00
jabarros
f533fa8205 Merge pull request #794 from owncloud/download_folder__add_download_to_operationService 
Updated OperationService to attend requests for FileSyncFolderOperations...
 2014-12-10 11:03:43 +01:00
jabarros
114b07fe2c Changes after CR 2014-12-10 10:06:10 +01:00
David A. Velasco
b0278c232e Updated OperationService to attend requests for FileSyncFolderOperations without a Binder in the caller Context 2014-12-10 09:39:52 +01:00
jabarros
0df8f178de Merge pull request #754 from owncloud/RadioListOnAccounts 
Account list is now a radiobutton list
 2014-12-10 08:45:12 +01:00
Keith Abdulla
1704c4f788 move subject message strings into strings.xml 2014-12-09 17:51:10 -08:00
jabarros
6ccf48b337 Request the download of all the files in a folder (non recursively) 2014-12-09 11:18:57 +01:00
jabarros
ee688193df Create new SyncFolderOperation 2014-12-09 10:55:17 +01:00
jabarros
1e847c4ac8 Rename SynchronizeFolderOperation to RefreshFolderOperation and update references 2014-12-09 10:54:18 +01:00
David A. Velasco
34433e924d Merge remote-tracking branch 'rhabbachi/feature/308_sync_folder' into download_folder 2014-12-09 10:39:14 +01:00
Keith Abdulla
4957791128 subject mail populated when user shares file/folder 2014-12-06 02:07:35 -08:00
jabarros
700d444977 Fix. Avoid load logs again when changing device orientation 2014-12-05 14:33:04 +01:00
jabarros
766b51f497 Remove unused imports and split long lines modified 2014-12-05 10:12:57 +01:00
Sam
c8af196f2a Merge branch 'develop' of https://github.com/owncloud/android into multi2 2014-12-05 10:07:48 +01:00
jabarros
7d0723261a Fixed. App crashes when previewing an image 2014-12-05 09:33:34 +01:00
David A. Velasco
50e39f044f Merge branch 'master' into develop 2014-12-03 11:31:49 +01:00
jabarros
d58d6ca4d0 Merge pull request #773 from owncloud/triggerMediaScan 
Trigger media scan
 2014-12-03 10:10:26 +01:00
Sam
382191d1f9 Merged with owncloud develop 2014-12-03 10:04:39 +01:00
David A. Velasco
f139a7204d Removed empty method, and some unused imports 2014-12-03 09:41:49 +01:00