Commit graph

909 commits

Author SHA1 Message Date
David A. Velasco
3f4e615d5e Merge branch 'develop' into oc_framework_cleanup_and_documentation 2014-01-20 09:24:44 +01:00
masensio
1d70ae81ea OC-2640: Fix Bug: Log in screen disappear when trying to log in again with the same user 2014-01-17 15:12:12 +01:00
masensio
10dac35232 OC-2633: Fixes for comments in code. PR #347 2014-01-17 14:20:00 +01:00
David A. Velasco
af6815a14b Fixed DownloadRemoteOperation to use real total transfer size and to simplify constructor 2014-01-15 11:48:10 +01:00
masensio
ea18765828 OC-2465: review code 2014-01-15 10:52:06 +01:00
David A. Velasco
690c1bf128 Removed unused methoed OnDatatransferProgressListener#onTransferProgress(long) 2014-01-15 10:41:37 +01:00
masensio
8f0128cbab OC-2541: Adapt the code the new saml implementation. Get the username from OCS-API 2014-01-14 11:06:03 +01:00
masensio
fe6ab707e4 OC-2465: Move getUserNameForSamlSso to AccountUtils in oc_framework 2014-01-09 11:07:54 +01:00
masensio
f4dc4e45f8 Merge branch 'develop' into refactor_remote_saml_authentication 2014-01-09 10:04:04 +01:00
masensio
c535af9942 OC-2465: Move SsoWebViewClient to oc_framework 2014-01-09 10:01:54 +01:00
David A. Velasco
56fa4445e8 Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
Fixed pincode request in instant uploads
2014-01-08 09:12:06 -08:00
David A. Velasco
70e6c2136a Replaced last call to PropFindMethod in app with ReadRemoteFileOperation 2014-01-08 17:58:04 +01:00
masensio
5bab662e90 OC-2461: Fix bug: After insert the pincode, if the device is rotate the pincode is asked again 2014-01-08 13:02:16 +01:00
masensio
bcc972d63d OC-2459: Ask for pincode, when click on an instant upload notification 2014-01-08 11:11:19 +01:00
masensio
5dc172cd6c OC-2397: Fix bug in read file: File doesn't refresh when you select to refresh after change it 2014-01-07 13:10:53 +01:00
masensio
44e3288168 Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
	src/com/owncloud/android/utils/FileStorageUtils.java
2014-01-07 10:16:39 +01:00
masensio
842c08954b Clean some import warnings 2013-12-19 09:30:27 +01:00
masensio
685c26589b Changes from comments in PR #337 2013-12-19 09:24:28 +01:00
masensio
71430eb7b1 Merge branch 'develop' into refactor_remote_operation_to_download_file
Conflicts:
	oc_framework-test-project/AndroidManifest.xml
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
2013-12-18 10:04:42 +01:00
masensio
64ddaf8d9a OC-2333: Complete Unit Tests 2013-12-18 09:02:56 +01:00
masensio
772721ab9a OC-2397: Fix bug: file doesn't refresh wwhen you select to refresh after change it 2013-12-16 15:09:27 +01:00
masensio
8215c5cc96 Merge branch 'develop' into refactor_remote_operation_to_upload_file
Conflicts:
	src/com/owncloud/android/files/services/FileUploader.java
2013-12-16 13:26:45 +01:00
masensio
07b82ef42f Merge branch 'develop' into refactor_remote_operation_to_read_file 2013-12-16 10:52:48 +01:00
masensio
e76d4b00ef OC-2388: Move ChunkedUploadFileOperation to the framework. UploadFileOperation select operation with or without chunks 2013-12-16 10:46:29 +01:00
David A. Velasco
415c3867c4 Fixed propagation of download progress to download notifications 2013-12-13 12:34:43 +01:00
David A. Velasco
f33e416bf3 File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0 2013-12-12 17:25:54 +01:00
David A. Velasco
7392b6e62e Added seasonal icon for winter holidays 2013-12-12 17:25:53 +01:00
masensio
dc1ea137a2 OC-2332: Isolate code to the upload a file to remove local dependences 2013-12-12 14:44:33 +01:00
masensio
d38a69abc1 OC-2332: rewrite getAvailableRemotePath from UpdateFileOperation, using ExistenceCeheckRemoteOperation instead of WebClient#existsFile 2013-12-12 12:37:36 +01:00
masensio
2246c27a8b OC-2332: Move ExistenceCheckOperation to the framework. New UpdateRemoteFileOperation class 2013-12-12 10:48:06 +01:00
David A. Velasco
e6bc38eaac File with just one chunk use the old non-chunked interface, so that they work in all the servers under 6.0 2013-12-11 18:48:56 +01:00
masensio
6846e76912 OC-2327: Isolate the code for Download a file 2013-12-10 13:43:44 +01:00
David A. Velasco
dae42a11b4 Added seasonal icon for winter holidays 2013-12-10 13:41:47 +01:00
masensio
c344de7b81 Remove fillOcFile from SyncronizeFolderOperation 2013-12-04 10:29:10 +01:00
masensio
39c2fffbfe Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java
	oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java
	oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
2013-12-02 12:40:29 +01:00
masensio
26f68e0eac OC-2280: Isolate the code for ReadFile (PROPFIND 0) to remove local dependences 2013-11-29 14:16:21 +01:00
David A. Velasco
f0dd05ddc4 Merge getFile and getData methods of RemoteOperationResult in a single one 2013-11-29 10:30:53 +01:00
masensio
9a8b89bea1 OC-2256: Adapt Unit Test to the new result 2013-11-28 13:33:05 +01:00
masensio
007ca522ec OC-2256: New RemoteFile class 2013-11-28 13:03:33 +01:00
masensio
5aaa4e10e8 Merge branch 'develop' into refactor_remote_operation_to_read_folder
Conflicts:
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
2013-11-27 14:50:16 +01:00
David A. Velasco
e1e2f547c5 Refactored local deletion to unify through FileDataStorageManager 2013-11-27 09:44:54 +01:00
David A. Velasco
35602ae668 Removed unneeded comments 2013-11-27 09:21:20 +01:00
masensio
526a42a11b OC-2202: Change old Read method by new ReadRemoteFileOperation 2013-11-25 14:50:16 +01:00
masensio
9809c0d3db OC-2164: Isolate code from RemoveFileOperation. Include new RemoveRemoteFileOperation in library 2013-11-22 13:30:09 +01:00
David A. Velasco
04327e1f16 Small tweaks in rename operation 2013-11-19 12:11:07 +01:00
masensio
0b95d61cec OC-2115: Validate Path in RenameRemoteFileOperation 2013-11-19 09:07:11 +01:00
masensio
515ec5e8dd t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder
Conflicts:
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
	oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
2013-11-18 14:42:07 +01:00
David A. Velasco
e1245bbda7 Merge branch 'develop' into refactor_remote_operation_to_create_folder 2013-11-18 14:10:16 +01:00
David A. Velasco
73849d822d Add check of characters in file name before starting rename/createFolder operations 2013-11-18 14:10:11 +01:00
masensio
4a4d78821a OC-2107: Change validation name method: ValidateName and ValidatePath 2013-11-18 13:41:47 +01:00