Commit graph

686 commits

Author SHA1 Message Date
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
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
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
David A. Velasco
bd90abedfb Improved reaction when events about kept-in-sync files are received 2013-11-14 17:24:54 +01:00
masensio
f299079851 Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder
Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
2013-11-14 17:23:25 +01:00
masensio
15442976fe Fix, creation of subdirectories 2013-11-14 17:18:33 +01:00
masensio
9b79ed71c3 OC-1990: Isolate code RenameRemoteFileOperation 2013-11-14 17:02:38 +01:00
masensio
3ee1c51039 OC-2067: Adapt CreateRemoteFolderOperation, new class FileUtils.java. Try to create folder with invalid characters return an error message 2013-11-14 09:27:34 +01:00
David A. Velasco
79ebc75dfa Moved some classes from root package to .utils 2013-11-13 11:17:30 +01:00
David A. Velasco
44ffdc3fb1 Merge branch 'develop' into refactor_remote_operation_to_create_folder 2013-11-13 09:44:25 +01:00
David A. Velasco
da7ea9b8d9 Fixed initialization of database tracking pending instant uploads 2013-11-13 09:33:19 +01:00
David A. Velasco
89b37b7508 Merge branch 'develop' into refactor_remote_operation_to_create_folder 2013-11-12 15:22:36 +01:00
David A. Velasco
6da5d3c212 Refactored to build ownCloud app with oc_framework as dependency 2013-11-12 14:50:44 +01:00
David A. Velasco
cc39a76a90 Reviewed integration with sychronization framework to fix problems in Android 4.4 2013-11-11 10:08:16 +01:00
David A. Velasco
f51b688ff4 Removed requests for synchronization of account when account is changed or created 2013-11-08 14:01:34 +01:00
masensio
2be23eaec5 OC-1867: Remove package eu.alefzero.webdav 2013-11-06 18:01:31 +01:00
masensio
112b44188e OC-1865: Isolate code from CreateFolderOperation to remove dependencies on local storage 2013-11-06 17:55:11 +01:00
David A. Velasco
a0efedc99d Merge branch 'develop' into setup_buttons 2013-11-06 11:43:22 +01:00
David A. Velasco
850a3dd09a Let setting up the visibility of the link for new users in the login view 2013-11-06 11:30:15 +01:00
David A. Velasco
d252a09f53 Merge branch 'develop' into setup_buttons 2013-11-06 10:36:34 +01:00
masensio
67a7d8a303 OC-1866: new class com.owncloud.android.operations.remote.CreateRemoteFolderOperation 2013-11-05 14:52:49 +01:00
masensio
4849affc6f Update image buttons and remove CustomButton class 2013-10-30 17:29:22 +01:00
masensio
920b6f4ecc Update preferences and style 2013-10-30 10:30:48 +01:00
masensio
c2abbaaedb Merge branch 'develop' into setup_buttons 2013-10-29 14:13:24 +01:00
masensio
6ace8ab1c1 Update packageName 2013-10-29 14:10:42 +01:00
David A. Velasco
4160e7e256 Merge branch 'develop' into clean_up 2013-10-28 10:11:40 +01:00
masensio
7656cff3bb Update package name 2013-10-24 18:12:00 +02:00
David A. Velasco
e16f63591d Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-24 16:31:56 +02:00
David A. Velasco
b919ef8438 Reset in policy of synchronization for full account: etag is ignored to decide if sync children folders 2013-10-24 12:47:21 +02:00
David A. Velasco
7eb82162b1 A new patch for concurrency in SynchronizeFolderOperations 2013-10-24 09:39:11 +02:00
David A. Velasco
d0c9ad1091 Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects 2013-10-23 18:50:30 +02:00
David A. Velasco
69945d50fb Fixed bug in access to SYNC_MESSAGE identifier for building broadcast intents in SyncFolderOperation, and added static to remove unnecessary service objects 2013-10-23 18:44:20 +02:00
David A. Velasco
db87c22150 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-23 17:35:07 +02:00
David A. Velasco
528db9b192 Removed unused menu a preference resources, and related code 2013-10-23 16:42:48 +02:00
David A. Velasco
f88f81e906 Replace 'ownCloud' with reference to app_name 2013-10-23 12:54:49 +02:00
David A. Velasco
d2b61f546d Replace 'ownCloud' with reference to app_name 2013-10-23 12:48:55 +02:00
David A. Velasco
5d6ba2495a Removed unused code for ownCloud extensions and strings related 2013-10-23 11:15:44 +02:00
David A. Velasco
84831fb1c8 Removed more code and string about unused location tracking 2013-10-23 11:09:59 +02:00
David A. Velasco
79aeef21a6 Removed unused code for tracking and related strings 2013-10-23 10:56:24 +02:00
David A. Velasco
fbcd392251 Removed unused landing page and strings related 2013-10-23 10:46:29 +02:00
David A. Velasco
f79e2c0430 Merge pull request #284 from owncloud/setup_app_name
Setup app name, optional settings, and availability of multiple accounts.
2013-10-22 05:15:21 -07:00
David A. Velasco
9d490aaab2 Grant consistency of size of folders with every update operation 2013-10-22 12:48:58 +02:00
masensio
017f9429c8 Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
2013-10-22 10:22:18 +02:00
masensio
673c884752 OC-1770: When deleting the account, log in screen is not shown 2013-10-22 10:17:09 +02:00
David A. Velasco
9060663f66 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-22 08:26:40 +02:00
David A. Velasco
bb45503376 Trigger synchronization of current folder when the app is started or the current account changed 2013-10-21 13:27:33 +02:00
David A. Velasco
5b6475cc84 Keep saved the calculated size of child-folders when a folders is refreshed 2013-10-21 12:14:44 +02:00
David A. Velasco
e0dc1134f8 Check changes in eTag of folders BEFORE requesting their list of contents 2013-10-21 10:51:58 +02:00
David A. Velasco
966daf3b9e Enforced check of local modification date when synchronizing file contents to avoid problems with apps triggering a wrong FileObserver#CLOSE_WRITE event 2013-10-18 13:24:56 +02:00
David A. Velasco
e3be4babaf Disable eTag as a criteria for synchronization of file contents 2013-10-18 13:16:26 +02:00
masensio
b66e309dfa Merge branch 'contact_settings' into setup_app_name
Conflicts:
	res/values/setup.xml
2013-10-18 12:42:00 +02:00
masensio
31f6e61f89 Merge branch 'setup_multiaccount' into setup_app_name
Conflicts:
	res/values/setup.xml
	src/com/owncloud/android/authentication/AccountAuthenticator.java
2013-10-18 12:32:22 +02:00
David A. Velasco
7c9d9e7b3a Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-18 12:28:09 +02:00
masensio
ea7f8fe491 Merge branch 'setup_colors' into setup_app_name 2013-10-18 12:24:29 +02:00
masensio
194a7360f8 Merge branch 'develop' into release-1.4.6 2013-10-18 10:33:26 +02:00
David A. Velasco
db026d8a91 Added depth parameters to ervery PROPFIND method 2013-10-18 10:22:16 +02:00
David A. Velasco
8bd6f85e22 Fixed update of size in folders when browsing down and up through new folders in servers 2013-10-18 10:08:24 +02:00
masensio
6d17810140 Update serialVersionUIDs and version name/number 2013-10-18 09:01:17 +02:00
masensio
7488345470 OC-1663: Replace references to app_name in code 2013-10-17 16:54:43 +02:00
masensio
db1ea01561 Merge pull request #268 from owncloud/fix_fails_in_uploads_after_fall_and_rise_of_network_connection
Fix fails in uploads after fall and rise of network connection
2013-10-16 05:26:02 -07:00
David A. Velasco
af62f9857d Refactoring FileContentProvider and FileDataStorageManager: deletion of subfolders in provider & transactions on database connection 2013-10-16 13:04:49 +02:00
masensio
9681b8687e OC-1656: Disable/enable help-imprint-feedback options 2013-10-16 08:56:41 +02:00
masensio
066cd5aab3 Merge branch 'develop' into contact_settings
Conflicts:
	res/values/strings.xml
2013-10-15 14:07:59 +02:00
masensio
152ab88d90 OC-1668: Block creation of account from device settings 2013-10-15 11:32:46 +02:00
David A. Velasco
47b7a164de Merge remote-tracking branch 'origin/refresh_folder_contents_when_browsed_into' into refresh_folder_contents_when_browsed_into 2013-10-14 14:55:50 +02:00
masensio
9fcc118b8a 0C-1647: Enable/Disable Create Account option 2013-10-14 13:39:22 +02:00
David A. Velasco
d8de614d78 Some cleanup and methods renamed in FileDataStorageManager 2013-10-14 13:00:49 +02:00
masensio
98d95b576e OC-1701: Conflict detected in keep-in-sync 2013-10-14 12:48:26 +02:00
David A. Velasco
5b8731873e Removed interface DataStorageManager 2013-10-14 12:33:19 +02:00
masensio
b78eb416a4 OC-1670: owncloud_white --> background_color 2013-10-11 15:08:32 +02:00
masensio
10d1efa18d OC-1580: Cancel upload 2013-10-11 14:54:40 +02:00
David A. Velasco
552a34689c Avoid occasional crash in app updates due to 'lost' events from previous synchronizations 2013-10-11 10:50:11 +02:00
David A. Velasco
31ccf4e966 Improved navitagation through navigation list, reducing the number of requests to the server to refresh the target folder 2013-10-09 10:17:21 +02:00
David A. Velasco
ec85b4225e The app goes directly to root folder when the current folder does not exist anymore after refreshing with server 2013-10-08 15:06:20 +02:00
David A. Velasco
79493448d9 Included name of the 'lost' folder in the toast warning about current folder removed in the server 2013-10-08 11:24:15 +02:00
David A. Velasco
fc2baec2f6 Fixed search of an existing current folder when the activity detects that the current folder does not exist any more 2013-10-08 11:17:20 +02:00
David A. Velasco
0aef684087 Fixed some crashes in refresh of current folder 2013-10-08 09:19:52 +02:00
David A. Velasco
23c9be24a2 Clean up of synchronization code 2013-10-04 15:07:05 +02:00
David A. Velasco
74370d5dee Exit the current folder when not existing in the server any more (2) 2013-10-02 18:08:01 +02:00
David A. Velasco
ab3bcf6fe6 Exit the current folder when not existing in the server any more 2013-10-02 16:52:36 +02:00
David A. Velasco
7c3fad35a3 Fixed behaviour when user enters in a folder deleted in the server before the app finishes to synchronize 2013-10-02 10:40:03 +02:00
David A. Velasco
9c03c10790 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-02 09:29:59 +02:00
masensio
b6020228c8 Changes from comments of PR #270 2013-10-01 14:33:40 +02:00
masensio
df394c71be OC-1507- Reopened. Browse up < 2013-10-01 13:43:52 +02:00
masensio
5ff0989eb4 Merge remote-tracking branch 'origin/develop' into refresh_folder_contents_when_browsed_into 2013-10-01 12:58:17 +02:00
masensio
a8fade7369 OC-1508: App crashes when changing the orientation 2013-10-01 12:56:28 +02:00
David A. Velasco
b5d86aa9de Granted creation of a new client object (with a new socket) when the network connection is lost 2013-10-01 12:56:20 +02:00
David A. Velasco
abd0dfd385 Fixed URL encoding in check of existence 2013-10-01 09:02:07 +02:00
David A. Velasco
01a4676beb Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices 2013-09-30 13:49:50 +02:00
David A. Velasco
dabd24c985 Recover name of instant_uploads table 2013-09-30 13:29:18 +02:00
masensio
47d115d75a Change the loop mChildren update to the previous version 2013-09-30 10:28:03 +02:00
David A. Velasco
ea26ae4349 Check and creation for InstantUploads folder fixed and rewritten 2013-09-27 14:34:43 +02:00
masensio
9aa8babbe2 OC-1507: When you browse up, < is shown all the time in the top bar 2013-09-27 14:33:57 +02:00
masensio
ef78e58fed Add a log and a comment 2013-09-27 12:42:34 +02:00
masensio
da6683e2be OC-1470: Remove condition to ignore android.hardware.action.NEW_PICTURE events in devices with version >= 4.0 2013-09-26 18:33:27 +02:00
masensio
aaf8043d0c OC-1230: app doesn't show the folders structure correct for a while. Improve Sync Proccess 2013-09-25 18:38:17 +02:00
masensio
fdf2cae2ce Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-09-24 14:57:45 +02:00
masensio
e2e1e62e45 Changes from comments of PR 2013-09-24 14:54:46 +02:00
masensio
801475b924 OC-1388: Refresh 2013-09-23 15:00:34 +02:00
masensio
0c4adf5134 Merge branch 'develop' into fix_loading_dialog_crash 2013-09-23 09:06:37 +02:00
masensio
8fef772af4 OC-1380: Fix Start Synchroniztion fails 2013-09-20 11:39:50 +02:00
masensio
d6267698e8 Merge branch 'develop' into refresh_folder_contents_when_browsed_into
Conflicts:
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
2013-09-20 10:19:44 +02:00
masensio
b884276998 OC-1130: Change the old dialog by the new dialog. 2013-09-19 13:29:25 +02:00
masensio
b9c7b92940 OC-1129: Add LoadingDialog.java 2013-09-18 18:13:24 +02:00
masensio
31615a24ce OC-1250: Fix bug - App crashes when you enter in an account with a lot of files 2013-09-18 16:12:58 +02:00
masensio
68d4c74fda OC-1321: fix renaming problem: parent and children 2013-09-16 10:54:20 +02:00
masensio
776c6f1ffd OC-1230 2013-09-11 09:08:21 +02:00
masensio
e0b1e23e45 OC-1194: Adapt Sync Process using etag 2013-09-09 14:42:06 +02:00
masensio
eaa17eb429 OC-1196 OC-1195: Obtain etag from de Server and save it 2013-09-05 13:06:00 +02:00
masensio
0d81994506 OC-1193:Add etag to DB 2013-09-05 09:20:58 +02:00
masensio
50067ee42b Fix bug: When you browses up, the folder and files dissapears 2013-09-04 10:25:27 +02:00
masensio
fe9354ef5c OC-265:Fix Situation when renaming a folder does not work correctly 2013-08-29 13:02:16 +02:00
masensio
ce1e0c210a Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-27 13:49:31 +02:00
masensio
11389ddeb2 OC-1080: Message 'Server does not support this authentication method' should be there although orientation of the device is changed 2013-08-27 13:48:44 +02:00