Commit graph

64 commits

Author SHA1 Message Date
masensio
d3e0c5c6ce OC-2465: Delete a log line in SsoWebViewClient 2014-01-14 11:37:10 +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
ddce8f769a OC-2541: Add GetUserNameRemoteOperation to get userName from API (JSON). 2014-01-13 11:43:49 +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
masensio
e6e86b60c5 Merge remote-tracking branch 'origin/refactor_remote_operation_to_read_file' into refactor_remote_operation_to_read_file 2014-01-07 10:18:02 +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
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
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
35c5a260e2 Merge branch 'develop' into refactor_remote_operation_to_read_file 2013-12-13 09:45:40 +01:00
Luke Owncloud
dba07da921 made oc_framework a mvn project
updated compile instructions for mvn

oc_framework is a standalone mvn project which must be installed.
if anyone knows how to make oc_framework a submodule without changing the directory structure ... please do it!
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
David A. Velasco
f36d87eca2 Fixes in coments 2013-12-12 14:22:13 +01:00
masensio
2246c27a8b OC-2332: Move ExistenceCheckOperation to the framework. New UpdateRemoteFileOperation class 2013-12-12 10:48:06 +01:00
Luke Owncloud
af77468dbc made oc_framework a mvn project
updated compile instructions for mvn

oc_framework is a standalone mvn project which must be installed.
if anyone knows how to make oc_framework a submodule without changing the directory structure ... please do it!
2013-12-11 13:55:34 +01:00
masensio
6846e76912 OC-2327: Isolate the code for Download a file 2013-12-10 13:43:44 +01:00
masensio
8214aaeb6d Merge branch 'develop' into refactor_remote_operation_to_download_file 2013-12-05 17:37:40 +01:00
masensio
f0c6898aa7 OC-2327. New class DownloadRemoteFileOperation 2013-12-05 17:33:52 +01:00
David A. Velasco
04e2434aff Merge branch 'develop' into sni_support_based_on_network_implementation_built_in 2013-12-02 13:44:08 +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
eb02400aa5 Added license notice to new classes 2013-11-29 10:34:19 +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
d74d2c7800 Update classpath: remove jackrabbit library in .classpath of oc_framework 2013-11-28 14:26:51 +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
3746ff540b Removed absolute path in exported dependencies 2013-11-27 09:19:19 +01:00
masensio
526a42a11b OC-2202: Change old Read method by new ReadRemoteFileOperation 2013-11-25 14:50:16 +01:00
David A. Velasco
7ed9f29973 Enable Server Name Indication in HTTPS connections if available in the network implementation under the API 2013-11-25 14:43:03 +01:00
masensio
ce9084b6b3 OC-2171: Isolate code for ReadRemoteFileOperation - PROPFIND DEPTH 1 2013-11-25 13:03:39 +01:00
masensio
afebd9625e OC-2168: Add new class REadRemoteFileOperation to library 2013-11-22 14:51:01 +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
David A. Velasco
f6ac875ce5 Merge branch 'develop' into refactor_remote_operation_to_rename_folder 2013-11-19 11:25:30 +01:00
David A. Velasco
32c1217d5a Added empty resources file to avoid conspiracy of git and Android tools to break compilation 2013-11-19 09:39:08 +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
3cd9b0dc1c Merge remote-tracking branch 'origin/refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_create_folder 2013-11-18 14:24:04 +01:00
masensio
eec99ea7d8 Change from PR comments. Creation of WebDavClient with AsynTask in UnitTest 2013-11-18 14:20:30 +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
masensio
f780062616 FIX OC-2101: App crash when renaming a folder while the server is down or without internet connection 2013-11-18 12:07:54 +01:00
masensio
7a1c3be1cb OC-2097:Fix init test. Fix classpath of oc-test 2013-11-15 14:51:49 +01:00
masensio
6e092bf235 OC-1991: Add more cases in rename file / folder tests 2013-11-15 14:41:06 +01:00
masensio
af0b050668 OC-1991: Create Unit Tests for Rename File and Folder 2013-11-15 13:43:45 +01:00
masensio
b9808f6938 OC-1990: Isolate code from RenameFileOperation to remove dependecies on local storage. Filter invalid characters in fileName 2013-11-14 17:44:23 +01:00