mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
2331 commits 221 branches 1589 tags 640 MiB
Commit graph

1358 commits

Author SHA1 Message Date
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
tobiasKaminsky
0d01bf30c3 Added support for sharing files: 
- Long press on file list
- Add option on ImageViewer
 2013-11-24 10:00:04 +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
masensio
dd59f5871c OC-1833: Add CustomButton class to can change the background of buttons 2013-10-28 12:58:56 +01:00
David A. Velasco
4160e7e256 Merge branch 'develop' into clean_up 2013-10-28 10:11:40 +01:00
masensio
6e21c84026 Customize buttons 2013-10-25 15:06:10 +02:00
masensio
3889bea7c9 Update Social Links 2013-10-25 11:09:21 +02: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
d7c4d12485 Merge branch 'develop' into refresh_folder_contents_when_browsed_into 2013-10-08 08:52:14 +02:00
David A. Velasco
8abfe39821 Removed useless log 2013-10-07 14:00:02 +02:00
David A. Velasco
d9f42d500c Prevent double count of transfer progress when part of an upload is resend 2013-10-07 12:01:15 +02:00
David A. Velasco
23c9be24a2 Clean up of synchronization code 2013-10-04 15:07:05 +02:00
David A. Velasco
3ffc515f42 Merge branch 'develop' into fixed_permanent_redirections 2013-10-03 12:39:54 +02:00
David A. Velasco
8a27bf186a Merge branch 'fixed_permanent_redirections' into refresh_folder_contents_when_browsed_into 2013-10-03 12:38:09 +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
David A. Velasco
dad2221916 Merge branch 'develop' into fixed_permanent_redirections 2013-10-01 12:59:57 +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
aa23ece118 Custom automatic redirection implemented for methods with entity body (PROPFIND, PUT, MKCOL) 2013-09-30 15:12:53 +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
masensio
4047c62527 OC-1079: Use isIdPRedirection 2013-08-27 12:32:52 +02:00
masensio
da77406209 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 
Conflicts:
	src/com/owncloud/android/authentication/AuthenticatorActivity.java
 2013-08-27 12:15:06 +02:00
masensio
46674d32fe OC-1078: Use isIdPRedirection 2013-08-27 12:10:47 +02:00
masensio
eb437200aa Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-27 11:39:26 +02:00
masensio
e7d9114859 OC-1075: message 'This authenticated method is not supported', should be shown when need it. 2013-08-27 11:38:03 +02:00
masensio
2948f1053e OC-922: Synchronize folder, refresh folder size 2013-08-23 14:53:07 +02:00
David A. Velasco
dc02769e49 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-23 14:37:14 +02:00
David A. Velasco
ea5cd96679 Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on 2013-08-23 14:32:03 +02:00
David A. Velasco
2b1b98478b Added handler to trigger server check when the background is touched in login view for SSO login 2013-08-23 14:31:17 +02:00
masensio
71347b48a0 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 
Conflicts:
	src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
 2013-08-23 13:42:07 +02:00
masensio
3072a29730 OC-1055: Remove follow instruction. 2013-08-23 13:28:02 +02:00
David A. Velasco
b04c3e2398 Fixed cookie policy 2013-08-22 19:30:01 +02:00
David A. Velasco
2dc5cc57f1 Fixed condition to determine expiration of SAML SSO 2013-08-22 19:25:15 +02:00
David A. Velasco
e04f25735a Fixed cookie policy 2013-08-22 19:24:51 +02:00
masensio
472b360675 OC-922: Refresh of folder 2013-08-22 19:11:30 +02:00
David A. Velasco
b2f18e0f12 Avoid that a user can recover an expirated SAML session with a different userid than the used to create it 2013-08-22 19:03:21 +02:00
David A. Velasco
316a0a12ad Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-22 17:50:11 +02:00
David A. Velasco
d7c6472bd3 Added check to avoid the creation of the same account (same oc_username in the same server) more than once 2013-08-22 17:38:26 +02:00
masensio
dea37f653c Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 
Conflicts:
	res/values-es/strings.xml
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
 2013-08-22 12:59:56 +02:00
David A. Velasco
b6213a0d5f Fixed comments in PR#246 2013-08-22 11:48:57 +02:00
David A. Velasco
f67af8fd64 Merge branch 'saml_based_federated_single_sign_on' into sso_bug_changing_orientation 2013-08-21 18:56:19 +02:00
David A. Velasco
37297fb7a9 Fixed orientation changes in SSO dialog with WebView 2013-08-21 18:51:13 +02:00
masensio
7ed9e80013 OC-1029: add method isIdPRedirection 2013-08-21 18:31:57 +02:00
masensio
4dd5a5eab0 Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on 2013-08-21 18:24:52 +02:00
masensio
9724afda5d OC-1028: add extra condition to check of redirection. New method isIdPRedirection at RemoteOperationResult 2013-08-21 18:12:28 +02:00
masensio
10f832498d OC-1029: add an extra condition to check of redirection. Check if LocationUrl contains SAML or wayf 2013-08-21 17:53:12 +02:00
masensio
68de068092 added webSettings.setSaveFormData(false) on Saml Dialog 2013-08-21 16:16:21 +02:00
masensio
75eab3de5a OC-1024: Show update credentials for uploads, when session is expired 2013-08-21 12:45:07 +02:00
masensio
31e83e17e4 refresh account when session expires 2013-08-20 11:02:17 +02:00
masensio
2d36f5a564 message 'Session expires' in TextView instead of Toast 2013-08-17 18:39:05 +02:00
David A. Velasco
c88843916e Forms are resubmitted to grant correct recovery of SSO dialog when device orientation is changed after a bad login 2013-08-17 12:56:29 +02:00
David A. Velasco
54679a521d Merge branch 'develop' into sso_bug_changing_orientation 2013-08-17 10:52:03 +02:00
masensio
60947d737c Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-16 18:37:17 +02:00
masensio
55f2bd23e6 Move Shibboleth WebView to a big Dialog 2013-08-13 13:28:45 +02:00
masensio
9dacdbec0b Move WebView to Dialog 2013-08-13 12:08:46 +02:00
David A. Velasco
830bb7c853 Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 2013-08-12 13:21:01 +02:00
David A. Velasco
dd9fe3e572 Fixed state of embedded web view for creation of second and later accounts, and for orientation changes 2013-08-12 12:55:01 +02:00
David A. Velasco
68df3cbfe7 Expiration of SSO session is detected in background operations (download, upload, sync account) and error notification lets the user access to the login view 2013-08-12 11:34:09 +02:00
David A. Velasco
78bcf72188 Foreground operations on files (remove, rename, new folder) failed due to SAML SSO session expired redirect the app to the login view for a new authentication 2013-08-07 19:13:00 +02:00
masensio
733206c54c OC-170. Add condition about android version when capturing the action com.android.camera.NEW_PICTURE 2013-08-07 12:10:00 +02:00
Luke Owncloud
01cc23802f added official NEW_PICTURE receiver (supported by Android since SDK 14). 
old (unofficial) receiver still works, as well.

this enables instant upload for all Android 4 devices (also HTC!) and has no effect on older devices.
 2013-08-05 16:34:21 +02:00
David A. Velasco
52bc433bb1 Session cookie caught and saved to use in requests after successful SAML-based federated SSO 2013-08-01 17:47:09 +02:00
David A. Velasco
5ede3e9909 Improved status messages for authentication through SAML-based federated SSO 2013-08-01 17:44:23 +02:00
David A. Velasco
d2ee9062fa Configured embedded WebView to allow the single-sign-on process is completed and to catch the cookie setting the authorized session 2013-07-30 13:02:13 +02:00
Mik
4b465cfc28 Bugfix for issue #220: exception on Android 4.3 
tested on Android 4.3, 4.0.3 and 2.3.3
 2013-07-29 19:12:55 +02:00
David A. Velasco
5a65ff53c2 AuthenticatorActivity updated to test existance through SAML-based-federated-authenticated entry point 2013-07-26 13:05:01 +02:00
David A. Velasco
0713ba613d Added SAML-based Web Single-Sign-On as new authentication method available in pre-build configuration 2013-07-25 17:29:52 +02:00
masensio
5f0dfa61ab OC-673: Show folder size at a first sync 2013-07-11 18:57:35 +02:00
masensio
b4a85deafc Merge pull request #215 from owncloud/branding_configurable_URL_input_field 
Configurable url input field
 2013-07-10 00:24:16 -07:00
David A. Velasco
fa57455a74 Allow the definition of a default server URL although the input field is visible 2013-07-09 13:36:24 +02:00
David A. Velasco
fffa77e211 Merge remote-tracking branch 'origin/bug_folder_size_delay' into bug_folder_size_delay 2013-07-09 13:25:43 +02:00
David A. Velasco
7a7fe5dbca Improvements from comments 2013-07-09 13:20:54 +02:00
masensio
3863cf061b OC-523: Remove two log lines in FileDataStorageManager 2013-07-09 13:20:53 +02:00
masensio
a72d7bfe21 OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523 2013-07-09 13:20:52 +02:00
masensio
7ec25767ef OC-576: method updateSubtreeSize in FileDataStorageManager. OC-523 2013-07-09 13:16:41 +02:00
masensio
eee74aa5f2 OC-575: Update the size of a folder in DB during the sync. OC-523 2013-07-09 13:16:40 +02:00
masensio
50628c0c0b OC-574: Show size in list from local database. OC-523 2013-07-09 13:04:40 +02:00
David A. Velasco
dcccf73dfb Improvements from comments 2013-07-09 12:32:44 +02:00
David A. Velasco
1eed6a6812 Avoid that refresh button appears while checking remote server 2013-07-09 10:35:04 +02:00
masensio
11adab0116 OC-523: Remove two log lines in FileDataStorageManager 2013-07-05 15:06:51 +02:00
masensio
a52ff9359f OC-577: Modify FileDataStorageManager to call updateSubtreeSize. OC-523 2013-07-05 14:54:02 +02:00
David A. Velasco
b708d46def REALLY added imprint link in settings; imprint and help links protected for bad configuration of preferences.xml 2013-07-05 14:00:41 +02:00
masensio
a7385a7a5a OC-576: method updateSubtreeSize in FileDataStorageManager. OC-523 2013-07-05 13:00:57 +02:00
David A. Velasco
233533faa3 Merge branch 'develop' into branding_configurable_URL_input_field 2013-07-05 11:52:24 +02:00
David A. Velasco
12bffce50c Added help link, feedback email, recommendations through email, and (disabled) imprint link to app settings 2013-07-05 10:47:34 +02:00
masensio
994e81d7ce OC-575: Update the size of a folder in DB during the sync. OC-523 2013-07-04 18:47:38 +02:00
masensio
0707f6cf71 OC-574: Show size in list from local database. OC-523 2013-07-04 10:34:57 +02:00
David A. Velasco
dcbc08cae7 Merge branch 'develop' into check_account_existance_in_gallery 2013-07-03 10:06:37 +02:00
David A. Velasco
e8239f434a Merge branch 'develop' into modify_password 2013-07-02 13:08:27 +02:00
David A. Velasco
82375a917b FIXED: right screen when the app is left in a video, the account is deleted, the orientation is changed, the app is opened and the account reloged-in 2013-07-02 12:41:10 +02:00
David A. Velasco
fb500a906c Fixed lost of state of list of files in orientation changes 2013-06-28 13:35:03 +02:00
David A. Velasco
5b792b0440 Merge branch 'develop' into check_account_existance_in_gallery 2013-06-28 11:58:43 +02:00
masensio
b52f0484b4 OC-461: Add check server button. OC-394 2013-06-26 18:50:08 +02:00
David A. Velasco
04803ae879 Fixed false error message and lack of recheck when a server certificate is explicitly accepted by the user in the login view 2013-06-26 12:45:35 +02:00
David A. Velasco
646abfa08d Fixed update of action bar in successful rename 2013-06-26 11:47:20 +02:00
David A. Velasco
58733dfa12 Generated serialVersionUIDs updated 2013-06-26 09:23:53 +02:00
David A. Velasco
0f2a7475b1 Disabled logging options until fixed 2013-06-26 09:13:28 +02:00
David A. Velasco
863f3f68d2 Merge pull request #197 from owncloud/fixed_crash_due_to_uploads_to_accounts_not_already_existing 
Fixed crash due to uploads to accounts not already existing
 2013-06-25 23:51:58 -07:00
masensio
2df8f56e5e OC-460:URL-input GONE. OC-394 2013-06-25 14:13:04 +02:00
David A. Velasco
d51372fb92 Make the 'refresh' button enabled when visible, although the URL-input field is disabled, when the password is being updated 2013-06-24 10:39:52 +02:00
David A. Velasco
af4b0bc90b Fixed focus in AuthenticarActivity for changing password so that server URL is not editable 2013-06-21 14:29:47 +02:00
David A. Velasco
8f1566a21c Removed toast message for updating credentials when user manually accessed to the AcountAuthenticatorActivity 2013-06-21 14:16:45 +02:00
David A. Velasco
a102f26925 AuthenticatorActivity is started when 'change password' is selected for a list in the list of accounts 2013-06-21 14:04:48 +02:00
David A. Velasco
0c7f1af8d0 Merge branch 'fixed_contradicted_messages_in_login_view' into develop 2013-06-19 12:17:16 +02:00
David A. Velasco
19bcc99538 Fixed: details about progress are shown when the notification of an upload is clicked 2013-06-18 14:59:36 +02:00
David A. Velasco
6ca1e170f7 Fixed crash, error notified instead 2013-06-18 14:04:51 +02:00
David A. Velasco
c4ac05dee2 REFACTORING: moved AccountUtils to .authentication package 2013-06-18 11:34:08 +02:00
David A. Velasco
7f34fba421 ConflictsResolveActivity protected against access to non-existing account 2013-06-17 14:43:26 +02:00
David A. Velasco
c43b15deab UploadFileActivity protected agains access to non-existing account 2013-06-17 14:21:33 +02:00
masensio
90428ec4c7 Merge remote-tracking branch 'origin/develop' into folderSizeInfo 
Conflicts:
	.classpath
	tests/.classpath
 2013-06-17 13:32:40 +02:00
David A. Velasco
ca74319956 Merge remote-tracking branch 'origin/develop' into check_account_existance_in_gallery 2013-06-17 12:28:42 +02:00
David A. Velasco
a65b73a972 Merge pull request #178 from owncloud/login_smart_clip_of_URL_suffix 
OC-208: suffix remote.php/webdav. OC-34
 2013-06-17 03:07:32 -07:00
David A. Velasco
10b014a19a Fixed bad transitions after adding protection for removed accounts to PreviewVideoActivity 2013-06-17 11:16:39 +02:00
David A. Velasco
3ecabe3ea7 PreviewVideoActivity protected against access to non-exiting account 2013-06-14 16:59:38 +02:00
David A. Velasco
f9babe7b7d PreviewImageActivity protected against access to non-existing account 2013-06-14 12:53:45 +02:00
David A. Velasco
3440b8a1d2 Fixed repeated request for create first account when all the accounts where removed after the app was left in an actitivy not root in its task 2013-06-13 11:35:17 +02:00
David A. Velasco
02d08d0f81 Merge branch 'develop' into direct_download_with_click_at_list 2013-06-12 11:47:18 +02:00
masensio
8f64354d72 OC-208: Changes from comments 2013-06-11 10:46:21 +02:00
David A. Velasco
782186f5b1 Removed 'download' and 'open with' options from contextual menu in list of files 2013-06-10 14:21:24 +02:00
David A. Velasco
64bbf07d97 OC-299 fixed restart of finished downloads on orientation changes 2013-06-10 13:52:24 +02:00
masensio
472b6b48bf Merge OC-297 2013-06-10 13:19:11 +02:00
masensio
9f20cc45cc OC-297: Refresh button in changing orientation. OC-65 2013-06-10 13:06:46 +02:00
David A. Velasco
30ab377413 Server or connection errors in authorization require handled as in server check 2013-06-10 12:51:48 +02:00
masensio
883e1b1674 OC-208: suffix remote.php/webdav. OC-34 2013-06-10 09:01:39 +02:00
masensio
6e2949f681 Update branch with develop branch 2013-06-06 17:22:25 +02:00
David A. Velasco
dcae1fe167 Merge branch 'login_view_layout_improvements' into login_toggle_password_icon 2013-06-05 11:39:34 +02:00
David A. Velasco
93f79c7099 Cancel button for downloads in progress replaceed with 'x' icon 2013-06-05 11:08:33 +02:00
David A. Velasco
16f121a7b2 REFACTORING: update mFile in FileDisplayActivity to improve transitions from notification bar, and some other fixes 2013-06-05 09:59:48 +02:00
David A. Velasco
c70f333358 REFACTORING: fix layout problems in orientation changes after removing FileDetailActivity 2013-06-04 14:30:29 +02:00
masensio
9dc5a62e44 OC-247: Resize active area for the eye icon 2013-06-04 10:45:24 +02:00
masensio
6daba6801f OC-216: Hide Refresh Button. OC-65 2013-06-03 12:43:42 +02:00
masensio
b2c6dd188d OC-167 2013-05-31 14:05:06 +02:00
David A. Velasco
fd39628997 REFACTORING: FileDetailActivity never more - simplifies transitions and removes bugs in orientation changes 2013-05-30 17:53:21 +02:00
David A. Velasco
5966b38de7 Open downloaded files with just click on the list of files 2013-05-29 10:42:04 +02:00
David A. Velasco
f767bf3f01 Non-previewable file is opened after successful donwload 2013-05-28 13:11:57 +02:00
David A. Velasco
99d5800234 Improved algorithm to open files with external apps: MIME type identified by the system is prefered before than the saved one from the server 2013-05-28 10:29:03 +02:00
David A. Velasco
edb380e0cd Code refactored to 'open file' in a single point 2013-05-27 15:01:54 +02:00
David A. Velasco
c6ed18dafa Download any file just with click on the list of files 2013-05-27 14:07:33 +02:00
David A. Velasco
0e133233f3 Placeholder drawable for 'hide password' button replace with the final icon 2013-05-24 12:47:39 +02:00
David A. Velasco
7160a49e20 Merge branch 'develop' into login_toggle_password_icon 2013-05-24 10:36:21 +02:00
David A. Velasco
a4bd86cf14 Fixed 'connect' button disabling with change of orientation when focus is in the URL field 2013-05-21 14:25:08 +02:00
David A. Velasco
4eb8093418 'Connect' button is disabled in login view any time the URL is modified, to prevent situations where the user can connect to a server introduced before the modifciation 2013-05-20 13:54:04 +02:00
David A. Velasco
69b527c39d Visibility icon in password field is toggled according to the visibility state; better touch detection of visibility and refresh buttons 2013-05-17 14:33:31 +02:00
David A. Velasco
1331b80015 Fixed visibility of server-check button on orientation changes when check was previously passed 2013-05-16 19:07:44 +02:00
David A. Velasco
4d67655bbe Removed unused code 2013-05-16 17:10:41 +02:00
David A. Velasco
16403b2722 Fixed visibility of button for server checking 2013-05-16 16:42:13 +02:00
David A. Velasco
fe1b334ce6 Fixed problem after erasing URL in login view and changing to next field 2013-05-16 12:48:13 +02:00
David A. Velasco
9fe217ea4a Fixed authorization status message 2013-05-16 12:42:11 +02:00
David A. Velasco
17776812ee Prevented server check due to orientation change in login view 2013-05-16 12:30:37 +02:00
David A. Velasco
4f524a2043 Grant that 'refresh' button embedded in the URL input field does not hide the text in the field 2013-05-14 15:19:43 +02:00
David A. Velasco
3eb602f81a Fixed unlinked refresh button for the server connection check 2013-05-14 13:39:09 +02:00
David A. Velasco
842f46d7ca Try authorization when 'enter' is pressed in the touch keyboard 2013-05-14 13:18:21 +02:00
David A. Velasco
50d77e8dc8 Review of login view layout optimizing the adaption to different screen sizes 2013-05-10 16:35:01 +02:00
David A. Velasco
fe159af4ea Removed unnecessary code for showing progress circle after creation of first account 2013-05-07 14:25:48 +02:00
David A. Velasco
bc1fcf8493 Added account existance validation to FileDetailsActivity 2013-05-07 13:49:54 +02:00
David A. Velasco
979bdc83b2 Replaced public scope with protected scope in inherited on*** methods for FileActivityS 2013-05-07 13:05:40 +02:00
David A. Velasco
f6780fdc00 Improved implementation of redirection for first account 2013-05-07 12:54:31 +02:00
David A. Velasco
b36914df88 Merge branch 'develop' into file_browsing_refactoring 
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
 2013-05-06 10:48:43 +02:00
David A. Velasco
65f403bf99 Merge branch 'develop' into fixForCrashedSharedContents 
Conflicts:
	src/com/owncloud/android/Uploader.java
 2013-05-03 14:25:02 +02:00
David A. Velasco
2a95f59adc Fixed bug when turning tablet with no file in the right fragment 
Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2013-05-03 13:14:32 +02:00
David A. Velasco
f6846b6686 Fixed flow from click on (up|down)load notifications in landscape tablets: dual pane, please 2013-05-02 16:34:38 +02:00
zerginator
536cc166b6 Issue #136 [Feature] Instant upload of videos 2013-05-01 20:06:13 +02:00
David A. Velasco
00328cb889 Video previews reworked to provide seamless playback in turns and changes between fullscreen and embedded, in any combination and order 2013-04-30 13:16:08 +02:00
zerginator
5b9bf1ad3f Issue #28 folders don't show date and size info 2013-04-28 15:19:34 +02:00
zerginator
002e1bf9e3 Fix for : 
Issue #131 &  Issue #132 : 
Crash when sharing contents from other apps to ownCloud
 2013-04-28 11:33:20 +02:00
David A. Velasco
6496b9200d Video embedded mantains its playback state when the device is turned to other orientation 2013-04-26 14:02:17 +02:00
David A. Velasco
2b3f7c5489 Removed unused methods in WebdavClient 2013-04-25 19:44:21 +02:00
David A. Velasco
2946d8dd69 Merge branch 'develop' into oauth_login 
Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/authentication/AccountAuthenticator.java
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/network/OwnCloudClientUtils.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/operations/UpdateOCVersionOperation.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AccountSelectActivity.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/eu/alefzero/webdav/WebdavClient.java
 2013-04-25 19:39:22 +02:00
David A. Velasco
6a6d83311f Avoid duplicated 'refresh file' entry in context menu on an item in the list of files 2013-04-24 11:04:23 +02:00
David A. Velasco
850d7a115d Fixed: hide all the actions for single file when none of them is selected in the landscape view 2013-04-22 15:11:09 +02:00
David A. Velasco
803568ab27 Moved buttons in details view to options/action menu 2013-04-22 14:34:42 +02:00
David A. Velasco
6ef46f264e Fixed rename of files when folder for local files is not already created 2013-04-19 10:56:00 +02:00
David A. Velasco
5b9935c849 Removed text notification about first instant upload only on line - not necessary any more 2013-04-17 18:07:00 +02:00
David A. Velasco
9ad30bdded Refactored path to directory for instant uploads; fixed some problems with first upload for never-synchronized accounts 2013-04-17 18:00:31 +02:00
David A. Velasco
bdc0332c23 Copyright note fixes 2013-04-17 12:26:13 +02:00
David A. Velasco
5bcfed8eae Select name of file in the 'rename' dialog, excluding extension 
Conflicts:

	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2013-04-15 14:29:30 +02:00
David A. Velasco
be51b2c4aa Fixed regression after merge: removed 'about' entry in menu 2013-04-15 13:48:04 +02:00
David A. Velasco
7052e3b5b8 About in settings, more i18n-friendly 2013-04-15 13:45:20 +02:00
David A. Velasco
1003ecb7be Moved log path definition to FileStorageUtils 2013-04-15 13:32:49 +02:00
David A. Velasco
274dfd2958 Used Log_OC in all the logs 2013-04-15 13:17:47 +02:00
David A. Velasco
c3ca5b5a4f Merge branch 'develop' into loggingtool 
Conflicts:
	AndroidManifest.xml
	res/menu/main_menu.xml
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/operations/SynchronizeFileOperation.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDetailActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
	src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java
	src/eu/alefzero/webdav/FileRequestEntity.java
	src/eu/alefzero/webdav/WebdavClient.java
 2013-04-15 13:12:04 +02:00
David A. Velasco
92dc4c568c Avoid null pointer in logs 2013-04-12 13:31:27 +02:00
David A. Velasco
56f1df02c4 Merge branch 'feature_previews' into develop 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2013-04-12 12:46:18 +02:00
David A. Velasco
8aeb5243b7 Merge branch 'bug_hunting' into develop 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2013-04-12 12:34:17 +02:00
David A. Velasco
2a42651463 Fixed (tablet landscape): video playback is resumed in the moment it was left when the user pressed HOME 2013-04-11 16:56:51 +02:00
David A. Velasco
a11e7fd900 Fixed undesired video loop after completion, caused by bugs in GINGERBREAD 2013-04-10 13:07:10 +02:00
David A. Velasco
bed905c9b8 Fixed (tablet, landscape): when the 'playing audio' notification is clicked, the app shows the current playback details 2013-04-09 14:10:10 +02:00
David A. Velasco
8638936ce7 Merge branch 'bug_hunting' into feature_previews 2013-04-09 12:54:24 +02:00
David A. Velasco
7edc384f7e Patch to fix the lack of progress circle at the first sycnhronization of the first-created account, in Android 2.x 2013-04-09 11:17:28 +02:00
David A. Velasco
9b758dfa70 Recovery of instant uploads in temporary disabled 2013-04-04 17:15:53 +02:00
David A. Velasco
053aad5ae1 Merge branch 'bug_hunting' into feature_previews 
Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2013-04-04 16:49:04 +02:00
David A. Velasco
77ddd1ccb6 Merge branch 'develop' into feature_previews 
Conflicts:
	AndroidManifest.xml
	res/menu/file_context_menu.xml
	res/menu/menu.xml
	res/values-de-rDE/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/UploadFileOperation.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
 2013-04-04 16:44:30 +02:00
zerginator
5a22c7e79f Cleaned stuff , add a history delete button and renamed 
Log2EmailActivity in LogHistoryActivity
 2013-04-01 10:26:40 +02:00
David A. Velasco
2e5b40e357 Make the OAuth authorization available or not depending upon a variable in oauth.xml 2013-03-27 13:39:00 +01:00
David A. Velasco
7d1ea9819c Fix crash got with: 1. try to rename / delete a file with an outdated access token; 2. cancel in login activity instead of authorize again; 3. try to refresh the account 2013-03-27 12:55:47 +01:00
David A. Velasco
980b31de2e Allow edition of OAuth endpoints for testing; better configuration values 2013-03-22 14:50:30 +01:00
David A. Velasco
fa80179106 Fixed undesired restart of finished audio previews when the device orientation changes 2013-03-22 13:04:57 +01:00
David A. Velasco
83379d2674 Quick & dirty fix to avoid that 'create folder' dialog keeps the name of the last created dialog in the input field 2013-03-21 17:53:02 +01:00
David A. Velasco
1236edf9b0 Improvementes in full screen video: tap on video shows and hides controls; full screen available in portrait; fade out for controls reduced to 4 seconds 2013-03-21 15:49:10 +01:00
David A. Velasco
18d4ff203f Fixed minor bugs inserted in clean-up 2013-03-21 13:22:53 +01:00
David A. Velasco
69d6d821ec OAuth clean-up and refactoring 2013-03-21 12:21:48 +01:00
David A. Velasco
4861636185 Refresh authorization token on failed downloads / uploads when notification error is clicked 2013-03-18 15:05:35 +01:00
David A. Velasco
5665d9c306 Merge tag 'oc-android-1-3-22' into oauth_login 
Conflicts:
	AndroidManifest.xml
	src/com/owncloud/android/authenticator/AuthenticationRunnable.java
	src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java
	src/com/owncloud/android/authenticator/OnConnectCheckListener.java
	src/com/owncloud/android/files/services/FileOperation.java
	src/com/owncloud/android/files/services/InstantUploadService.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
 2013-03-18 14:28:49 +01:00
David A. Velasco
7d84fd0c9f Refresh authorization token on failed synchronizations when notification error is clicked 2013-03-18 14:05:34 +01:00
Matthias Baumann
6c5f561342 - exclude none InstantUpload from InstantUploadActivity 
- add simple Activity for none InstantUloads to show the whole
error-message
 2013-03-17 10:38:42 +01:00
Matthias Baumann
7392cfe5ab - InstantUpload path const not longer at two places, only at 
InstantUploadService
- new method to create the full path for the instantupload's
- add QUOTA_EXCEEDED to RemoteOperationResult.ResultCode enum to hande
http-507 from oc
- handle RuntimeException at connection lost as HOST_NOT_AVAILABLE
- add the error message for failed uploads for every not uploaded
picture, espacially  for QUOTA_EXCEEDED is it necessary to show that to
the user
 2013-03-16 18:56:27 +01:00
David A. Velasco
bc5c3f5f06 Added full screen video when embedded video is touched 2013-03-14 16:55:57 +01:00
David A. Velasco
3ac08177eb REALLY fix ArrayOutOfBoundsException when chosing icons for files with invalid MIME type 2013-03-14 10:36:22 +01:00
David A. Velasco
2c2efa286d Saved isplaying state to avoid autoplay when a video is paused and the device orientation is changed 2013-03-13 12:21:33 +01:00
David A. Velasco
ce7f7fa48c Update image of play/pause button when audio playback starts 2013-03-12 14:36:31 +01:00
zerginator
f256bdee52 Log_OC included 2013-03-12 08:08:04 +01:00
zerginator
8e36e7cc3e This wraps the android.util.logging into Log_OC which , if its enabled 
in the app, logs the logcat into a file. It also includes the phone
information (MODEL, VERSION...)

https://github.com/owncloud/android/issues/97
 2013-03-12 07:56:27 +01:00
David A. Velasco
7d67737a4f Updating translation files... 2013-03-11 13:27:56 +01:00
David A. Velasco
a99f74bd9e Disable change log; to remove in future 2013-03-11 12:45:50 +01:00
David A. Velasco
ca8a19850b Improving our own media control: removed 'next' and 'previous' buttons, removed undesired 'show' and 'hide' behaviour, fixed update of progress bar, recovered BACK button 2013-03-11 10:20:04 +01:00
zerginator
18a715072c moved About App into preferences 
https://github.com/owncloud/android/issues/57
 2013-03-10 20:38:46 +01:00
David A. Velasco
d68b324653 Create our own media control - basic operation 2013-03-08 13:32:10 +01:00
David A. Velasco
3aacc7c0fe Stop audio playback in background when a video preview is started 2013-03-07 17:07:58 +01:00
David A. Velasco
d19d985c0a Fixed CRASH due to NullPointerException when a details actitivity is brough to foreground and the OC icon is pressed, after removing accounts in system settings 2013-03-07 12:38:47 +01:00
David A. Velasco
4b46b17fcb Fixed CRASH due to ArrayIndexOutOfBoundsException while choosing the icon for a file with a wrong MIME type (reported in Play Store) 2013-03-07 10:42:50 +01:00
David A. Velasco
7d14d4bfb4 Fixed NullPointerException in log 2013-03-05 13:59:48 +01:00
David A. Velasco
cf2ba0bc07 Fixed infinity loop in media previews when the icon in the action bar (UP button) is pressed 2013-03-01 16:05:19 +01:00
David A. Velasco
48e7e40394 Quick fix for undesired progress bar shown in details view, when this is opened from the gallery, from an image just downloaded 2013-03-01 15:31:13 +01:00
David A. Velasco
a212611a9b File#isImage() considers the name of the file, besides the knowledge from server 2013-03-01 14:55:59 +01:00
David A. Velasco
db7eea712d Improved message for failed downloads in gallery 2013-03-01 14:20:25 +01:00
David A. Velasco
07a8938270 Improvements in load of images: progress wheel while loading and better scaling 2013-03-01 11:17:12 +01:00
David A. Velasco
427a3e6331 Progress wheel shown in gallery while an image is getting loaded 2013-03-01 10:49:35 +01:00
David A. Velasco
6cfa24f55a Improved error messages in gallery for images that can not be loaded 2013-03-01 09:54:49 +01:00
David A. Velasco
31827bce0c Removed excess of logs 2013-02-28 17:52:15 +01:00
David A. Velasco
638b7767cb Gallery in full screen, action bar shown on tap 2013-02-28 17:09:00 +01:00
David A. Velasco
a0e4e7ea97 Fixed audio preview loop got when a tablet is torned to portrait orientation while audio preview is playing in landscape, and then the preview is left with BACK 2013-02-28 13:26:43 +01:00
David A. Velasco
d0767f1a4f Fixed automatic playback of media previews after download, in portrait orientation 2013-02-28 11:42:47 +01:00
David A. Velasco
75ae57b6d3 Cancelling a download in gallery finishes the gallery 2013-02-27 16:30:29 +01:00
David A. Velasco
e0cb989b3a Click on notifications about image downloads / uploads goes to gallery 2013-02-27 16:27:25 +01:00
David A. Velasco
3d989ad060 Fixed update of download progress bar when the gallery is left with button HOME, and the user comes back before the download finishes 2013-02-27 15:50:52 +01:00
David A. Velasco
86cec34b25 Gallery handles multiple downloads gracefully 2013-02-27 14:08:58 +01:00
David A. Velasco
4ba98835df Fixed: download of the first image in a folder is now started when clicked on 2013-02-27 10:49:13 +01:00
David A. Velasco
861a8bfb78 Fixed update of list of files when downloads finish 2013-02-27 10:27:32 +01:00
David A. Velasco
25e342e945 Fixed button 'cancel' in automatic downloads into the images gallery 2013-02-26 19:26:45 +01:00
David A. Velasco
6d4ce68a81 Removed useless swipe detection from details view 2013-02-26 19:10:07 +01:00
David A. Velasco
2f1aaa8b15 Refactoring and clean-up of fragment for media previews 2013-02-26 19:04:42 +01:00
David A. Velasco
becf52226e Improved layout for downloads in image gallery 2013-02-26 14:01:32 +01:00
David A. Velasco
a3aca94694 Fixed automatic download for a not downloaded image file when previewing it 2013-02-26 13:17:44 +01:00
David A. Velasco
def870aa0f Fixed bug: show the selected image in the gallery, instead of always the first in the folder 2013-02-26 12:49:15 +01:00
David A. Velasco
fc2af5b03e Automatic preview after download in PreviewImageActivity 2013-02-26 12:33:28 +01:00
David A. Velasco
31a31bcf39 Fixed bug when turning the device to other position 2013-02-25 15:24:37 +01:00
David A. Velasco
cb66b59918 Minimize new fragment to monitor the progress of file download 2013-02-25 15:19:18 +01:00
David A. Velasco
d7e0519294 Added view pager for scrolling image previews with horizontal swipe 2013-02-25 14:33:16 +01:00
David A. Velasco
3d272eb753 Force preview of images in 'full screen' 2013-02-25 12:24:14 +01:00
Matthias Baumann
f764980474 - extend existing FileUpload, so we can handel failed instand upload 
later
- new Activity to handle failed instant uploads
- new Activity InstantUploadActivity can be started at two ways,
     -touch to the 'Faild Upload Notifivation'
     -submenue underneath the upload menue  
- merges from head
- add lazy loading for the images list with failed uploads
 2013-02-25 08:21:33 +01:00
David A. Velasco
0c75a839f2 Automatic download of previewable files in download mode 2013-02-22 16:39:58 +01:00
David A. Velasco
559ab6566b Automatic download of previewable files in portrait mode 2013-02-22 15:27:22 +01:00
David A. Velasco
0a924c67d3 Fixed update of progress bar for file transfers in landscape mode 2013-02-22 14:14:28 +01:00
David A. Velasco
bcc7bd2744 Fixed ClassCastException in FileUploader 2013-02-21 09:57:23 +01:00
David A. Velasco
dcde6e9283 FIX: IMPORTANT, to keep the life cicle of fragments, super() must be called in @onSaveInstaceState, at the holder Activity 2013-02-20 15:59:45 +01:00
David A. Velasco
e8ae33b628 Fix: clicking on an upload notification goes to file details, never to file preview 2013-02-20 15:58:29 +01:00
David A. Velasco
1c978b8aaf Visibility fixes in progress bar 2013-02-20 13:09:03 +01:00
David A. Velasco
cfb68a69dd Progress bar in details view is successfully updated 2013-02-20 12:34:11 +01:00
David A. Velasco
fb8194b7eb Fixed ClassCastingException 2013-02-20 10:06:18 +01:00
David A. Velasco
24dd513682 Added progress bar for file transfers in details view (untested) 2013-02-19 13:28:01 +01:00
David A. Velasco
f2474ae28d Added basic menu options to the preview fragment: open, delete, see details 2013-02-18 11:23:18 +01:00
David A. Velasco
7ffe1196d3 Now it can be build :\ ... 2013-02-15 09:58:53 +01:00
David A. Velasco
7101a04247 Created preview fragment to show previews for audio, video and images; shown when a downloaded file in these categories is downloaded 2013-02-14 19:21:09 +01:00
David A. Velasco
ba6eafccb8 Do not try to play files in streaming by now 2013-02-12 12:19:38 +01:00
David A. Velasco
9420651936 Error messages for media playback improved 2013-02-12 12:07:42 +01:00
David A. Velasco
11c1ad8f78 Fixed bad behaviours when an error occurrs during audio playback 2013-02-12 11:26:38 +01:00
David A. Velasco
e4cd3fe54c Removed unused code in MediaService 2013-02-11 12:46:50 +01:00
David A. Velasco
6103446ab8 Error messages for video playback reviewed 2013-02-11 11:33:50 +01:00
David A. Velasco
2623e9c195 Replaced GPL v3 with GPL v2; PLEASE, note that GPL v2 still allows the code is used under the terms of later versions of GPL, depending upon the will of the user, so no right is being diminished 2013-02-08 09:22:46 +01:00
David A. Velasco
ccfd7772df Removed some unused classes 2013-02-08 09:05:37 +01:00
David A. Velasco
bb257ec729 Updated copyright in source files 2013-02-07 18:45:10 +01:00
David A. Velasco
586793a261 Basic video preview in a separate actitivy 2013-02-07 11:09:28 +01:00
David A. Velasco
18bf35a809 Added MediaController user interface to handle audio files in the MediaService 2013-02-06 14:14:55 +01:00
David A. Velasco
7018ae7e1f Added music player service in background; 'open' button in details used to test (temporal) 2013-02-05 12:20:47 +01:00
David A. Velasco
0f99bd59a1 HOTFIX (oc 1.3.20, ocw 1.0.2): fixed the creation of new accounts after installing the workaround app and rebooting 2013-01-31 16:17:32 +01:00
David A. Velasco
37f0586c47 Merge branch 'file_icons' into workaround_integration 2013-01-30 13:49:36 +01:00
David A. Velasco
5da9c095a4 Added dialog in the main app to advise users about the workaround app 2013-01-30 13:46:15 +01:00
David A. Velasco
f1f8c749d1 Save new token / credentials to make them permanent 2013-01-29 11:49:42 +01:00
David A. Velasco
fb8a8a2166 Fixed behaviour when authorization is denied by user; added toast message to explain the need to update credentials 2013-01-28 13:15:28 +01:00
David A. Velasco
63106c9238 Locked edition of URL and password in redirection due to expired credentials; error messages reviewed; fixed capture of redirection from web browser in OAuth 2013-01-25 15:11:10 +01:00
David A. Velasco
1e5aa5345f Fixed visibility of authorization details when the device is turned aside; removed unused classes from old OAuth flow 2013-01-24 18:31:40 +01:00
David A. Velasco
d6f725bfeb Fixed icon for text files 2013-01-24 14:03:38 +01:00
David A. Velasco
f440d30e42 Code ready to provide different icons for well-known MIME types 2013-01-24 13:34:27 +01:00
David A. Velasco
ac07e35d8a Merge remote-tracking branch 'origin/oauth_login' into oauth_login 2013-01-24 10:30:18 +01:00
David A. Velasco
088b1e83a4 Cleaning-up AuthenticatorActivty code 2013-01-24 10:29:11 +01:00
David A. Velasco
aa19d76441 Cleaning-up AuthenticatorActivty code 2013-01-24 10:27:53 +01:00
David A. Velasco
e9f13d77ce Redirect app to login screen when any operation started from a foreground component fails due to bad credentials 2013-01-17 16:03:59 +01:00
David A. Velasco
2b5785556e Merge branch 'master' into oauth_login 
Conflicts:
	AndroidManifest.xml
	res/values-de-rDE/strings.xml
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/owncloud/android/Uploader.java
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/files/OwnCloudFileObserver.java
	src/com/owncloud/android/files/services/FileDownloader.java
	src/com/owncloud/android/files/services/FileUploader.java
	src/com/owncloud/android/operations/RemoteOperationResult.java
	src/com/owncloud/android/syncadapter/FileSyncAdapter.java
	src/com/owncloud/android/ui/activity/AuthenticatorActivity.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/activity/UploadFilesActivity.java
	src/com/owncloud/android/ui/fragment/FileDetailFragment.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
 2013-01-17 14:25:49 +01:00
David A. Velasco
73f8797b75 Redirect app to login screen when operations in file details view fail due to bad credentials 2013-01-17 13:01:51 +01:00
David A. Velasco
f91d3ce792 Fixed null pointer in FileObserverService initialization 2013-01-14 12:38:46 +01:00
David A. Velasco
7f881d1712 Merge branch 'master' into crash_fixes 2013-01-11 18:44:47 +01:00
David A. Velasco
05d053beae Merge pull request #66 from jmiazga/master 
Issue 46 fix
 2013-01-11 05:37:42 -08:00
David A. Velasco
7239b9eb9d Translations update 2013-01-10 18:38:41 +01:00
David A. Velasco
840c842f03 Fixed bug: empty folders are kept in device database when sucessfully removed 2013-01-10 16:27:05 +01:00
David A. Velasco
4905f9a396 Fixed bug preventing the enter in empty folders when uploading files from external apps through 'share to' or 'send' 2013-01-10 16:12:59 +01:00
David A. Velasco
471bff2aec Fixed crash when uploading a file in any account after cleaning app data 2013-01-10 11:39:22 +01:00
David A. Velasco
afa58b8ac6 Fixed bad update of details view for an uploading file when it finishes, resulting in a renamed file due to other file in the server with the same name ; and subsequent crash got by pressing 'Cancel' 2013-01-09 16:55:25 +01:00
David A. Velasco
35b25f04eb Fixed crash in test of files downloading / uploading 2013-01-09 10:11:21 +01:00
David A. Velasco
a1a31b68d9 Fixed crash when an upload is confirmed with no file selected 2013-01-08 17:48:58 +01:00
David A. Velasco
6faa03a084 Remove unused Object member causing problems with serialization; back to previous serializationUID 2013-01-08 17:31:04 +01:00
jmiazga
124b43cb4e text selection is kept when user toggles between visible and non visible password 2013-01-04 09:40:13 -05:00
David A. Velasco
66442da081 Fixed double upload of files with OAuth + Bearer authorization 2012-12-19 18:42:38 +01:00
David A. Velasco
11b88e0fcc Added support to OAuth2 'authorization code' grat type: get & save access token, use it to access ownCloud 2012-12-19 14:12:53 +01:00
David A. Velasco
c38a3b2ef1 Merge master into oauth_login 2012-12-18 11:20:03 +01:00
David A. Velasco
5be4bf17e1 Adding support to OAuth2 'authorization code' grant type [WIP] 2012-12-18 11:07:05 +01:00
David A. Velasco
e83a73cb9d Avoid the necessity to synchronize the account after the upgrade to 1.3.16 2012-12-10 14:01:45 +01:00
David A. Velasco
2b5bb1fb90 Minimize the number of unnecessary file trasnfers after the upgrade to 1.3.16 for files already in the device 2012-12-06 15:28:12 +01:00
David A. Velasco
f74e7ab11a Merge remote-tracking branch 'origin/sync_review_2' 2012-12-06 14:03:50 +01:00
David A. Velasco
a08c92cf9a Fixed bug in synchronization after adding new field to improve the check of changes in server 2012-12-06 14:02:09 +01:00
David A. Velasco
279670c303 Merge remote-tracking branch 'origin/sync_review_2' 2012-12-05 23:23:10 +01:00
David A. Velasco
abd5f51554 Fixed check of modifications applied in server (still based on modification date) 2012-12-05 16:14:01 +01:00
David A. Velasco
4476c04736 Fixed copy and movement of files to ownCloud local folder with explicit creation of parent directory and target file 2012-12-05 16:01:19 +01:00
David A. Velasco
082c11a1e3 Fixed movement of files: parent folder must be created before move; besides, extra checks to avoid NULL pointers in dialogs 2012-12-05 12:37:37 +01:00
David A. Velasco
80448dc192 Fixed NULL pointers and wrong handling of dialogs 2012-12-05 12:22:26 +01:00
David A. Velasco
8361540852 Fixed lack of File#getUsableSpace() in Android versions previous to GINGERBREAD 2012-12-04 14:36:49 +01:00
David A. Velasco
4558866223 Give the user a chance to move the files selected for an upload when there is not space enough to copy them into the ownCloud folder 2012-12-04 14:20:02 +01:00
David A. Velasco
f68d10abc7 Give the user the option to move all the foreign files into the ownCloud local folder when the try to copy them during an account synchronization failed 2012-12-04 12:49:18 +01:00
David A. Velasco
801d8922d3 Fixed bug: toast message infinitely repeated 2012-11-30 15:10:48 +01:00
David A. Velasco
a7535406d4 Customized error message for uploads when the local file cannot by copied to the ownCloud local directory 2012-11-30 14:39:31 +01:00
David A. Velasco
b59784af89 No more NULL pointers from getDirectoryContent (2) 2012-11-30 13:33:23 +01:00
David A. Velasco
e81a7790eb No more NULL pointers from getDirectoryContent 2012-11-30 13:28:00 +01:00
David A. Velasco
9f8814c557 Fixed bug: toast message infinitely repeated 2012-11-30 13:18:17 +01:00
David A. Velasco
3ef64834e9 Added scroll to generic explanation activity. Enabled the copy of past uploads into ownCloud folder during synchronization. 2012-11-30 11:58:46 +01:00
David A. Velasco
2a913bfbeb Files uploaded in the past are copied to the local ownCloud directory during account synchronization 2012-11-30 11:29:18 +01:00
David A. Velasco
236895e7f8 Refactored app name in strings.xml 2012-11-29 12:26:55 +01:00
David A. Velasco
757f9027f5 Updating language strings; some hardcoded strings moved to strings.xml; workaround for bug in error popup 2012-11-29 11:28:34 +01:00
David A. Velasco
a1c538db20 Some cleanup 2012-11-27 15:15:17 +01:00
David A. Velasco
fd9086a883 New policy: uploaded files are copied to the local storage ownCloud directory bu default 2012-11-27 14:28:19 +01:00
David A. Velasco
b83064eb83 Merge pull request #7 from Mic92/master 
Fix Typos in DbHandler
 2012-11-26 04:05:08 -08:00
David A. Velasco
a7cbc53251 Merge branch 'long_press' 2012-11-23 14:32:58 +01:00
David A. Velasco
ba52dfdf9d Updated 'always download' item in context menu on list of files to 'download / refresh' item , such as in details view 2012-11-23 14:30:36 +01:00
David A. Velasco
e4bc3bdadc Workaround to show hidden accents in options menu 2012-11-23 12:00:26 +01:00
David A. Velasco
4c50eb4d2d Merge of master after sync_review was merged into it 2012-11-23 10:25:06 +01:00
David A. Velasco
3f2081e607 Ensure that FileDownloader and FileUploader events are not lost 2012-11-22 16:40:00 +01:00
David A. Velasco
60d0a121b7 Removal of a folder (or file) not already existing in the server is considered a success 2012-11-22 13:35:07 +01:00
David A. Velasco
658267ad79 Disable rename and remove actions on folders when some file is uploading or downloading inside 2012-11-22 13:06:54 +01:00
David A. Velasco
7fa9885738 Fixed crash when a folder is deleted while some of its contained files is downloading 2012-11-22 10:51:54 +01:00
David A. Velasco
d49bfd0c77 Added title to rename dialog; and some cleaning 2012-11-22 10:24:26 +01:00
David A. Velasco
6de96a9817 Fix conflict dialog to finish the container activity if BACK is pressed 2012-11-21 17:48:56 +01:00
David A. Velasco
ccb796173b Fixed bug: renaming a folder could miss-update the storage path of children not-down files if a download file is in the folder 2012-11-21 16:28:20 +01:00
David A. Velasco
f03852032f Fixed old bug reintroduced in instant uploads 2012-11-21 16:19:27 +01:00
David A. Velasco
70c663008b Fixed rename of local copy of files 2012-11-21 14:48:34 +01:00
David A. Velasco
d0b7df16e7 Fixed database update due to renaming folders 2012-11-21 14:32:40 +01:00
David A. Velasco
db0e2d0186 Reviewed values set to OCFile#mLastSyncDateForData 2012-11-21 08:54:15 +01:00
David A. Velasco
9c3dc6d850 Fixed crash in initialization of FileObserverService 2012-11-20 14:48:44 +01:00
David A. Velasco
38a80be828 Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog is used 2012-11-20 14:41:04 +01:00
David A. Velasco
195b009212 Fixed 'keep both' action in conflicts dialog (both resulting file were linked to the same local file in the device) 2012-11-20 14:12:32 +01:00
David A. Velasco
69ac5b6bfb ConlictsResolveActivity is finished when the user cancels the ConflictsResolverDialog 2012-11-20 11:40:58 +01:00
David A. Velasco
3fd56ecff8 Fixed bug: inconsistency in isDown() state due to old OCFile object being saved in the OwnCloudFileObserver instances 2012-11-20 11:28:27 +01:00