masensio
f849570b0a
Merge branch 'develop' into more_concrete_error_messages_session_expires
2014-05-26 08:52:38 +02:00
David A. Velasco
8a74431926
Fixed reinit of video preview on rotations from portrait to landscape (tablets only) ; removed unneeded reinit of second fragment
2014-05-23 14:20:55 +02:00
David A. Velasco
869b92ffd6
Fixed recovery on file state in PreviewFragment on rotations
2014-05-23 14:03:35 +02:00
masensio
121887c899
Use the new strings for upload and download fails when it is necessary
2014-05-23 13:34:21 +02:00
David A. Velasco
12820ba757
Make username case insensitive
2014-05-23 11:21:48 +02:00
masensio
41cee846cf
Changes in OCFileListFragment from comments in PR#500
2014-05-20 14:25:53 +02:00
masensio
9740acc17e
Changes in FileDisplayActivity from comments in PR#500
2014-05-20 14:20:17 +02:00
masensio
e790c8f83f
Changes in FileDataStorageManager from comments in PR#500
2014-05-20 14:01:55 +02:00
masensio
27ff23740c
Fix: It says 'Rename could not be completed' but it's done when renaming from detail view
2014-05-20 13:16:01 +02:00
masensio
a9bfb401d5
Fix: Loading icon is there when coming back to the app
2014-05-20 12:15:26 +02:00
David A. Velasco
8385525aaa
Fixed accidental refresh when sending media file to other app
2014-05-20 11:24:50 +02:00
David A. Velasco
1664299bd2
Fixed local removal of files when a folder is removed locally and holds local files currently out of sync
2014-05-20 10:30:02 +02:00
David A. Velasco
0004e39023
Removed not working file sync option in gallery
2014-05-19 15:18:13 +02:00
masensio
81fd95ad6f
Merge pull request #495 from owncloud/fixed_loading_dialog_dismissed_on_rotation
...
Fixed loading dialog dismissed on rotation
2014-05-19 13:31:37 +02:00
David A. Velasco
8d6f908bde
REAL New fix for loading dialog never disapearing when app is restarted after going with HOME while loading
2014-05-19 13:20:52 +02:00
masensio
ee53304947
Fix: Menu is not refreshed on the gallery view
2014-05-19 12:43:50 +02:00
David A. Velasco
733c8147ad
Review of calls to super. in Activity/Fragment life cycle methods
2014-05-19 11:56:29 +02:00
David A. Velasco
423ac76702
New fix for loding dialog never disapearing when app is restarted after going with HOME while loading
2014-05-19 11:55:54 +02:00
David A. Velasco
cdfa678679
Loading dialog not dismissed on pause
2014-05-19 11:18:30 +02:00
masensio
fa97fe545f
Merge pull request #494 from owncloud/fixed_restart_of_cancelled_download_after_changing_device_orientation
...
Fixed restart of cancelled download after changing device orientation
2014-05-19 10:50:26 +02:00
David A. Velasco
97b36b2335
Fixed restart of cancelled download
2014-05-19 10:35:49 +02:00
masensio
d4729a6a77
Fix: Yellow arrow is not shown when downloading a file
2014-05-19 10:29:05 +02:00
masensio
8417810079
Merge pull request #493 from owncloud/fixed_not_performed_renamed_when_device_is_rotated_while_showing_dialog
...
Fixed not performed rename when device is rotated while showing dialog
2014-05-16 15:06:12 +02:00
David A. Velasco
dfdc713a15
Created new dialog classes for file renaming and folder creations
2014-05-16 14:57:19 +02:00
masensio
9a9d4e0677
Fix: File can not be shown after several actions
2014-05-16 14:25:18 +02:00
masensio
6f84897197
Fix: Loading icon is on the screen forever when leaving the app after sharing a file
2014-05-16 12:57:20 +02:00
masensio
161a72b350
Merge pull request #492 from owncloud/fixed_lost_autologin_after_file_operations_when_credentials_were_changed
...
Fixed lost autologin after file operations when credentials were changed
2014-05-16 11:02:57 +02:00
masensio
d700cde6c5
Fix again: Download is started over and over when rotating the device
2014-05-16 10:59:01 +02:00
David A. Velasco
d76b8fcdf7
Recover automatic redirection to login view when a foreground operation was tried with expired credentials
2014-05-16 09:58:10 +02:00
masensio
176f02fb04
Fix: Video is not previewed when tapping on it
2014-05-16 09:13:14 +02:00
masensio
1f2ed52338
Merge pull request #490 from owncloud/fixed_left_details_fragment_when_file_is_removed
...
Fixed left details fragment when file is removed
2014-05-15 16:33:11 +02:00
David A. Velasco
b2e14a93df
Fixed crash / left fragment after two rotations while removing video file
2014-05-15 16:21:16 +02:00
masensio
f0ea0b3dc6
Fix: The path in the action bar is wrong after deleteing a file and changing the orientation
2014-05-15 15:17:43 +02:00
masensio
3fb28ceae4
Fix: App crashes when renaming or deleting a video and rotate
2014-05-15 11:24:27 +02:00
masensio
f359d11a4d
Fix: Download is started over and over when rotating the device
2014-05-15 09:34:58 +02:00
masensio
8d7baab460
Fix: File list is not refreshed after changing the orientation of the device and other actions
2014-05-14 17:20:35 +02:00
masensio
01c776bfb4
Fix: app says thas has to stop when removing a image from the gallery
2014-05-14 09:33:24 +02:00
David A. Velasco
cfbbece869
Fixed bug in setting of listener for dialog fragment
2014-05-12 13:43:21 +02:00
David A. Velasco
e0dc1e2b92
Optimized binding to OperationsService to grant no result is lost
2014-05-12 13:34:02 +02:00
masensio
df4ae2eb35
Move execution of 'refresh file' operation to OperationsService
2014-05-12 12:54:28 +02:00
David A. Velasco
b600b2d30a
Fixed refresh of details fragment in landscape tablet when upload finishes
2014-05-12 12:33:31 +02:00
David A. Velasco
21d3282c8a
Refactored handle of user response in confirmation dialog for file removal to avoid duplication
2014-05-12 11:28:22 +02:00
David A. Velasco
6cb184ab63
Joint local removal of files to RemoteFileOperation to fix refresh of UI
2014-05-12 09:59:19 +02:00
David A. Velasco
288dbd6348
Fixed inconsistencies in file actions shown in menus according to the target file state
2014-05-09 14:56:57 +02:00
masensio
7295820d57
Add CreateFolderOperation to OperationsService
2014-05-08 17:13:45 +02:00
David A. Velasco
38e0f06fb8
Removed unneeded casts to FileDisplayActivity
2014-05-08 16:41:16 +02:00
David A. Velasco
2f2570bbc5
Refactored menu filtering in a single class FileMenuFilter
2014-05-08 16:35:34 +02:00
masensio
7906a9622c
Clean code: remove some commented code
2014-05-08 15:58:26 +02:00
masensio
92f403494b
Add RemoveOperation to OperationsService
2014-05-08 15:08:27 +02:00
masensio
ffb5702b2d
Add RenameOperation to OperationsService
2014-05-08 10:39:55 +02:00
David A. Velasco
26eed9132e
Fixed wrong field override breaking options menu in PreviewMediaFragment and PreviewImageFragment
2014-05-07 17:05:33 +02:00
David A. Velasco
e42fcc1e32
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
2014-05-07 10:03:41 +02:00
masensio
69fa5b9185
Enable necessary refresh in FileDisplayActivity. Delete onFileStateChanged in ContainerActivity
2014-05-07 09:46:25 +02:00
David A. Velasco
3adb39a15e
Review and reenable calls to refresh list of files where necessary, for events out of OnRemoteOperationListener flow
2014-05-07 09:46:20 +02:00
David A. Velasco
b86059bf83
Moved UploadFinishReceiver from FileDetailFragment to FileDisplayActivity
2014-05-06 14:07:47 +02:00
masensio
53a168c5a6
Revert "FileListListAdapter is a SimpleCursorAdapter"
...
This reverts commit 44dae87d2f
2014-05-06 13:28:26 +02:00
masensio
f119a13a30
Revert "Add mCursor to FileListListAdapter"
...
This reverts commit 85b6d7a987
2014-05-06 13:22:59 +02:00
masensio
4e9becbc97
Revert "FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration"
...
This reverts commit 65c7d5d5ba
2014-05-06 13:15:04 +02:00
masensio
f2d4ae877f
Revert "Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted"
...
This reverts commit c9626772a1
2014-05-06 13:04:23 +02:00
masensio
9804b40839
Revert "Update filelist for insert actions, sent notification to uri in FileContenProvider"
...
This reverts commit 4834fe15c7
2014-05-06 12:56:42 +02:00
masensio
97e4d690da
Revert "Update filelist for update actions, sent notification to uri in FileContenProvider"
...
This reverts commit 8283b301e1
2014-05-06 12:56:19 +02:00
masensio
e5c3f2eaa5
Revert "Grant that the content of the previous adapter is updated with rotations"
...
This reverts commit 9820893fd9
2014-05-06 12:55:21 +02:00
masensio
40b5fb8156
Revert commit 6cdd830a7b
2014-05-06 12:54:13 +02:00
David A. Velasco
c6edcab5a2
Merge remote-tracking branch 'origin/refactor_update_filelist_from_database' into refactor_update_filelist_from_database
2014-05-06 10:58:19 +02:00
David A. Velasco
bea36f23b0
Refactoring relationship between FileActivities and FileFragments (WIP)
2014-05-06 10:54:23 +02:00
masensio
6cdd830a7b
Additional changes to apply the new code to the other FileFragments: PreviewMediaFragment, DetailsFragment, PreviewImageFragment
2014-05-05 14:10:15 +02:00
masensio
9820893fd9
Grant that the content of the previous adapter is updated with rotations
2014-05-05 10:44:43 +02:00
masensio
8283b301e1
Update filelist for update actions, sent notification to uri in FileContenProvider
2014-05-02 14:33:23 +02:00
masensio
4834fe15c7
Update filelist for insert actions, sent notification to uri in FileContenProvider
2014-05-02 14:32:01 +02:00
masensio
c9626772a1
Add FileListCursorLoader. Update data using CursorLoader and LoaderManager. Update filelist when a file/folder is deleted
2014-05-02 14:24:00 +02:00
David A. Velasco
5b32faae4d
Refactoring to reduce dependencies and duplicated code (WIP)
2014-04-30 18:37:55 +02:00
David A. Velasco
6c33cefba0
WIP - commented pull-refreshes of list view as previous step to trust refresh to observer registered by Cursor
2014-04-29 13:53:11 +02:00
David A. Velasco
65c7d5d5ba
FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter for more flexible integration
2014-04-29 13:17:33 +02:00
masensio
85b6d7a987
Add mCursor to FileListListAdapter
2014-04-28 13:56:17 +02:00
masensio
44dae87d2f
FileListListAdapter is a SimpleCursorAdapter
2014-04-28 12:09:07 +02:00
David A. Velasco
e7a6a68531
Minimized imports
2014-04-22 12:30:15 +02:00
David A. Velasco
e2f0af1c26
Fixed lost automatic check of OC server on enforced update of password
2014-04-21 14:49:00 +02:00
David A. Velasco
37b44a551a
Fixed crash when browsing app from instantUploads folder after entering into the app from a notification
2014-04-21 14:27:06 +02:00
David A. Velasco
68f4ceb5a7
Separate options to enable & disable instant upload of new pictures and new videos
2014-04-21 10:49:31 +02:00
David A. Velasco
ffdc77f8d8
Fixed crash when clicking on an error notification due to wrong credentials
2014-04-16 20:13:35 +02:00
David A. Velasco
33b0909e7b
Merge branch 'develop' into videoInstandUploads
2014-04-16 19:31:27 +02:00
David A. Velasco
e8d969f032
Allow instant upload of new videos although not using Wi-Fi, with the same policy as pictures
2014-04-16 19:30:01 +02:00
masensio
b96cce8384
Fix bug: When accessing an coming back several times, the folder is hidden
2014-04-09 17:37:57 +02:00
masensio
e5ab756691
Add some comments for VideoInstantUploads
2014-04-08 14:58:41 +02:00
masensio
086985ad26
Fix bug: App crashes when coming back from a folder of second level
2014-04-08 13:58:27 +02:00
masensio
e8e1c7a0af
Grant InstantUpload feature works as before.
2014-04-08 13:02:59 +02:00
masensio
3351db6527
Merge branch 'develop' into videoInstandUploads
2014-04-08 12:50:50 +02:00
masensio
d3ecaa5a38
Fix bug: folder is not shown after accessing to it and coming back
2014-04-08 11:27:44 +02:00
masensio
2b06f07b17
Merge branch 'develop' into save_position_in_scroll_when_browsing
2014-04-08 09:29:47 +02:00
masensio
cbdcf7d457
Disable extra logs
2014-04-07 15:21:21 +02:00
David A. Velasco
0b0cc609c9
Fixed broken life cicle in FileActivity
2014-04-07 14:09:43 +02:00
David A. Velasco
f24e56d19d
Removed commented code and remaining forced exception
2014-04-07 11:14:44 +02:00
David A. Velasco
a3798996e1
Recovered some extra logs before validating
2014-04-07 10:24:43 +02:00
David A. Velasco
12bbc51dcb
Preventing hash colisions in identifier of operations
2014-04-07 10:22:08 +02:00
David A. Velasco
8d38fd331d
Simplified interface to request 'lost results' during rotation of Activity
2014-04-07 09:24:57 +02:00
masensio
baa585550d
Enable extra logs before validation to fix easily any possible bug
2014-04-04 15:05:21 +02:00
masensio
c1df34b5e3
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-04-04 14:50:46 +02:00
masensio
d535c420f2
Grant that OperationsService doesn't keep old saved results forever
2014-04-04 14:49:20 +02:00
David A. Velasco
8f5ab8df08
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-04-04 14:19:05 +02:00
David A. Velasco
7cf05f3647
Internal refactorization of AccountAuthenticatorActivity (and related dependencies)
2014-04-04 14:18:42 +02:00
masensio
46e949c826
Grant Share and Unshare work properly.
2014-04-04 12:57:25 +02:00
masensio
40f5eb6de6
Grant that same result is never processed twice by the same listener (one through callback, one through getResult)
2014-04-03 17:24:03 +02:00
masensio
5b7c5f6244
Take care with orientation changes when save and restore scroll position
2014-04-03 14:56:31 +02:00
masensio
20e3a5f420
Save the scroll position when moving between folders. REstore scroll position
2014-04-03 14:36:55 +02:00
David A. Velasco
0024569aff
AuthenticatorActivity clean up: removed commented code and warnings
2014-04-02 12:46:54 +02:00
masensio
eb95be232f
Run GetRemoteUserNameOperation in OperationsService
2014-04-02 09:46:40 +02:00
David A. Velasco
e566d041d1
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-04-01 15:17:33 +02:00
masensio
c2c10bcff8
Run ExistenceCheckRemoteOperation on OperationsService
2014-04-01 14:51:53 +02:00
masensio
5ac1a1ebbb
Merge branch 'develop' into operations_service
2014-04-01 14:18:32 +02:00
David A. Velasco
0addc90ae5
Moved OAuth2GetAccessToken to be run in OperationsService
2014-04-01 13:56:08 +02:00
David A. Velasco
08aa08ce60
Moved execution of GetServerInfoOperation into OperationsService
2014-04-01 11:59:38 +02:00
David A. Velasco
022c555aca
GetRemoteStatusOperation and DetectAuthenticationMethodOperations are joint in GetServerInfoOperation
2014-04-01 11:41:11 +02:00
David A. Velasco
11f5a299bd
Modifies OperationsService so that activities can request the resulf of operations finished while the activity was 'rotating'; and applie to DetectAuthenticationMethodOperation
2014-03-31 13:14:47 +02:00
masensio
2628eceb6b
Modify DetectAuthenticationMethodOperation so that , when returning its result through the callback, there is no crash if AuthenticatorActivity is not ready (rotating)
2014-03-28 15:04:10 +01:00
masensio
2812120456
Add webdav url to DetectAuthenticationMethodOperation
2014-03-28 14:51:36 +01:00
David A. Velasco
7c4fc0486f
Merge remote-tracking branch 'origin/operations_service' into operations_service
2014-03-28 12:57:44 +01:00
masensio
f991e1e91d
Modify OperationsService so that AuthenticatorActivity may ask for the execution of DetectAuthenticationMethodOperation in the service
2014-03-28 12:57:18 +01:00
David A. Velasco
565875d753
AuthenticatorActivity is bound to OperationsService when created
2014-03-28 12:55:07 +01:00
masensio
53a2789326
Check the version number instead of the version string
2014-03-27 18:01:37 +01:00
masensio
1195c6dba3
Check the version number taking into account the new format
2014-03-27 09:45:41 +01:00
David A. Velasco
fb9f7797f4
Fixed detection of authentication method in server with permanent redirection
2014-03-26 08:34:39 +01:00
David A. Velasco
afaa4b2df3
Fixed lost text in notifications for failed uploads
2014-03-25 08:52:05 +01:00
David A. Velasco
571fdba15e
Fixed crash after app updates due to changed serialization id in RemoteOperationResult
2014-03-24 13:18:23 +01:00
masensio
1bda7e1e87
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-24 09:31:43 +01:00
masensio
4191f66593
Merge pull request #445 from owncloud/remove_refresh_of_shares_in_full_sync
...
Removed refresh of shares in full synchronization
2014-03-21 14:56:46 +01:00
masensio
dca770be6a
Modify AuthenticatorActivity#detectAuthorizationMethod so that it triggers a DetectAuthorizationOperation when called. Modifiy AuthenitcatorActivity#onRemoteOperationResult to process the response of DetectAuthorizationOperation
2014-03-21 14:51:56 +01:00
David A. Velasco
d20c1e4141
Implemented analysis in DetectAuthenticationMethodOperation to find out what authentication method requires the server side
2014-03-21 13:42:39 +01:00
David A. Velasco
bef5d5c5f8
Added skeleton of new operation to detect authentication method in the server side
2014-03-21 12:03:25 +01:00
David A. Velasco
a3bf6883fc
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-21 11:02:36 +01:00
masensio
7ed3179100
Merge branch 'develop' into improve_notifications_pr_400_with_develop
2014-03-21 10:37:11 +01:00
masensio
2d6826fe8b
Merge pull request #400 from tommyd3mdi/develop
...
Notification improvements
2014-03-21 10:32:49 +01:00
David A. Velasco
0336eced64
Fixed lost of 'shared' attribute during full synchronization process for already known shares
2014-03-21 09:05:19 +01:00
David A. Velasco
4f4c6843a7
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-20 17:48:23 +01:00
masensio
4ae57b5bea
Changes from comments in PR#443
2014-03-20 16:51:00 +01:00
masensio
c6f0847866
Changes from comments in PR#443
2014-03-20 16:15:59 +01:00
masensio
3064f1fc4b
Changes from comments in PR#442, in oc-project
2014-03-20 15:35:23 +01:00
masensio
d9219441b1
Revert "Changes from comments in PR#442, in oc-project"
...
This reverts commit 0aa9a0bc6c
2014-03-20 14:01:35 +01:00
masensio
0aa9a0bc6c
Changes from comments in PR#442, in oc-project
2014-03-20 13:52:34 +01:00
David A. Velasco
604abaf3b4
Grant that progress bar in notifications is shown in Android 2.x and 3.x devices
2014-03-20 10:43:06 +01:00
masensio
b0cfec7a00
Add auth_unsupported_basic_auth string
2014-03-20 09:08:02 +01:00
masensio
432d696432
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-19 17:57:56 +01:00
masensio
1fb1a3294e
Merge branch 'develop' into share_link__reuse_link_shared_in_server
2014-03-19 17:22:31 +01:00
masensio
738ea33c06
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-19 17:17:55 +01:00
masensio
d326d100ed
Revert "Prevent that full synchronization process browses deeper when already knows no change exists under the current folder"
...
This reverts commit dabcf4dce4
2014-03-19 17:00:27 +01:00
masensio
71e049394e
OC-3390: Shows message about 'not support authentication' under server address
2014-03-19 10:07:56 +01:00
masensio
3e108163bc
Merge branch 'develop' into regular_authentication_in_saml_server
2014-03-19 08:55:37 +01:00
masensio
705bee08fa
OC-3390: Message is shown in the login screen instead of an alert message: Change the alert dialog by an error message under server address
2014-03-18 15:13:50 +01:00
masensio
0d2c764638
Merge branch 'develop' into remove_refresh_of_shares_in_full_sync
2014-03-18 14:43:34 +01:00
masensio
c80357f750
OC-3386:(Fix bug) An alert saying 'trying to login' is shown before clicking the to connect
2014-03-18 14:41:25 +01:00
masensio
b124167f50
Merge pull request #395 from dontcallmedom/master
...
allow multi-line checkbox for preferences with long titles
2014-03-18 14:28:17 +01:00
masensio
d10c10532f
OC-3381: (Fix bug) In preferences, the 'instant upload via WIFI' field is multiline but only use two lines instead of three
2014-03-18 13:40:28 +01:00
masensio
6e86dfb001
OC-3376: 'manage account' field is multiline, in preferences
2014-03-18 13:36:16 +01:00
masensio
a043bcd8de
OC-3314: Modify CreateShareOperation#run in the application so that it uses GetRemoteSharesForFileOperation() to get a remote link in the server (if exists) and use it without creating a new one
2014-03-18 12:51:15 +01:00
masensio
d01e065586
OC-3261: Fix a problem when trying to detect the kind of authentication. Add new AlertMessageDialog. Show an alert message if it is necessary a different authentication method
2014-03-17 13:39:03 +01:00
David A. Velasco
dabcf4dce4
Prevent that full synchronization process browses deeper when already knows no change exists under the current folder
2014-03-17 13:02:36 +01:00
David A. Velasco
5d53f3c0ba
Recursive refresh of folders in full synchronization does not retrieve information about shares
2014-03-17 12:28:54 +01:00
masensio
eda6ddd98f
OC-3260: Detect authentication method
2014-03-17 10:29:24 +01:00
David A. Velasco
7ab8ee7d4a
Progress bar in notifications is hidden when download/upload finishes
2014-03-14 14:29:25 +01:00
David A. Velasco
35bf347759
Grant that notifications of finished downloads can be removed from notification are without clicking on
2014-03-14 14:18:52 +01:00
masensio
4299d1e650
Correction in license of CheckBoxPreferenceWithLongTitle
2014-03-13 15:59:40 +01:00
masensio
9b2e4a6063
Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
2014-03-13 15:49:17 +01:00
masensio
2ab9496b6e
Merge branch 'pr/395' into allow_multiline_checkbox_preferences_pr_395_with_develop
2014-03-13 10:39:22 +01:00
masensio
834c98644b
Remove some import warnings
2014-03-12 10:53:32 +01:00
David A. Velasco
5338b93604
Fixed wrong reload of SAML web dialog after rotation when the SSL-error dialog is visible over it
2014-03-12 10:32:05 +01:00
masensio
41efad3804
Merge branch 'develop' into check_server_certificates_in_SSO_webview
2014-03-12 08:44:56 +01:00
Thomas Keller
5eccd08bc7
Notification improvements:
...
- use NotificationCompat.Builder from the support library and remove the custom progressbar layout; this will give platform users the expected look and feel of a notificati
- remove OCNotificationManager (it contained the old layout references, but was unused)
- add new notification icons that follow the Android style guidelines (http://developer.android.com/design/style/iconography.html#notification )
2014-03-12 00:08:51 +01:00
masensio
207a52f422
OC-3242: Add new error message for fail in GetUserName. No changes in library reference
2014-03-11 14:43:48 +01:00
masensio
660f97baab
Revert "OC-3242: Add new error message for fail in GetUserName"
...
This reverts commit 564bbf7bb8
2014-03-11 14:40:38 +01:00
masensio
564bbf7bb8
OC-3242: Add new error message for fail in GetUserName
2014-03-11 13:56:41 +01:00
David A. Velasco
8c6f415ed4
Ssl-error dialogs joint in a single one that uses different adapters to update its view depending on the classes providing the information
2014-03-11 11:39:19 +01:00
masensio
101cbbe492
Merge branch 'develop' into check_server_certificates_in_SSO_webview
2014-03-10 11:08:42 +01:00
masensio
45bc02fbe5
OC-3212: Show appropiate error messages for SslError in SSL error dialog shown by WebViewClient
2014-03-10 10:53:11 +01:00
masensio
9cac3b60a5
Merge branch 'add_ssl_warning_dialog_for_devices_without_access_to_X509Certificte_in_WebView_SSL_errors' into check_server_certificates_in_SSO_webview
2014-03-07 15:11:59 +01:00
masensio
6944503874
OC-3208: Unify both SSL dialogs taking information from X509Certificate in just one
2014-03-07 14:48:42 +01:00
David A. Velasco
a2be11ad54
Improved view of certificate details for SSL dialog based on SslCertificate
2014-03-07 14:39:30 +01:00
David A. Velasco
6bab28424a
Added new dialog for SSL errors showing information saved in SslCertificate
2014-03-07 13:44:13 +01:00
masensio
517bde6aae
OC-3196: Rewrite according to comments in PR#420
2014-03-07 09:38:42 +01:00
masensio
8e1a2573b9
OC-3116: Add a warning dialog for untrusted SslCertificates and show it instead of call proceed() directly
2014-03-06 18:26:35 +01:00
David A. Velasco
ebcc9b98e3
Alternative solution for fix in 10f99ceb9ca... enforcing dialog dissmiss instead of introducing false specific onConfigurationChange
2014-03-06 16:29:21 +01:00
masensio
e280f5e618
Add License in LoadindDialog
2014-03-05 12:44:09 +01:00
masensio
1ace8a21ef
OC-3163: Check if the certificate is in the app cetificates repository (mKnownServers of NetworkUtils)
2014-03-05 12:16:48 +01:00
masensio
ee79b7a9a9
OC-3111: Check in SsoWebViewClient#onReceivedSslError() if the failed X509Certificate is accesible
2014-03-05 10:20:56 +01:00
masensio
56853acff0
Won't Fix:
...
Revert "OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file"
This reverts commit df4d0355f2
2014-03-04 13:28:07 +01:00
masensio
df4d0355f2
OC-3121: (fix bug) An empty message is sent, when renaming a file in the web of a big file
2014-03-04 11:58:30 +01:00
masensio
77b7f99d66
OC-3097: (fix bug) When the connection is lost during a download, app thinks that the download is finished
2014-02-28 13:56:33 +01:00
masensio
1b77e7f846
Hotfix on develop: Show share file instead send_file for folders
2014-02-27 12:32:28 +01:00
masensio
ac836eddb7
Merge branch 'develop' into send_file_pr311_with_develop
2014-02-27 08:40:17 +01:00
masensio
aaba7b2725
OC-3097:(fix bug) When the connection is lost during a download, app thinks that the download is finished
2014-02-26 17:23:18 +01:00
masensio
10f99ceb9c
OC-3079: (fix bug) Two send options appear after send and mail with a ownCloud file
2014-02-26 11:05:25 +01:00
masensio
21a6560375
OC-3087: (fix bug) The loading doesn't deissapear during the download process
2014-02-26 10:28:21 +01:00
masensio
b230388f63
OC-3082: The file list is white after send a not downloaded file
2014-02-25 14:40:44 +01:00
masensio
7c0865ae0f
OC-3078: (Fix bug) Appear 'Copy link' option on the send menu
2014-02-25 11:18:43 +01:00
masensio
64452b60f6
OC-3050: Grant the filelist doesn't refresh unnecessary because of the old update folder size
2014-02-24 13:54:03 +01:00
masensio
c8fc9cfa70
Merge branch 'develop' into remove_folder_size_info
2014-02-24 13:37:48 +01:00
masensio
af1f880b27
Merge branch 'develop' into send_file_pr311_with_develop
2014-02-24 13:33:23 +01:00
masensio
271078a403
Merge branch 'master' into develop
2014-02-24 13:16:57 +01:00
masensio
a5215ce89e
OC-3049: Remove the database update for the folder size data: modify FileContentProvider and FileSyncAdapter.
2014-02-24 10:51:44 +01:00
masensio
049f659f77
OC-3049: Remove the database update for the folder size data
2014-02-21 14:46:09 +01:00
masensio
422f87c57f
OC-3047: Hide the file size when the file is a folder
2014-02-21 14:06:02 +01:00
David A. Velasco
6faa40fde5
Fixed problems unsharing links when other kind of shares exist on a file
2014-02-20 15:00:52 +01:00
David A. Velasco
42fc189367
Implemented option to copy shared link in clipboard instead of trusting in external clipboard front-ends
2014-02-19 18:00:49 +01:00
David A. Velasco
7a4ac19993
Version server is checked every time the root folder is refreshed, and both version and versionstring are in the server are saved locally
2014-02-19 12:28:24 +01:00
masensio
8db07c67b6
OC-3016: Add option 'send_files_to_other_apps' with default value 'on'
2014-02-19 10:33:27 +01:00
masensio
9343650e84
Merge branch 'develop' into send_file_pr311_with_develop
2014-02-19 08:51:58 +01:00
masensio
3b4baa1faa
Merge pull request #405 from owncloud/wide_scope_library_clean_up
...
Wide scope library clean up
2014-02-18 15:16:22 +01:00
masensio
8e0ecc6570
Update License in OwnCloudAccount.java
2014-02-18 15:15:22 +01:00
David A. Velasco
0f99af779e
Merge branch 'share_link__unshare_file' into release-1.5.4
2014-02-18 11:16:22 +01:00
masensio
a6aec931a7
OC-2971: Grant action is working in other views: Details, Videos, MP3 Player and Images
2014-02-18 09:45:20 +01:00
masensio
6cf78042b0
OC-2968: Filter out ownCloud from the list of apps able to receive the file
2014-02-17 13:54:02 +01:00
David A. Velasco
4f7cd3ef94
Adapted to relocation of RemoveRemoteShareOperation in library
2014-02-17 13:08:18 +01:00
David A. Velasco
9e0f02131f
Merge branch 'share_link__unshare_file' into wide_scope_library_clean_up
2014-02-17 13:01:55 +01:00
masensio
9b1a549226
OC-2967: Grant that files are downloaded automatically when the action is triggered on files not down
2014-02-17 12:44:08 +01:00
masensio
a5db2c2f68
HotFix to add Send File option, after PR#311
2014-02-17 09:16:29 +01:00
masensio
99686805e1
Merge branch 'develop' into send_file_pr311_with_develop
2014-02-17 08:45:52 +01:00
masensio
7ead9a0fe4
Merge pull request #311 from tobiasKaminsky/develop
...
Added support for sharing files:
2014-02-14 14:59:24 +01:00
masensio
4bb987e7b7
OC-2976: (Fix bug) App crashes when sharing a mp3 and other things
2014-02-14 13:36:47 +01:00
David A. Velasco
e943804c19
App adapted to renamed classes in owncloud-android-library
2014-02-14 13:20:59 +01:00
David A. Velasco
ba2dbeb735
Updated references to reordered classes in owncloud-android-library
2014-02-14 12:54:11 +01:00
masensio
42834b213a
OC-2966: Change name of the action from 'Share' to 'Send'
2014-02-14 12:38:38 +01:00
masensio
065a9c0046
OC-2966: Change name of the action from 'Share' to 'Send'
2014-02-14 12:13:58 +01:00
masensio
296df1bb65
Merge branch 'pr/311' into pull_request_311_with_develop
2014-02-14 10:59:26 +01:00
masensio
6d8e8ca072
OC-2927: (Fix bug) App crashes when sharing a mp3 while it's playing
2014-02-14 10:19:52 +01:00
masensio
dce02bd01f
OC-2923: (fix bug) Filelist is not refreshed after changing the orientation of the device and sharing
2014-02-13 09:47:31 +01:00
masensio
f51977d9ea
OC-2922: Fix the bug: Menu in the gallery is not refresh after share or unsharing a file
2014-02-12 18:38:18 +01:00
David A. Velasco
397fa5904a
Prevent stuck progress dialog, but well done
2014-02-12 12:45:47 +01:00
David A. Velasco
858ca289f6
Prevent stuck progress dialog
2014-02-12 12:42:07 +01:00
David A. Velasco
8394350082
Fixed subscription of stopped FileActivities as listeners for results of operations in OperationsService
2014-02-12 12:33:45 +01:00
David A. Velasco
7b4afce57e
Removed legacy code
2014-02-12 11:47:07 +01:00
masensio
822245d11d
OC-2918: Fix bug: It's not possible to share a file in samsung galaxy mini. (Some strings comparisons are wrong in OperationService#onStartCommand)
2014-02-12 10:28:30 +01:00
masensio
cf348fc6d9
OC-2887: Fix bug, refresh share icon, share menu refresh
2014-02-11 15:23:34 +01:00
David A. Velasco
cae7744ae1
Fixed release of connection between FileActivity and OperationService
2014-02-11 14:57:37 +01:00
masensio
04f5cf170f
Commit previous to fix bug about refresh share status in filelist, OC-2887
2014-02-11 13:57:23 +01:00
David A. Velasco
77870373d9
Fixed bug in callbacks from OperationsService, a Handler is needed to access the main thread from other
2014-02-11 11:37:52 +01:00
David A. Velasco
b015886bd2
Merge pull request #398 from owncloud/share_link__unshare_file__share_in_operation_service
...
Share link unshare file share in operation service
2014-02-11 11:08:44 +01:00
masensio
b599f945e6
OC-2895: Move execution of UnshareOperation to OperationsService
2014-02-11 10:53:30 +01:00
masensio
e9ce426cdc
OC-2896: Move execution of CreateShareOperation to OperationsService
2014-02-11 10:35:25 +01:00
David A. Velasco
e64a3cbf35
All the FileActivities bind to OperationsService on creation, and the later reports them when an operation finishes
2014-02-11 10:29:01 +01:00
Dominique Hazael-Massieux
d290db9ab6
allow multi-line checkbox for preferences with long titles
...
inspired from http://stackoverflow.com/questions/2408708/show-extra-info-for-preference-screens-when-checkboxpreference-summary-field-is
2014-02-10 15:00:34 +01:00
masensio
8d62faf6c4
Merge remote-tracking branch 'origin/share_link__unshare_file' into share_link__unshare_file
2014-02-10 11:28:36 +01:00
masensio
9df401a7cd
OC-2880: fix bug In the detail view, changing the orientation of the device and unsharing, menu is not refreshing, for images view
2014-02-10 11:27:49 +01:00
David A. Velasco
61f36d2a93
Fixed local state of file after a successful reupload
2014-02-10 09:42:39 +01:00
masensio
eb2d8e28dc
Merge remote-tracking branch 'origin/share_link__unshare_file' into share_link__unshare_file
2014-02-10 09:37:23 +01:00
masensio
15309cac8b
OC-2880: Fix bug: In the detail view, changing the orientation of the device and unsharing, menu is not refreshing
2014-02-10 09:36:46 +01:00
David A. Velasco
3e6de92847
Fixed wrong local state of a file after a download finishes
2014-02-10 09:29:33 +01:00
masensio
7cf9c82cc0
OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown
2014-02-07 13:25:53 +01:00
masensio
eb7bbebc08
OC-2868: Fix bug: Unshare a file that does not exist any more, no message is shown
2014-02-07 12:54:52 +01:00
David A. Velasco
2bf0864806
Fixed issue 308 - crash when other apps hold accounts with the same name, different type
2014-02-07 12:34:20 +01:00
David A. Velasco
ffa7b51784
Merge branch 'develop' into release-1.5.4
2014-02-07 12:04:02 +01:00
masensio
ebbc1793e2
Merge branch 'develop' into share_link__unshare_file
2014-02-07 12:02:38 +01:00
David A. Velasco
cba8baa98d
Merge branch 'share_link__new_share' into release-1.5.4
2014-02-07 09:23:40 +01:00
masensio
fdedbaa18f
OC-2859: Refix the bug. Unshare option shouldn't appear in non-shared files/folders
2014-02-07 09:11:08 +01:00
David A. Velasco
dd7d44ed32
Considered servers without sharing support
2014-02-07 08:59:11 +01:00
David A. Velasco
0fde0084e2
Merge branch 'share_link__new_share' into share_link__refresh_shares_folder_per_folder
2014-02-06 20:16:14 +01:00
David A. Velasco
da4aaa5aa1
Recovered sendStickyBroadcast instead of LocalBroadcastManager#sendbroadcast; events were lost on screen rotations
2014-02-06 20:10:21 +01:00
David A. Velasco
533924f538
Get share resources ONLY for the current folder being refreshed
2014-02-06 19:54:29 +01:00
masensio
d1aca3a171
OC-2859: Fix bug: Unshare option shouldn't appear in non-shared files/folders
2014-02-06 19:10:08 +01:00
David A. Velasco
4db5295f56
Merge branch 'share_link__new_share' into setup_additions
2014-02-06 13:58:41 +01:00
David A. Velasco
fc09783c1d
Added HookActivity for integration of external SDKs
2014-02-06 12:18:03 +01:00
masensio
1bdf1e60f1
Merge branch 'share_link__new_share' into share_link__unshare_file
2014-02-06 11:23:30 +01:00
masensio
45b73934fa
OC-2841: Fix bug: Folder doesn't refresh and loading is in the action bar for more than 12 minutes
2014-02-06 11:13:36 +01:00
David A. Velasco
f0477ef854
Updated code to compose recommendation text for friends so that it allows the inclusion of the username
2014-02-06 09:30:36 +01:00
David A. Velasco
08cec8f7a2
Allow setup of display name in the action bar for root folder
2014-02-05 19:10:08 +01:00
masensio
de29fd38ce
OC-2833: Access to unshare link from PreviewImageFragment
2014-02-05 17:32:29 +01:00
masensio
3f701c5bb8
OC-2834: Access to unshare link from PreviewMediaFragment
2014-02-05 12:52:55 +01:00
masensio
ffdd188f06
OC-2834: Access to unshare link from FileDetailFragment
2014-02-05 11:39:18 +01:00
masensio
e437d8320d
Merge branch 'share_link__new_share' into share_link__unshare_file
2014-02-05 11:25:39 +01:00
David A. Velasco
44c730167c
Enabled action to share file with link in preview of images
2014-02-05 10:53:47 +01:00
masensio
c1af013596
OC-2832: Accesss to share link from PreviewMediaFragment
2014-02-05 10:42:00 +01:00
masensio
046a566ed4
OC-2822: Loading progress dialog while share link is being created. Fix a problem when the app for sharing is not selected
2014-02-05 10:18:46 +01:00
masensio
173c810cc1
OC-2680: Shared icon is shown when file is shared. Update in DB file.isShareByLink
2014-02-05 10:17:10 +01:00
masensio
44aeecb27f
OC-2822: Add 'loading' progress dialog while the share link is being created
2014-02-05 09:13:31 +01:00
masensio
e2af381b88
OC-2823: Show toast message when CreateShareOperation failes
2014-02-05 09:01:46 +01:00
David A. Velasco
3eb043caf0
Merge branch 'develop' into share_link__new_share
2014-02-04 14:43:36 +01:00
David A. Velasco
e2a4ad78de
Connected selection of app to send share link with creation of share resource, and link send to chosen app
2014-02-04 14:19:23 +01:00
masensio
09bb7bce23
Merge branch 'share_link_show_shared_files' into share_link__unshare_file
2014-02-04 13:31:30 +01:00
masensio
7966a9d62e
Changes from comments in PR #385
2014-02-04 12:49:15 +01:00
masensio
dcc540358d
Changes from comments in PR #385
2014-02-04 12:31:46 +01:00
David A. Velasco
7f3be4620e
Extra check on progress of refresh to decide visibility of progress circle
2014-02-03 15:19:50 +01:00
masensio
a8b46b7d95
OC-2735: Refresh unshare files in list
2014-02-03 15:14:42 +01:00
masensio
8d493de0ea
OC-2734: Update Database for UnshareLink operation
2014-02-03 14:24:36 +01:00
David A. Velasco
77d22d5a31
Added filtered chooser dialog for activities that can receive a link
2014-02-03 14:24:28 +01:00
masensio
5b5a9782c9
OC-2804: Fix bug: All files are marked as shared in uploads list
2014-02-03 13:13:01 +01:00
masensio
1f6eb722f4
OC-2733: Add UnshareLink Operation
2014-02-03 12:56:47 +01:00
masensio
2b8588ab0b
OC-2732: Create 'unshare' option menu for a shared file/folder
2014-02-03 11:22:39 +01:00
David A. Velasco
59513cd56d
Merge branch 'share_link__new_share' into share_link__new_share_menu
2014-02-03 09:46:26 +01:00
masensio
261d8a5167
OC-2772:Display a message if the user selects to share a file or folder that does not exist on the server
2014-02-03 09:26:36 +01:00
David A. Velasco
cea1a76f48
Fixed update of shares database - grant that shares are removed after removing all of them in the server
2014-02-03 09:20:49 +01:00
masensio
0f7d8d8453
OC-2771: Add pop-up message if the server doesn't support Share API and Share Link option is selected
2014-02-01 19:38:36 +01:00
masensio
f7bb011b7e
OC-2677: Add GetSharesForFile operation
2014-02-01 14:35:47 +01:00
David A. Velasco
fbe5f83aee
Adding custom dialog to let the user choose what app should received a shared link [WIP]
2014-01-31 15:38:53 +01:00
David A. Velasco
a9981ac0b4
Improved semantics of broadcast messages from FileSyncAdapter ; passed through LocalBroadcastManager now
2014-01-31 15:00:27 +01:00
masensio
d88dc52660
OC-2678: Save the new Share resource in the Shares database
2014-01-31 14:33:54 +01:00
David A. Velasco
717ef76969
Fixed visibility of progress circle for refresh
2014-01-31 12:22:49 +01:00
David A. Velasco
b447bf973f
Added standard menu to select app used to send the link to share a file
2014-01-31 10:43:25 +01:00
masensio
c550c8701b
Merge branch 'share_link_show_shared_files' into share_link__new_share
2014-01-30 18:54:54 +01:00
David A. Velasco
d8eb34aa49
Merge branch 'share_link_show_shared_files' into bug_in_refresh_of_shared_state_when_device_is_rotated
2014-01-30 18:33:45 +01:00
David A. Velasco
871d5ea05d
Moved execution of GetSharesOperation to OperationsService
2014-01-30 17:58:35 +01:00
masensio
426d7a3f88
OC-2675: CreateShareRemoteOperation in Library
2014-01-30 17:45:00 +01:00
David A. Velasco
72d9d63acb
Added service to run operations and created SyncOperations as common class for operations that work both both with remote and local storage
2014-01-30 15:02:50 +01:00
masensio
a6589abc54
OC-2755: Refresh account shows empty icon sometimes
2014-01-29 18:38:55 +01:00
masensio
45c1e47e5f
Merge branch 'develop' into share_link_show_shared_files
2014-01-29 18:23:33 +01:00
David A. Velasco
3a02de8c90
Adapted ownCloud app to changes in ownCloud library interface
2014-01-29 17:36:44 +01:00
David A. Velasco
5db7b8e6f6
Report an error to the user in log in view when the access to the user name in the server fails
2014-01-29 12:51:48 +01:00
masensio
7c0accf714
Merge branch 'share_link_show_shared_files' into share_link__code_improvements
2014-01-29 11:14:19 +01:00
masensio
5562c96268
OC-2750: Fix Bug. Loading shouldn't disappear until the shared files are shown
2014-01-29 10:31:41 +01:00
masensio
6361dd0a26
OC-2746: Changes from comments in PR#1 in android-library repo
2014-01-29 10:18:35 +01:00
masensio
7310bbc781
OC-2746: New methods in FileStorageManager for saving shares
2014-01-29 09:04:33 +01:00
masensio
d963d702fb
OC-2746: Changes from comments: new method to construct base url server
2014-01-28 14:41:38 +01:00
masensio
36d4f3d465
OC-2746: Changes from comments in PR#361
2014-01-28 13:39:49 +01:00
masensio
8c6e069293
OC-2746: Changes from improvements in library
2014-01-28 13:13:26 +01:00
masensio
388fdd2265
Merge branch 'develop' into share_link_show_shared_files
2014-01-27 14:00:07 +01:00
masensio
81b3597853
OC-2585: Refreshthe share items.
2014-01-27 09:40:07 +01:00
masensio
9d65b66999
OC-2585: Refresh the share items
2014-01-24 15:04:32 +01:00
David A. Velasco
d3ad9a4482
Fixed bug preventing that right modification time is saved in downloads
2014-01-24 14:22:05 +01:00
masensio
b73b968f60
OC-2490: Show image for shared file in the filelist
2014-01-24 12:22:11 +01:00
David A. Velasco
0e4c56f316
Fixed crash in first installation
...
Conflicts:
src/com/owncloud/android/ui/activity/FileActivity.java
2014-01-23 17:48:00 +01:00
masensio
9243d216fc
OC-2697: Save data from the Share API response in oc database
2014-01-23 17:24:06 +01:00
David A. Velasco
195256194e
Fixed crash in synchronization of kept-in-sync files triggered by browsing
2014-01-23 12:37:01 +01:00
masensio
e2f7394557
OC-2586: Parse the xml Share response from the server
2014-01-23 12:03:36 +01:00
David A. Velasco
1a3f202ac8
Fixed wrong index to substring
2014-01-22 18:39:34 +01:00
David A. Velasco
85809fc2d2
Fixed file name shown in the upload and download notifications (not full path)
2014-01-22 18:36:52 +01:00
masensio
576de8a8bc
OC-2586: Fix problem in mFileProjectionMap
2014-01-22 13:02:27 +01:00
masensio
0368e8fa54
OC-2489: Add GetRemoteSharedFilesOperation
2014-01-21 14:12:46 +01:00
masensio
747a39cf7d
OC-2489: New ShareRemoteFile, to get data from the server. ShareType in library
2014-01-21 09:20:32 +01:00
masensio
0723ae4b09
OC-2584: Detect if the server supports the Share API. This Check is in OwnCloudServerCheckOperation
2014-01-20 14:27:09 +01:00
David A. Velasco
1e68dccd8b
Library updated with final names (project and packages)
2014-01-20 11:59:41 +01:00
masensio
2da9af3871
Merge branch 'develop' into share_link_show_shared_files
2014-01-20 11:36:10 +01:00
masensio
8587f644e7
Create OCShare object
2014-01-20 11:32:40 +01:00
David A. Velasco
3f4e615d5e
Merge branch 'develop' into oc_framework_cleanup_and_documentation
2014-01-20 09:24:44 +01:00
masensio
1d70ae81ea
OC-2640: Fix Bug: Log in screen disappear when trying to log in again with the same user
2014-01-17 15:12:12 +01:00
masensio
10dac35232
OC-2633: Fixes for comments in code. PR #347
2014-01-17 14:20:00 +01:00
masensio
99817da42b
OC-2305: Create OCShares table on Database
2014-01-17 12:38:41 +01:00
masensio
7aeda0b4dc
OC-2582: Add methods isFileShareByLink and getFilePublicLink to FileDataStorageManager
2014-01-16 16:55:10 +01:00
masensio
b038cac0cd
OC-2581: Add to filelist: shared_by_link(boolean) and public_link(string)
2014-01-16 12:55:21 +01:00
David A. Velasco
af6815a14b
Fixed DownloadRemoteOperation to use real total transfer size and to simplify constructor
2014-01-15 11:48:10 +01:00
masensio
ea18765828
OC-2465: review code
2014-01-15 10:52:06 +01:00
David A. Velasco
690c1bf128
Removed unused methoed OnDatatransferProgressListener#onTransferProgress(long)
2014-01-15 10:41:37 +01:00
masensio
8f0128cbab
OC-2541: Adapt the code the new saml implementation. Get the username from OCS-API
2014-01-14 11:06:03 +01:00
masensio
fe6ab707e4
OC-2465: Move getUserNameForSamlSso to AccountUtils in oc_framework
2014-01-09 11:07:54 +01:00
masensio
f4dc4e45f8
Merge branch 'develop' into refactor_remote_saml_authentication
2014-01-09 10:04:04 +01:00
masensio
c535af9942
OC-2465: Move SsoWebViewClient to oc_framework
2014-01-09 10:01:54 +01:00
David A. Velasco
56fa4445e8
Merge pull request #345 from owncloud/fix_pincode_in_instant_uploads
...
Fixed pincode request in instant uploads
2014-01-08 09:12:06 -08:00
David A. Velasco
70e6c2136a
Replaced last call to PropFindMethod in app with ReadRemoteFileOperation
2014-01-08 17:58:04 +01:00
masensio
5bab662e90
OC-2461: Fix bug: After insert the pincode, if the device is rotate the pincode is asked again
2014-01-08 13:02:16 +01:00
masensio
bcc972d63d
OC-2459: Ask for pincode, when click on an instant upload notification
2014-01-08 11:11:19 +01:00
masensio
5dc172cd6c
OC-2397: Fix bug in read file: File doesn't refresh when you select to refresh after change it
2014-01-07 13:10:53 +01:00
masensio
44e3288168
Merge branch 'develop' into refactor_remote_operation_to_read_file
...
Conflicts:
src/com/owncloud/android/utils/FileStorageUtils.java
2014-01-07 10:16:39 +01:00
masensio
842c08954b
Clean some import warnings
2013-12-19 09:30:27 +01:00
masensio
685c26589b
Changes from comments in PR #337
2013-12-19 09:24:28 +01:00
masensio
71430eb7b1
Merge branch 'develop' into refactor_remote_operation_to_download_file
...
Conflicts:
oc_framework-test-project/AndroidManifest.xml
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
2013-12-18 10:04:42 +01:00
